From 5ff594cf616a7dc2eb916a7e3e3414b501f9f84e Mon Sep 17 00:00:00 2001 From: Jianxiong Pan Date: Mon, 25 Feb 2019 16:41:15 +0800 Subject: [PATCH] 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 --- arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts | 2 +- arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts | 2 +- arch/arm/boot/dts/amlogic/g12b_pxp.dts | 2 +- arch/arm/boot/dts/amlogic/g12b_pxp_a.dts | 2 +- arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts | 2 +- arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts | 2 +- arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts | 2 +- arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts | 2 +- arch/arm64/boot/dts/amlogic/g12b_pxp.dts | 2 +- arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts index ba8259379e65..932f68f5c110 100644 --- 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 9924f15ed81a..c1e044928497 100644 --- 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 39348c67ea90..f75d525e77e5 100644 --- 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 96d4f3364f43..593d51b6b906 100644 --- 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 4c267bfcf7ae..47d8ef62c109 100644 --- 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 c93c993808c2..1ce3d622b959 100644 --- 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 8892d8f501a8..fc170d5f074e 100644 --- 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 963e2a06de8d..b72068d9ee14 100644 --- 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 358c538ca5e3..36f125968f83 100644 --- 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 88df858d346b..b1e9088a1665 100644 --- 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>;