dts: fix amlogic-dt-id error in g12b dts. [1/1]

PD#SWPL-5020

Problem:
amlogic-dt-id error in g12b dts.

Solution:
specify amlogic-dt-id by dts name.

Verify:
local test.

Change-Id: I11a737ec61221c2dc9fcd4e3761c380ac5b5044b
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
index 2a11dfa..c18c533 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -23,7 +23,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "g12b_w400_b";
+       amlogic-dt-id = "g12b_skt_b";
        compatible = "amlogic, g12b";
        interrupt-parent = <&gic>;
        #address-cells = <1>;

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
index 9924f15..c1e0449 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
@@ -23,7 +23,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "g12b_w400_a";
+       amlogic-dt-id = "g12b_skt_a";
        compatible = "amlogic, g12b";
        interrupt-parent = <&gic>;
        #address-cells = <1>;

diff --git a/arch/arm/boot/dts/amlogic/g12b_pxp.dts b/arch/arm/boot/dts/amlogic/g12b_pxp.dts
index b6571df..463a91c 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_pxp.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_pxp.dts
@@ -21,7 +21,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "g12b_w400_b";
+       amlogic-dt-id = "g12b_skt_b";
        compatible = "amlogic, g12b";
        interrupt-parent = <&gic>;
        #address-cells = <1>;

diff --git a/arch/arm/boot/dts/amlogic/g12b_pxp_a.dts b/arch/arm/boot/dts/amlogic/g12b_pxp_a.dts
index 96d4f33..593d51b 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_pxp_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_pxp_a.dts
@@ -21,7 +21,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "g12b_w400_a";
+       amlogic-dt-id = "g12b_skt_a";
        compatible = "amlogic, g12b";
        interrupt-parent = <&gic>;
        #address-cells = <1>;

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
index 31dce53..5b011bd 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -23,7 +23,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "g12b_w400_b";
+       amlogic-dt-id = "g12b_skt_b";
        compatible = "amlogic, g12b";
        interrupt-parent = <&gic>;
        #address-cells = <2>;

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
index c93c993..1ce3d62 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
@@ -23,7 +23,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "g12b_w400_a";
+       amlogic-dt-id = "g12b_skt_a";
        compatible = "amlogic, g12b";
        interrupt-parent = <&gic>;
        #address-cells = <2>;

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts
index 37dc842..a9cb07d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts
@@ -21,7 +21,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "g12b_w400_b";
+       amlogic-dt-id = "g12b_w411_b";
        compatible = "amlogic, g12b";
        interrupt-parent = <&gic>;
        #address-cells = <2>;

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts
index 963e2a0..b72068d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts
@@ -21,7 +21,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "g12b_w400_a";
+       amlogic-dt-id = "g12b_w411_a";
        compatible = "amlogic, g12b";
        interrupt-parent = <&gic>;
        #address-cells = <2>;

diff --git a/arch/arm64/boot/dts/amlogic/g12b_pxp.dts b/arch/arm64/boot/dts/amlogic/g12b_pxp.dts
index f965da6..c1960ce 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_pxp.dts
@@ -21,7 +21,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "g12b_w400_b";
+       amlogic-dt-id = "g12b_skt_b";
        compatible = "amlogic, g12b";
        interrupt-parent = <&gic>;
        #address-cells = <2>;

diff --git a/arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts b/arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts
index 88df858..b1e9088 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts
@@ -21,7 +21,7 @@
 
 / {
        model = "Amlogic";
-       amlogic-dt-id = "g12b_w400_a";
+       amlogic-dt-id = "g12b_skt_a";
        compatible = "amlogic, g12b";
        interrupt-parent = <&gic>;
        #address-cells = <2>;