From a2501ebfb06688b2519cd06583c0468522257f3b Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 22 Dec 2018 20:25:45 +0100 Subject: [PATCH] ipq40xx: remove qcom,ipq4019 on all devices Upstream commit: 80483c3abf8 ("ARM: qcom: Cleanup/Remove unnecessary board file") removed all the platform device compatibles stating that: "This patch removes the unnecessary board file. The generic machine definition is sufficient for the Qualcomm platforms." Signed-off-by: Christian Lamparter --- .../ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts | 2 +- .../ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts | 2 +- .../files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts | 2 +- .../ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts | 2 +- .../linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts index 6bc178ccfa2c..bfebad0e65ad 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts @@ -22,7 +22,7 @@ / { model = "OpenMesh A42"; - compatible = "openmesh,a42", "qcom,ipq4019"; + compatible = "openmesh,a42"; soc { rng@22000 { diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts index 7a4010387395..f7ef4cd02695 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts @@ -7,7 +7,7 @@ / { model = "EnGenius EAP1300"; - compatible = "engenius,eap1300", "qcom,ipq4019"; + compatible = "engenius,eap1300"; soc { rng@22000 { diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts index a0abe41517d3..2b93dcbb99ef 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts @@ -21,7 +21,7 @@ / { model = "Netgear EX6100v2"; - compatible = "netgear,ex6100v2", "qcom,ipq4019"; + compatible = "netgear,ex6100v2"; }; &wifi0 { diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts index e0b5c38b33bd..f1c44c1ae8b8 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts @@ -21,7 +21,7 @@ / { model = "Netgear EX6150v2"; - compatible = "netgear,ex6150v2", "qcom,ipq4019"; + compatible = "netgear,ex6150v2"; }; &wifi0 { diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi index bb6cf4ee024d..348f25296120 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi @@ -22,7 +22,7 @@ / { model = "Netgear EX61X0v2"; - compatible = "netgear,ex61x0v2", "qcom,ipq4019"; + compatible = "netgear,ex61x0v2"; soc { rng@22000 { diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts index 976e7498edca..f9508cc460b6 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts @@ -7,7 +7,7 @@ / { model = "AVM FRITZ!Box 4040"; - compatible = "avm,fritzbox-4040", "qcom,ipq4019"; + compatible = "avm,fritzbox-4040"; aliases { led-boot = &power; diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts index 003b4764a831..9730f1027f6c 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts @@ -22,7 +22,7 @@ / { model = "8devices Jalapeno"; - compatible = "8dev,jalapeno", "qcom,ipq4019"; + compatible = "8dev,jalapeno"; soc { rng@22000 { diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts index 4083100beb2c..2ee8f075d7b0 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts @@ -8,7 +8,7 @@ / { model = "ZyXEL NBG6617"; - compatible = "zyxel,nbg6617", "qcom,ipq4019"; + compatible = "zyxel,nbg6617"; chosen { /* diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts index 62d4218ea605..c09962dc084f 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts @@ -22,7 +22,7 @@ / { model = "ZyXEL WRE6606"; - compatible = "zyxel,wre6606", "qcom,ipq4019"; + compatible = "zyxel,wre6606"; aliases { led-boot = &power; diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts index 71c822feb2fc..72c4f0e9157a 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts @@ -22,7 +22,7 @@ / { model = "OpenMesh A62"; - compatible = "openmesh,a62", "qcom,ipq4019"; + compatible = "openmesh,a62"; soc { rng@22000 { diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts index 778fad3e3b22..188c28e8c7aa 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts @@ -23,7 +23,7 @@ / { model = "Compex WPJ428"; - compatible = "compex,wpj428", "qcom,ipq4019"; + compatible = "compex,wpj428"; soc { rng@22000 { diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts index 816f033d4309..b4937de07ce6 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts @@ -21,7 +21,7 @@ / { model = "GL.iNet GL-B1300"; - compatible = "glinet,gl-b1300", "qcom,ipq4019"; + compatible = "glinet,gl-b1300"; aliases { led-boot = &power; diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts index 8dcde3bdb946..589409737373 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts @@ -19,7 +19,7 @@ / { model = "Meraki MR33 Access Point"; - compatible = "meraki,mr33", "qcom,ipq4019"; + compatible = "meraki,mr33"; aliases { led-boot = &status_green; diff --git a/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch b/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch index 349f67c66524..48825375eba5 100644 --- a/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch +++ b/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch @@ -85,7 +85,7 @@ / { model = "Qualcomm Technologies, Inc. IPQ40xx/AP-DK01.1-C1"; -+ compatible = "qcom,ap-dk01.1-c1", "qcom,ap-dk01.2-c1", "qcom,ipq4019"; ++ compatible = "qcom,ap-dk01.1-c1", "qcom,ap-dk01.2-c1"; + memory { + device_type = "memory"; -- 2.30.2