lantiq: fix dts pci node unit mismatch warnings

Reorder the register property values to have the nodes unit address in
first place. Rename the PCI clocks accordingly.

Fixes unit mismatch devcietree compiler warnings.

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
index 1c79e811f6f78832986c9996845daf9b31776632..2c1c73b383555ff7cc80ddd5d7958d91b07351f2 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
@@ -407,8 +407,8 @@
                        ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000   /* pci memory */
                                  0x1000000 0 0x00000000 0xae00000 0 0x200000>; /* io space */
 
-                       reg = <0x7000000 0x8000>, <0xe105400 0x400>;
-                       reg-names = "config", "ctrl";
+                       reg = <0xe105400 0x400>, <0x7000000 0x8000>;
+                       reg-names = "ctrl", "config";
 
                        lantiq,bus-clock = <33333333>;
                        interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
index 02a50a1cad2567921830d051dca71b885f077c57..5d5ee0197033e7619080eee08b636dc9f3f9f248 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
@@ -320,8 +320,8 @@
                        ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000   /* pci memory */
                                  0x1000000 0 0x00000000 0xae00000 0 0x200000>; /* io space */
 
-                       reg = <0x7000000 0x8000>, <0xe105400 0x400>;
-                       reg-names = "config", "ctrl";
+                       reg = <0xe105400 0x400>, <0x7000000 0x8000>;
+                       reg-names = "ctrl", "config";
 
                        lantiq,bus-clock = <33333333>;
                        interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
index d39be6a127d793bf4e65006f375abcb68dc95d13..820cefb91669e5ba867c2bf0438060e8134b00a5 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
@@ -515,8 +515,8 @@
                        ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000   /* pci memory */
                                0x1000000 0 0x00000000 0xae00000 0 0x200000>; /* io space */
 
-                       reg = <0x7000000 0x8000>, <0xe105400 0x400>;
-                       reg-names = "config", "ctrl";
+                       reg = <0xe105400 0x400>, <0x7000000 0x8000>;
+                       reg-names = "ctrl", "config";
 
                        lantiq,bus-clock = <33333333>;
                        interrupt-map-mask = <0xf800 0x0 0x0 0x7>;

diff --git a/target/linux/lantiq/patches-5.10/0205-MIPS-lantiq-fix-unit-mismatch-devicetree-compiler-wa.patch b/target/linux/lantiq/patches-5.10/0205-MIPS-lantiq-fix-unit-mismatch-devicetree-compiler-wa.patch
new file mode 100644 (file)
index 0000000..4b740f7
--- /dev/null
+++ b/target/linux/lantiq/patches-5.10/0205-MIPS-lantiq-fix-unit-mismatch-devicetree-compiler-wa.patch
@@ -0,0 +1,42 @@
+From ffb73d853dbdebf824bb558dc79f96a4b16cdd2b Mon Sep 17 00:00:00 2001
+From: Mathias Kresin <dev@kresin.me>
+Date: Mon, 28 Jan 2019 21:33:09 +0100
+Subject: [PATCH 6/6] MIPS: lantiq: fix unit mismatch devicetree compiler
+ warning
+
+Reorder the register property values to have the nodes unit address in
+first place. Rename the PCI clocks accordingly.
+
+Fixes a unit mismatch devcietree compiler warning.
+
+Signed-off-by: Mathias Kresin <dev@kresin.me>
+---
+ arch/mips/boot/dts/lantiq/danube.dtsi | 4 ++--
+ arch/mips/lantiq/xway/sysctrl.c       | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
+index b4323b2214e2..8d3515bdf0d8 100644
+--- a/arch/mips/lantiq/xway/sysctrl.c
++++ b/arch/mips/lantiq/xway/sysctrl.c
+@@ -352,7 +352,7 @@ static void clkdev_add_pci(void)
+       struct clk *clk_ext = kzalloc(sizeof(struct clk), GFP_KERNEL);
+ 
+       /* main pci clock */
+-      clk->cl.dev_id = "17000000.pci";
++      clk->cl.dev_id = "1e105400.pci";
+       clk->cl.con_id = NULL;
+       clk->cl.clk = clk;
+       clk->rate = CLOCK_33M;
+@@ -364,7 +364,7 @@ static void clkdev_add_pci(void)
+       clkdev_add(&clk->cl);
+ 
+       /* use internal/external bus clock */
+-      clk_ext->cl.dev_id = "17000000.pci";
++      clk_ext->cl.dev_id = "1e105400.pci";
+       clk_ext->cl.con_id = "external";
+       clk_ext->cl.clk = clk_ext;
+       clk_ext->enable = pci_ext_enable;
+-- 
+2.17.1
+

diff --git a/target/linux/lantiq/patches-5.4/0205-MIPS-lantiq-fix-unit-mismatch-devicetree-compiler-wa.patch b/target/linux/lantiq/patches-5.4/0205-MIPS-lantiq-fix-unit-mismatch-devicetree-compiler-wa.patch
new file mode 100644 (file)
index 0000000..4b740f7
--- /dev/null
+++ b/target/linux/lantiq/patches-5.4/0205-MIPS-lantiq-fix-unit-mismatch-devicetree-compiler-wa.patch
@@ -0,0 +1,42 @@
+From ffb73d853dbdebf824bb558dc79f96a4b16cdd2b Mon Sep 17 00:00:00 2001
+From: Mathias Kresin <dev@kresin.me>
+Date: Mon, 28 Jan 2019 21:33:09 +0100
+Subject: [PATCH 6/6] MIPS: lantiq: fix unit mismatch devicetree compiler
+ warning
+
+Reorder the register property values to have the nodes unit address in
+first place. Rename the PCI clocks accordingly.
+
+Fixes a unit mismatch devcietree compiler warning.
+
+Signed-off-by: Mathias Kresin <dev@kresin.me>
+---
+ arch/mips/boot/dts/lantiq/danube.dtsi | 4 ++--
+ arch/mips/lantiq/xway/sysctrl.c       | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
+index b4323b2214e2..8d3515bdf0d8 100644
+--- a/arch/mips/lantiq/xway/sysctrl.c
++++ b/arch/mips/lantiq/xway/sysctrl.c
+@@ -352,7 +352,7 @@ static void clkdev_add_pci(void)
+       struct clk *clk_ext = kzalloc(sizeof(struct clk), GFP_KERNEL);
+ 
+       /* main pci clock */
+-      clk->cl.dev_id = "17000000.pci";
++      clk->cl.dev_id = "1e105400.pci";
+       clk->cl.con_id = NULL;
+       clk->cl.clk = clk;
+       clk->rate = CLOCK_33M;
+@@ -364,7 +364,7 @@ static void clkdev_add_pci(void)
+       clkdev_add(&clk->cl);
+ 
+       /* use internal/external bus clock */
+-      clk_ext->cl.dev_id = "17000000.pci";
++      clk_ext->cl.dev_id = "1e105400.pci";
+       clk_ext->cl.con_id = "external";
+       clk_ext->cl.clk = clk_ext;
+       clk_ext->enable = pci_ext_enable;
+-- 
+2.17.1
+