From 5d5ca50e2731db7e3dc1cb93275fc4c8ada42bb5 Mon Sep 17 00:00:00 2001
From: zhiqiang liang <zhiqiang.liang@amlogic.com>
Date: Tue, 12 Mar 2019 15:20:22 +0800
Subject: [PATCH] dts: rename dts for SM1 bringup [1/1]

PD#SWPL-5865

Problem:
SM1 bring up

Solution:
rename dts for SM1 bringup

Verify:
PxP

Change-Id: I991b6a0fb65cf9a03c6cb75a1ad8823a067e6bdd
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
---
 MAINTAINERS                                                           | 4 ++--
 .../dts/amlogic/{mesongsm1-bifrost.dtsi => mesonsm1-bifrost.dtsi}     | 0
 arch/arm64/boot/dts/amlogic/{mesongsm1.dtsi => mesonsm1.dtsi}         | 2 +-
 arch/arm64/boot/dts/amlogic/sm1_pxp.dts                               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/arm64/boot/dts/amlogic/{mesongsm1-bifrost.dtsi => mesonsm1-bifrost.dtsi} (100%)
 rename arch/arm64/boot/dts/amlogic/{mesongsm1.dtsi => mesonsm1.dtsi} (99%)

diff --git a/MAINTAINERS b/MAINTAINERS
index c6dd1c1..79f77ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14814,6 +14814,6 @@ M:	Zhiqiang Liang <Zhiqiang.Liang@amlogic.com>
 F:	arch/arm64/boot/dts/amlogic/mesongsm1-bifrost.dtsi
 F:	arch/arm64/boot/dts/amlogic/mesongsm1.dtsi
 F:	arch/arm64/boot/dts/amlogic/sm1_pxp.dts
-F:	arch/arm/boot/dts/amlogic/mesongsm1-bifrost.dtsi
-F:	arch/arm/boot/dts/amlogic/mesongsm1.dtsi
+F:	arch/arm/boot/dts/amlogic/mesonsm1-bifrost.dtsi
+F:	arch/arm/boot/dts/amlogic/mesonsm1.dtsi
 F:	arch/arm/boot/dts/amlogic/sm1_pxp.dts
diff --git a/arch/arm64/boot/dts/amlogic/mesongsm1-bifrost.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1-bifrost.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/amlogic/mesongsm1-bifrost.dtsi
rename to arch/arm64/boot/dts/amlogic/mesonsm1-bifrost.dtsi
diff --git a/arch/arm64/boot/dts/amlogic/mesongsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
similarity index 99%
rename from arch/arm64/boot/dts/amlogic/mesongsm1.dtsi
rename to arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
index e59ce39..3d53f8b 100644
--- a/arch/arm64/boot/dts/amlogic/mesongsm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
@@ -26,7 +26,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/input/meson_rc.h>
 #include <dt-bindings/phy/phy-amlogic-pcie.h>
-#include "mesongsm1-bifrost.dtsi"
+#include "mesonsm1-bifrost.dtsi"
 
 / {
 	cpus:cpus {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts
index 3b74c6e..2235dfd 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts
@@ -17,7 +17,7 @@
 
 /dts-v1/;
 
-#include "mesongsm1.dtsi"
+#include "mesonsm1.dtsi"
 
 / {
 	model = "Amlogic";
-- 
2.7.4