* [PATCH 1/8] ARM: kirkwood: DT: Remove button address and fixup names
2016-04-03 2:03 [PATCH 0/8] Various Kirkwood DT warning fixup Andrew Lunn
@ 2016-04-03 2:03 ` Andrew Lunn
2016-04-03 2:03 ` [PATCH 2/8] ARM: kirkwood: DT: Remove node address from leds Andrew Lunn
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2016-04-03 2:03 UTC (permalink / raw)
To: linux-arm-kernel
The DT compiler is now warning about unit names with addresses but not
reg property. Fix all the gpio-key buttons which causes warnings.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts | 4 ++--
arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +-
arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +++---
arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 ++--
arch/arm/boot/dts/kirkwood-iconnect.dts | 4 ++--
arch/arm/boot/dts/kirkwood-laplug.dts | 2 +-
arch/arm/boot/dts/kirkwood-lsxl.dtsi | 6 +++---
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 4 ++--
arch/arm/boot/dts/kirkwood-netxbig.dtsi | 8 ++++----
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 6 +++---
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +-
arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 +-
arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 2 +-
arch/arm/boot/dts/kirkwood-t5325.dts | 2 +-
arch/arm/boot/dts/kirkwood-ts219-6281.dts | 4 ++--
arch/arm/boot/dts/kirkwood-ts219-6282.dts | 4 ++--
arch/arm/boot/dts/kirkwood-ts419.dtsi | 4 ++--
18 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts b/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
index fa02a9aff05e..f16a73e49a88 100644
--- a/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
+++ b/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
@@ -36,13 +36,13 @@
gpio_keys {
compatible = "gpio-keys";
- button at 1{
+ reset {
label = "Reset";
linux,code = <KEY_POWER>;
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
};
- button at 2{
+ button {
label = "Power";
linux,code = <KEY_SLEEP>;
gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 7ec76566acf2..555b7e4c58a5 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -60,7 +60,7 @@
#address-cells = <1>;
#size-cells = <0>;
- button at 1 {
+ power {
label = "Power push button";
linux,code = <KEY_POWER>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index 113dcf056dcf..d8fca9db46d0 100644
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -13,17 +13,17 @@
&pmx_button_reset>;
pinctrl-names = "default";
- button at 1 {
+ power {
label = "Power button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+ eject {
label = "USB unmount button";
linux,code = <KEY_EJECTCD>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
- button at 3 {
+ reset {
label = "Reset button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index bfa5edde179c..ef84d8699a76 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -62,12 +62,12 @@
pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>;
pinctrl-names = "default";
- button at 1 {
+ copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+ reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 38e31d15a62d..674306746dec 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -136,13 +136,13 @@
pinctrl-0 = < &pmx_button_reset &pmx_button_otb >;
pinctrl-names = "default";
- button at 1 {
+ otb {
label = "OTB Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
debounce-interval = <100>;
};
- button at 2 {
+ reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index 24425660e973..c39e17a89f4e 100644
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -62,7 +62,7 @@
gpio_keys {
compatible = "gpio-keys";
- button at 1{
+ power {
label = "Power push button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 1d6528d82969..2869c5dbc1ad 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -107,18 +107,18 @@
&pmx_power_auto_switch>;
pinctrl-names = "default";
- button at 1 {
+ option {
label = "Function Button";
linux,code = <KEY_OPTION>;
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+ reserved {
label = "Power-on Switch";
linux,code = <KEY_RESERVED>;
linux,input-type = <5>;
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
};
- button at 3 {
+ power {
label = "Power-auto Switch";
linux,code = <KEY_ESC>;
linux,input-type = <5>;
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index b7e7d78c484e..6a8f59acb539 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -109,12 +109,12 @@
pinctrl-0 = <&pmx_keys>;
pinctrl-names = "default";
- button at 1 {
+ restart {
label = "SWR Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+ wps {
label = "WPS Button";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
index 62515a8b99b9..52b58fe0c4fe 100644
--- a/arch/arm/boot/dts/kirkwood-netxbig.dtsi
+++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
@@ -59,22 +59,22 @@
#size-cells = <0>;
/*
- * button at 1 and button at 2 represent a three position rocker
+ * esc and power represent a three position rocker
* switch. Thus the conventional KEY_POWER does not fit
*/
- button at 1 {
+ exc {
label = "Back power switch (on|auto)";
linux,code = <KEY_ESC>;
linux,input-type = <5>;
gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+ power {
label = "Back power switch (auto|off)";
linux,code = <KEY_1>;
linux,input-type = <5>;
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
};
- button at 3 {
+ option {
label = "Function button";
linux,code = <KEY_OPTION>;
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index e832b6320264..b4d59261eddc 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -57,7 +57,7 @@
#address-cells = <1>;
#size-cells = <0>;
- button at 1 {
+ power {
label = "Power push button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
index 2075a2e828f1..5ccc46190079 100644
--- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
@@ -77,17 +77,17 @@
pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
pinctrl-names = "default";
- button at 1 {
+ power {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
- button at 2 {
+ copy {
label = "Copy Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
- button at 3 {
+ reset {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index fb9dc227255d..0db0e3edc88f 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -117,7 +117,7 @@
#address-cells = <1>;
#size-cells = <0>;
- button at 1 {
+ power {
label = "Init Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index d5e3bc518968..cf2f5240e176 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -135,7 +135,7 @@
#address-cells = <1>;
#size-cells = <0>;
- button at 1 {
+ button {
label = "Init Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
index 8082d64266a3..b2f26239d298 100644
--- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
+++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
@@ -33,7 +33,7 @@
pinctrl-0 = <&pmx_button_eject>;
pinctrl-names = "default";
- button at 1 {
+ eject {
debounce_interval = <50>;
wakeup-source;
linux,code = <KEY_EJECTCD>;
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index ed956b849a71..af5ce85b2c38 100644
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -173,7 +173,7 @@
pinctrl-0 = <&pmx_button_power>;
pinctrl-names = "default";
- button at 1 {
+ power {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
index 9767d73f3857..ee62204e4ecd 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
@@ -39,12 +39,12 @@
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default";
- button at 1 {
+ copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+ reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
index bfc1a32d4e42..1d291f620869 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
@@ -49,12 +49,12 @@
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default";
- button at 1 {
+ copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+ reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/kirkwood-ts419.dtsi b/arch/arm/boot/dts/kirkwood-ts419.dtsi
index 30ab93bfb1e4..02bd53762705 100644
--- a/arch/arm/boot/dts/kirkwood-ts419.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts419.dtsi
@@ -45,12 +45,12 @@
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default";
- button at 1 {
+ copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+ reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
--
2.7.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/8] ARM: kirkwood: DT: Remove node address from leds
2016-04-03 2:03 [PATCH 0/8] Various Kirkwood DT warning fixup Andrew Lunn
2016-04-03 2:03 ` [PATCH 1/8] ARM: kirkwood: DT: Remove button address and fixup names Andrew Lunn
@ 2016-04-03 2:03 ` Andrew Lunn
2016-04-03 2:03 ` [PATCH 3/8] ARM: kirkwood: DT: Remove address from dsa unit name Andrew Lunn
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2016-04-03 2:03 UTC (permalink / raw)
To: linux-arm-kernel
leds don't have a reg property, so remove the address from the unit name.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-lsxl.dtsi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 2869c5dbc1ad..8b7c6ce79a41 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -133,28 +133,28 @@
&pmx_led_function_blue>;
pinctrl-names = "default";
- led at 1 {
+ func_blue {
label = "lsxl:blue:func";
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
- led at 2 {
+ alarm {
label = "lsxl:red:alarm";
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
- led at 3 {
+ info {
label = "lsxl:amber:info";
gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
};
- led at 4 {
+ power {
label = "lsxl:blue:power";
gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
- led at 5 {
+ func_red {
label = "lsxl:red:func";
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
};
--
2.7.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/8] ARM: kirkwood: DT: Remove address from dsa unit name
2016-04-03 2:03 [PATCH 0/8] Various Kirkwood DT warning fixup Andrew Lunn
2016-04-03 2:03 ` [PATCH 1/8] ARM: kirkwood: DT: Remove button address and fixup names Andrew Lunn
2016-04-03 2:03 ` [PATCH 2/8] ARM: kirkwood: DT: Remove node address from leds Andrew Lunn
@ 2016-04-03 2:03 ` Andrew Lunn
2016-04-03 2:03 ` [PATCH 4/8] ARM: kirkwood: DT: Add address to ethernet-phy " Andrew Lunn
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2016-04-03 2:03 UTC (permalink / raw)
To: linux-arm-kernel
The dsa node does not have a reg property, so remove the address from
the unit name.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-dir665.dts | 2 +-
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 2 +-
arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 2 +-
arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 2 +-
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-dir665.dts b/arch/arm/boot/dts/kirkwood-dir665.dts
index 0473fcc260f7..f548363060ea 100644
--- a/arch/arm/boot/dts/kirkwood-dir665.dts
+++ b/arch/arm/boot/dts/kirkwood-dir665.dts
@@ -203,7 +203,7 @@
};
};
- dsa at 0 {
+ dsa {
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 6a8f59acb539..26fb610b2af7 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -121,7 +121,7 @@
};
};
- dsa at 0 {
+ dsa {
compatible = "marvell,dsa";
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
index f2e08b3b33ea..6f771a99cb02 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
@@ -19,7 +19,7 @@
model = "Marvell RD88f6281 Reference design, with A0 or higher SoC";
compatible = "marvell,rd88f6281-a", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
- dsa at 0 {
+ dsa {
switch at 0 {
reg = <10 0>; /* MDIO address 10, switch 0 in tree */
};
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
index f4272b64ed7f..1a797381d3d4 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
@@ -19,7 +19,7 @@
model = "Marvell RD88f6281 Reference design, with Z0 SoC";
compatible = "marvell,rd88f6281-z0", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
- dsa at 0 {
+ dsa {
switch at 0 {
reg = <0 0>; /* MDIO address 0, switch 0 in tree */
port at 4 {
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
index d195e884b3b5..5521426d101b 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
@@ -63,7 +63,7 @@
};
};
- dsa at 0 {
+ dsa {
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
--
2.7.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/8] ARM: kirkwood: DT: Add address to ethernet-phy unit name
2016-04-03 2:03 [PATCH 0/8] Various Kirkwood DT warning fixup Andrew Lunn
` (2 preceding siblings ...)
2016-04-03 2:03 ` [PATCH 3/8] ARM: kirkwood: DT: Remove address from dsa unit name Andrew Lunn
@ 2016-04-03 2:03 ` Andrew Lunn
2016-04-03 2:03 ` [PATCH 5/8] ARM: kirkwood: DT: Fixup pcie DT warnings Andrew Lunn
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2016-04-03 2:03 UTC (permalink / raw)
To: linux-arm-kernel
PHYs have an address on the mdio bus. So the unit name should contain
an address. This is complicated in that some .dtsi files contain the
node, but the reg is set in the .dts file. In this case, use the
abstract address X.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-t5325.dts | 2 +-
arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index b4d59261eddc..282605f4c92c 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -83,7 +83,7 @@
&mdio {
status = "okay";
- ethphy0: ethernet-phy {
+ ethphy0: ethernet-phy at X {
/* overwrite reg property in board file */
};
};
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index af5ce85b2c38..860c6d778d47 100644
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -217,7 +217,7 @@
&mdio {
status = "okay";
- ethphy0: ethernet-phy {
+ ethphy0: ethernet-phy at 8 {
device_type = "ethernet-phy";
reg = <8>;
};
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 0e46560551f4..b3f75382cb06 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -94,7 +94,7 @@
&mdio {
status = "okay";
- ethphy0: ethernet-phy {
+ ethphy0: ethernet-phy at X {
/* overwrite reg property in board file */
};
};
--
2.7.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/8] ARM: kirkwood: DT: Fixup pcie DT warnings
2016-04-03 2:03 [PATCH 0/8] Various Kirkwood DT warning fixup Andrew Lunn
` (3 preceding siblings ...)
2016-04-03 2:03 ` [PATCH 4/8] ARM: kirkwood: DT: Add address to ethernet-phy " Andrew Lunn
@ 2016-04-03 2:03 ` Andrew Lunn
2016-04-03 2:03 ` [PATCH 6/8] ARM: kirkwood: DT: Remove address from gpio-i2c unit name Andrew Lunn
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2016-04-03 2:03 UTC (permalink / raw)
To: linux-arm-kernel
PCIe has a range property, so the unit name should contain an address.
Make use of the label to enable individual PCIe busses. Also, fixup
the synology dtsi file which added a label pcie2 rather than using the
existing pcie1 label.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-6192.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-6281.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-6282.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-b3.dts | 19 ++++++++-----------
arch/arm/boot/dts/kirkwood-db-88f6281.dts | 14 ++++++--------
arch/arm/boot/dts/kirkwood-db-88f6282.dts | 20 +++++++++-----------
arch/arm/boot/dts/kirkwood-dir665.dts | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-ds111.dts | 2 +-
arch/arm/boot/dts/kirkwood-ds112.dts | 6 +++++-
arch/arm/boot/dts/kirkwood-ds212.dts | 2 +-
arch/arm/boot/dts/kirkwood-ds411.dts | 6 +++++-
arch/arm/boot/dts/kirkwood-ds411slim.dts | 2 +-
arch/arm/boot/dts/kirkwood-iconnect.dts | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-km_common.dtsi | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-laplug.dts | 17 ++++++++---------
arch/arm/boot/dts/kirkwood-linkstation.dtsi | 17 ++++++++---------
arch/arm/boot/dts/kirkwood-mplcec4.dts | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-nas2big.dts | 18 ++++++++----------
.../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 18 ++++++++----------
.../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 21 +++++++++------------
arch/arm/boot/dts/kirkwood-nsa310.dts | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-nsa320.dts | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-nsa325.dts | 17 +++++++----------
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-openrd.dtsi | 14 ++++----------
arch/arm/boot/dts/kirkwood-rd88f6192.dts | 20 +++++++++-----------
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-rs212.dts | 6 +++++-
arch/arm/boot/dts/kirkwood-synology.dtsi | 22 ++++++++--------------
arch/arm/boot/dts/kirkwood-t5325.dts | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-ts219-6282.dts | 12 ++----------
arch/arm/boot/dts/kirkwood-ts219.dtsi | 18 ++++++++----------
arch/arm/boot/dts/kirkwood-ts419-6282.dts | 15 +++------------
35 files changed, 207 insertions(+), 267 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi
index 9e6e9e2691d5..1014a5dd9035 100644
--- a/arch/arm/boot/dts/kirkwood-6192.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6192.dtsi
@@ -1,6 +1,6 @@
/ {
mbus {
- pciec: pcie-controller {
+ pciec: pcie-controller at 82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index 7dc7d6782e83..fad201551304 100644
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -1,6 +1,6 @@
/ {
mbus {
- pciec: pcie-controller {
+ pciec: pcie-controller at 82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 4680eec990f0..27434c35eb66 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -1,6 +1,6 @@
/ {
mbus {
- pciec: pcie-controller {
+ pciec: pcie-controller at 82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";
diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
index 9e1f741d74ff..17eb92733310 100644
--- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
+++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
@@ -1,6 +1,6 @@
/ {
mbus {
- pciec: pcie-controller {
+ pciec: pcie-controller at 82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
index d2936ad3af1d..d091ecb61cd2 100644
--- a/arch/arm/boot/dts/kirkwood-b3.dts
+++ b/arch/arm/boot/dts/kirkwood-b3.dts
@@ -33,17 +33,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- /* Wifi model has Atheros chipset on pcie port */
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pmx_button_power: pmx-button-power {
@@ -199,3 +188,11 @@
};
};
+/* Wifi model has Atheros chipset on pcie port */
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-db-88f6281.dts b/arch/arm/boot/dts/kirkwood-db-88f6281.dts
index c39dd766c75a..aee6f02b1c80 100644
--- a/arch/arm/boot/dts/kirkwood-db-88f6281.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6281.dts
@@ -17,14 +17,12 @@
/ {
model = "Marvell DB-88F6281-BP Development Board";
compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+};
- mbus {
- pcie-controller {
- status = "okay";
+&pciec {
+ status = "okay";
+};
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
+&pcie0 {
+ status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-db-88f6282.dts b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
index 701c6b6cdaa2..e8b23e13ec0c 100644
--- a/arch/arm/boot/dts/kirkwood-db-88f6282.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
@@ -17,18 +17,16 @@
/ {
model = "Marvell DB-88F6282-BP Development Board";
compatible = "marvell,db-88f6282-bp", "marvell,kirkwood-88f6282", "marvell,kirkwood";
+};
- mbus {
- pcie-controller {
- status = "okay";
+&pciec {
+ status = "okay";
+};
- pcie at 1,0 {
- status = "okay";
- };
+&pcie0 {
+ status = "okay";
+};
- pcie at 2,0 {
- status = "okay";
- };
- };
- };
+&pcie1 {
+ status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-dir665.dts b/arch/arm/boot/dts/kirkwood-dir665.dts
index f548363060ea..41acbb6dd6ab 100644
--- a/arch/arm/boot/dts/kirkwood-dir665.dts
+++ b/arch/arm/boot/dts/kirkwood-dir665.dts
@@ -25,16 +25,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pinctrl-0 =< &pmx_led_usb
@@ -276,3 +266,11 @@
&rtc {
status = "disabled";
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-ds111.dts b/arch/arm/boot/dts/kirkwood-ds111.dts
index 61f47fbe44d0..a85a4664431b 100644
--- a/arch/arm/boot/dts/kirkwood-ds111.dts
+++ b/arch/arm/boot/dts/kirkwood-ds111.dts
@@ -40,6 +40,6 @@
status = "okay";
};
-&pcie2 {
+&pcie1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-ds112.dts b/arch/arm/boot/dts/kirkwood-ds112.dts
index b84af3da8c84..6cef4bdbc01b 100644
--- a/arch/arm/boot/dts/kirkwood-ds112.dts
+++ b/arch/arm/boot/dts/kirkwood-ds112.dts
@@ -44,6 +44,10 @@
status = "okay";
};
-&pcie2 {
+&pciec {
+ status = "okay";
+};
+
+&pcie1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-ds212.dts b/arch/arm/boot/dts/kirkwood-ds212.dts
index 99afd462f956..7f32e7abffac 100644
--- a/arch/arm/boot/dts/kirkwood-ds212.dts
+++ b/arch/arm/boot/dts/kirkwood-ds212.dts
@@ -43,6 +43,6 @@
status = "okay";
};
-&pcie2 {
+&pcie1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-ds411.dts b/arch/arm/boot/dts/kirkwood-ds411.dts
index 623cd4a37d71..72e58307416d 100644
--- a/arch/arm/boot/dts/kirkwood-ds411.dts
+++ b/arch/arm/boot/dts/kirkwood-ds411.dts
@@ -48,6 +48,10 @@
status = "okay";
};
-&pcie2 {
+&pciec {
+ status = "okay";
+};
+
+&pcie1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-ds411slim.dts b/arch/arm/boot/dts/kirkwood-ds411slim.dts
index a0a1fad8b4de..aaaf31b81522 100644
--- a/arch/arm/boot/dts/kirkwood-ds411slim.dts
+++ b/arch/arm/boot/dts/kirkwood-ds411slim.dts
@@ -44,6 +44,6 @@
status = "okay";
};
-&pcie2 {
+&pcie1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 674306746dec..d25184ae4af3 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -19,16 +19,6 @@
linux,initrd-end = <0x4800000>;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pmx_button_reset: pmx-button-reset {
@@ -194,3 +184,11 @@
phy-handle = <ðphy0>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-km_common.dtsi b/arch/arm/boot/dts/kirkwood-km_common.dtsi
index 8367c772c764..f6096f56046d 100644
--- a/arch/arm/boot/dts/kirkwood-km_common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-km_common.dtsi
@@ -4,16 +4,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >;
@@ -46,3 +36,11 @@
status = "okay";
chip-delay = <25>;
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index c39e17a89f4e..1b0f070c2676 100644
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -27,15 +27,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
serial at 12000 {
status = "okay";
@@ -169,3 +160,11 @@
phy-handle = <ðphy0>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-linkstation.dtsi b/arch/arm/boot/dts/kirkwood-linkstation.dtsi
index 69061b6e987b..36c54c9dfa30 100644
--- a/arch/arm/boot/dts/kirkwood-linkstation.dtsi
+++ b/arch/arm/boot/dts/kirkwood-linkstation.dtsi
@@ -49,15 +49,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pmx_power_hdd0: pmx-power-hdd0 {
@@ -200,3 +191,11 @@
};
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index f3a991837515..aa413b0bcce2 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -17,16 +17,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pmx_led_health: pmx-led-health {
@@ -215,3 +205,11 @@
phy-handle = <ðphy1>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 26fb610b2af7..172a38c0b8a9 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -31,16 +31,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pin-controller at 10000 {
pmx_usb_led: pmx-usb-led {
@@ -179,3 +169,11 @@
duplex = <1>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-nas2big.dts b/arch/arm/boot/dts/kirkwood-nas2big.dts
index 7427ec50b829..f53bcacf6b63 100644
--- a/arch/arm/boot/dts/kirkwood-nas2big.dts
+++ b/arch/arm/boot/dts/kirkwood-nas2big.dts
@@ -28,16 +28,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
rtc at 10300 {
/* The on-chip RTC is not powered (no supercap). */
@@ -141,3 +131,11 @@
reg = <0x9100000 0x6f00000>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index fd733c63bc27..8745484912d2 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -28,16 +28,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pmx_button_power: pmx-button-power {
@@ -251,3 +241,11 @@
phy-handle = <ðphy0>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
index b514d643fb6c..a4e97f7f5804 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
@@ -28,18 +28,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- /* Connected to NEC uPD720200 USB 3.0 controller */
- pcie at 1,0 {
- /* Port 0, Lane 0 */
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pmx_button_power: pmx-button-power {
@@ -265,3 +253,12 @@
phy-handle = <ðphy0>;
};
};
+
+/* Connected to NEC uPD720200 USB 3.0 controller */
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index 6139df0f376c..0b69ee4934fa 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -15,16 +15,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pinctrl-0 = <&pmx_unknown>;
@@ -138,3 +128,11 @@
};
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts
index 2a935e94f96f..6ab104b4bb42 100644
--- a/arch/arm/boot/dts/kirkwood-nsa320.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa320.dts
@@ -27,16 +27,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pinctrl-names = "default";
@@ -222,3 +212,11 @@
phy-handle = <ðphy0>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-nsa325.dts b/arch/arm/boot/dts/kirkwood-nsa325.dts
index bc4ec9332387..36c64816bf7f 100644
--- a/arch/arm/boot/dts/kirkwood-nsa325.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa325.dts
@@ -28,16 +28,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pinctrl-names = "default";
@@ -236,3 +226,10 @@
};
};
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
index 5ccc46190079..e09b79ac73fd 100644
--- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
@@ -4,16 +4,6 @@
/ {
model = "ZyXEL NSA310";
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
@@ -157,3 +147,11 @@
reg = <0x5040000 0x2fc0000>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi
index 24f1d30970a0..e4ecab112601 100644
--- a/arch/arm/boot/dts/kirkwood-openrd.dtsi
+++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi
@@ -25,16 +25,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>;
@@ -125,3 +115,7 @@
reg = <0x0600000 0x1FA00000>;
};
};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
index e0b959396ca2..b8af907249fb 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
@@ -29,16 +29,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pinctrl-0 = <&pmx_usb_power>;
@@ -108,4 +98,12 @@
ethernet0-port at 0 {
phy-handle = <ðphy0>;
};
-};
\ No newline at end of file
+};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
index 5521426d101b..d5aacf137e40 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
@@ -25,16 +25,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pinctrl-names = "default";
@@ -134,3 +124,11 @@
duplex = <1>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-rs212.dts b/arch/arm/boot/dts/kirkwood-rs212.dts
index 3b19f1fd4cac..2c722ecd5331 100644
--- a/arch/arm/boot/dts/kirkwood-rs212.dts
+++ b/arch/arm/boot/dts/kirkwood-rs212.dts
@@ -44,6 +44,10 @@
status = "okay";
};
-&pcie2 {
+&pciec {
+ status = "okay";
+};
+
+&pcie1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index 04015c174b99..65e9524e852a 100644
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -10,20 +10,6 @@
*/
/ {
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
-
- pcie2: pcie at 2,0 {
- status = "disabled";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pmx_alarmled_12: pmx-alarmled-12 {
@@ -861,3 +847,11 @@
phy-handle = <ðphy1>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index 860c6d778d47..3500f4738fb0 100644
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -30,16 +30,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
pinctrl-0 = <&pmx_i2s &pmx_sysrst>;
@@ -229,3 +219,11 @@
phy-handle = <ðphy0>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
index 1d291f620869..3437bb396844 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
@@ -5,16 +5,6 @@
#include "kirkwood-ts219.dtsi"
/ {
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 2,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
pinctrl: pin-controller at 10000 {
@@ -63,3 +53,5 @@
};
ðphy0 { reg = <0>; };
+
+&pcie1 { status = "okay"; };
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index b3f75382cb06..62e5e2d5c348 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -12,16 +12,6 @@
stdout-path = &uart0;
};
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 1,0 {
- status = "okay";
- };
- };
- };
-
ocp at f1000000 {
i2c at 11000 {
status = "okay";
@@ -105,3 +95,11 @@
phy-handle = <ðphy0>;
};
};
+
+&pciec {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/kirkwood-ts419-6282.dts b/arch/arm/boot/dts/kirkwood-ts419-6282.dts
index d7512d4cdced..e3e71f48acc8 100644
--- a/arch/arm/boot/dts/kirkwood-ts419-6282.dts
+++ b/arch/arm/boot/dts/kirkwood-ts419-6282.dts
@@ -16,17 +16,8 @@
#include "kirkwood-ts219.dtsi"
#include "kirkwood-ts419.dtsi"
-/ {
- mbus {
- pcie-controller {
- status = "okay";
-
- pcie at 2,0 {
- status = "okay";
- };
- };
- };
-};
-
ðphy0 { reg = <0>; };
ðphy1 { reg = <1>; };
+
+&pciec { status = "okay"; };
+&pcie1 { status = "okay"; };
--
2.7.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/8] ARM: kirkwood: DT: Remove address from gpio-i2c unit name
2016-04-03 2:03 [PATCH 0/8] Various Kirkwood DT warning fixup Andrew Lunn
` (4 preceding siblings ...)
2016-04-03 2:03 ` [PATCH 5/8] ARM: kirkwood: DT: Fixup pcie DT warnings Andrew Lunn
@ 2016-04-03 2:03 ` Andrew Lunn
2016-04-03 2:03 ` [PATCH 7/8] ARM: kirkwood: DT: Add address to mbus " Andrew Lunn
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2016-04-03 2:03 UTC (permalink / raw)
To: linux-arm-kernel
gpio-i2c does not have a reg property, just a list of gpios.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-km_common.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/kirkwood-km_common.dtsi b/arch/arm/boot/dts/kirkwood-km_common.dtsi
index f6096f56046d..7962bdefde49 100644
--- a/arch/arm/boot/dts/kirkwood-km_common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-km_common.dtsi
@@ -24,7 +24,7 @@
};
};
- i2c at 0 {
+ i2c {
compatible = "i2c-gpio";
gpios = < &gpio0 8 GPIO_ACTIVE_HIGH /* sda */
&gpio0 9 GPIO_ACTIVE_HIGH>; /* scl */
--
2.7.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 7/8] ARM: kirkwood: DT: Add address to mbus unit name
2016-04-03 2:03 [PATCH 0/8] Various Kirkwood DT warning fixup Andrew Lunn
` (5 preceding siblings ...)
2016-04-03 2:03 ` [PATCH 6/8] ARM: kirkwood: DT: Remove address from gpio-i2c unit name Andrew Lunn
@ 2016-04-03 2:03 ` Andrew Lunn
2016-04-03 2:03 ` [PATCH 8/8] ARM: kirkwood: DT: Add address go regulator " Andrew Lunn
2016-04-03 12:02 ` [PATCH 0/8] Various Kirkwood DT warning fixup Gregory CLEMENT
8 siblings, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2016-04-03 2:03 UTC (permalink / raw)
To: linux-arm-kernel
The mbus node has a ranges property.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-6192.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-6281.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-6282.dtsi | 2 +-
arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 2 +-
arch/arm/boot/dts/kirkwood.dtsi | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi
index 1014a5dd9035..d573e03f3134 100644
--- a/arch/arm/boot/dts/kirkwood-6192.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6192.dtsi
@@ -1,5 +1,5 @@
/ {
- mbus {
+ mbus at f1000000 {
pciec: pcie-controller at 82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index fad201551304..748d0b62f233 100644
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -1,5 +1,5 @@
/ {
- mbus {
+ mbus at f1000000 {
pciec: pcie-controller at 82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 27434c35eb66..bb63d2d50fc5 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -1,5 +1,5 @@
/ {
- mbus {
+ mbus at f1000000 {
pciec: pcie-controller at 82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
index 17eb92733310..720c210d491d 100644
--- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
+++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
@@ -1,5 +1,5 @@
/ {
- mbus {
+ mbus at f1000000 {
pciec: pcie-controller at 82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 7445a15e259d..29b8bd7e0d93 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -27,7 +27,7 @@
i2c0 = &i2c0;
};
- mbus {
+ mbus at f1000000 {
compatible = "marvell,kirkwood-mbus", "simple-bus";
#address-cells = <2>;
#size-cells = <1>;
--
2.7.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 8/8] ARM: kirkwood: DT: Add address go regulator unit name
2016-04-03 2:03 [PATCH 0/8] Various Kirkwood DT warning fixup Andrew Lunn
` (6 preceding siblings ...)
2016-04-03 2:03 ` [PATCH 7/8] ARM: kirkwood: DT: Add address to mbus " Andrew Lunn
@ 2016-04-03 2:03 ` Andrew Lunn
2016-04-03 12:02 ` [PATCH 0/8] Various Kirkwood DT warning fixup Gregory CLEMENT
8 siblings, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2016-04-03 2:03 UTC (permalink / raw)
To: linux-arm-kernel
The regulator has a reg property so include it in the unit name.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 2 +-
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index 8745484912d2..c0413b63cf2e 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -183,7 +183,7 @@
#address-cells = <1>;
#size-cells = <0>;
- usb3_regulator: usb3-regulator {
+ usb3_regulator: usb3-regulator at 1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "USB 3.0 Power";
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
index a4e97f7f5804..2bfc6cfa151d 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
@@ -193,7 +193,7 @@
#address-cells = <1>;
#size-cells = <0>;
- usb3_regulator: usb3-regulator {
+ usb3_regulator: usb3-regulator at 1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "USB 3.0 Power";
--
2.7.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 0/8] Various Kirkwood DT warning fixup
2016-04-03 2:03 [PATCH 0/8] Various Kirkwood DT warning fixup Andrew Lunn
` (7 preceding siblings ...)
2016-04-03 2:03 ` [PATCH 8/8] ARM: kirkwood: DT: Add address go regulator " Andrew Lunn
@ 2016-04-03 12:02 ` Gregory CLEMENT
2016-04-03 12:16 ` Gregory CLEMENT
2016-04-03 14:05 ` Andrew Lunn
8 siblings, 2 replies; 12+ messages in thread
From: Gregory CLEMENT @ 2016-04-03 12:02 UTC (permalink / raw)
To: linux-arm-kernel
Hi Andrew,
On dim., avril 03 2016, Andrew Lunn <andrew@lunn.ch> wrote:
> This patchset fixes up various warning from the newer DT compiler
> currently in net-next.
>
> In order to not break everything, i decompiled the generated .dtb
> files before and after these patches and compared the diff.
Great job!
I will do the same for the armada-* devie tree file.
Could you tell me more about the comparison you did?
Did you use the recenty added dtx_diff tools?
Or did you check that the binary was the same?
Thanks,
Gregory
>
> Andrew Lunn (8):
> ARM: kirkwood: DT: Remove button address and fixup names
> ARM: kirkwood: DT: Remove node address from leds
> ARM: kirkwood: DT: Remove address from dsa unit name
> ARM: kirkwood: DT: Add address to ethernet-phy unit name
> ARM: kirkwood: DT: Fixup pcie DT warnings
> ARM: kirkwood: DT: Remove address from gpio-i2c unit name
> ARM: kirkwood: DT: Add address to mbus unit name
> ARM: kirkwood: DT: Add address go regulator unit name
>
> arch/arm/boot/dts/kirkwood-6192.dtsi | 4 ++--
> arch/arm/boot/dts/kirkwood-6281.dtsi | 4 ++--
> arch/arm/boot/dts/kirkwood-6282.dtsi | 4 ++--
> arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 4 ++--
> arch/arm/boot/dts/kirkwood-b3.dts | 19 ++++++++---------
> arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts | 4 ++--
> arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +-
> arch/arm/boot/dts/kirkwood-db-88f6281.dts | 14 ++++++-------
> arch/arm/boot/dts/kirkwood-db-88f6282.dts | 20 ++++++++----------
> arch/arm/boot/dts/kirkwood-dir665.dts | 20 ++++++++----------
> arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +++---
> arch/arm/boot/dts/kirkwood-ds111.dts | 2 +-
> arch/arm/boot/dts/kirkwood-ds112.dts | 6 +++++-
> arch/arm/boot/dts/kirkwood-ds212.dts | 2 +-
> arch/arm/boot/dts/kirkwood-ds411.dts | 6 +++++-
> arch/arm/boot/dts/kirkwood-ds411slim.dts | 2 +-
> arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 ++--
> arch/arm/boot/dts/kirkwood-iconnect.dts | 22 +++++++++-----------
> arch/arm/boot/dts/kirkwood-km_common.dtsi | 20 ++++++++----------
> arch/arm/boot/dts/kirkwood-laplug.dts | 19 ++++++++---------
> arch/arm/boot/dts/kirkwood-linkstation.dtsi | 17 ++++++++-------
> arch/arm/boot/dts/kirkwood-lsxl.dtsi | 16 +++++++--------
> arch/arm/boot/dts/kirkwood-mplcec4.dts | 18 ++++++++--------
> arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 24 ++++++++++------------
> arch/arm/boot/dts/kirkwood-nas2big.dts | 18 ++++++++--------
> .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 20 ++++++++----------
> .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 23 +++++++++------------
> arch/arm/boot/dts/kirkwood-netxbig.dtsi | 8 ++++----
> arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 4 ++--
> arch/arm/boot/dts/kirkwood-nsa310.dts | 18 ++++++++--------
> arch/arm/boot/dts/kirkwood-nsa320.dts | 18 ++++++++--------
> arch/arm/boot/dts/kirkwood-nsa325.dts | 17 +++++++--------
> arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 24 ++++++++++------------
> arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +-
> arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 +-
> arch/arm/boot/dts/kirkwood-openrd.dtsi | 14 ++++---------
> arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 2 +-
> arch/arm/boot/dts/kirkwood-rd88f6192.dts | 20 ++++++++----------
> arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 2 +-
> arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 2 +-
> arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 20 ++++++++----------
> arch/arm/boot/dts/kirkwood-rs212.dts | 6 +++++-
> arch/arm/boot/dts/kirkwood-synology.dtsi | 22 ++++++++------------
> arch/arm/boot/dts/kirkwood-t5325.dts | 22 +++++++++-----------
> arch/arm/boot/dts/kirkwood-ts219-6281.dts | 4 ++--
> arch/arm/boot/dts/kirkwood-ts219-6282.dts | 16 ++++-----------
> arch/arm/boot/dts/kirkwood-ts219.dtsi | 20 ++++++++----------
> arch/arm/boot/dts/kirkwood-ts419-6282.dts | 15 +++-----------
> arch/arm/boot/dts/kirkwood-ts419.dtsi | 4 ++--
> arch/arm/boot/dts/kirkwood.dtsi | 2 +-
> 50 files changed, 262 insertions(+), 322 deletions(-)
>
> --
> 2.7.0
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 0/8] Various Kirkwood DT warning fixup
2016-04-03 12:02 ` [PATCH 0/8] Various Kirkwood DT warning fixup Gregory CLEMENT
@ 2016-04-03 12:16 ` Gregory CLEMENT
2016-04-03 14:05 ` Andrew Lunn
1 sibling, 0 replies; 12+ messages in thread
From: Gregory CLEMENT @ 2016-04-03 12:16 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On dim., avril 03 2016, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:
> Hi Andrew,
>
> On dim., avril 03 2016, Andrew Lunn <andrew@lunn.ch> wrote:
>
>> This patchset fixes up various warning from the newer DT compiler
>> currently in net-next.
>>
>> In order to not break everything, i decompiled the generated .dtb
>> files before and after these patches and compared the diff.
>
> Great job!
>
> I will do the same for the armada-* devie tree file.
>
> Could you tell me more about the comparison you did?
>
> Did you use the recenty added dtx_diff tools?
> Or did you check that the binary was the same?
>
> Thanks,
>
> Gregory
>
>>
>> Andrew Lunn (8):
>> ARM: kirkwood: DT: Remove button address and fixup names
>> ARM: kirkwood: DT: Remove node address from leds
>> ARM: kirkwood: DT: Remove address from dsa unit name
>> ARM: kirkwood: DT: Add address to ethernet-phy unit name
>> ARM: kirkwood: DT: Fixup pcie DT warnings
>> ARM: kirkwood: DT: Remove address from gpio-i2c unit name
>> ARM: kirkwood: DT: Add address to mbus unit name
>> ARM: kirkwood: DT: Add address go regulator unit name
I added all these patch to mvebu/dt and in mvebu/for-next in order to
allow them to be tested long time enough.
Thanks,
Gregory
>>
>> arch/arm/boot/dts/kirkwood-6192.dtsi | 4 ++--
>> arch/arm/boot/dts/kirkwood-6281.dtsi | 4 ++--
>> arch/arm/boot/dts/kirkwood-6282.dtsi | 4 ++--
>> arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 4 ++--
>> arch/arm/boot/dts/kirkwood-b3.dts | 19 ++++++++---------
>> arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts | 4 ++--
>> arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +-
>> arch/arm/boot/dts/kirkwood-db-88f6281.dts | 14 ++++++-------
>> arch/arm/boot/dts/kirkwood-db-88f6282.dts | 20 ++++++++----------
>> arch/arm/boot/dts/kirkwood-dir665.dts | 20 ++++++++----------
>> arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +++---
>> arch/arm/boot/dts/kirkwood-ds111.dts | 2 +-
>> arch/arm/boot/dts/kirkwood-ds112.dts | 6 +++++-
>> arch/arm/boot/dts/kirkwood-ds212.dts | 2 +-
>> arch/arm/boot/dts/kirkwood-ds411.dts | 6 +++++-
>> arch/arm/boot/dts/kirkwood-ds411slim.dts | 2 +-
>> arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 ++--
>> arch/arm/boot/dts/kirkwood-iconnect.dts | 22 +++++++++-----------
>> arch/arm/boot/dts/kirkwood-km_common.dtsi | 20 ++++++++----------
>> arch/arm/boot/dts/kirkwood-laplug.dts | 19 ++++++++---------
>> arch/arm/boot/dts/kirkwood-linkstation.dtsi | 17 ++++++++-------
>> arch/arm/boot/dts/kirkwood-lsxl.dtsi | 16 +++++++--------
>> arch/arm/boot/dts/kirkwood-mplcec4.dts | 18 ++++++++--------
>> arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 24 ++++++++++------------
>> arch/arm/boot/dts/kirkwood-nas2big.dts | 18 ++++++++--------
>> .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 20 ++++++++----------
>> .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 23 +++++++++------------
>> arch/arm/boot/dts/kirkwood-netxbig.dtsi | 8 ++++----
>> arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 4 ++--
>> arch/arm/boot/dts/kirkwood-nsa310.dts | 18 ++++++++--------
>> arch/arm/boot/dts/kirkwood-nsa320.dts | 18 ++++++++--------
>> arch/arm/boot/dts/kirkwood-nsa325.dts | 17 +++++++--------
>> arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 24 ++++++++++------------
>> arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +-
>> arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 +-
>> arch/arm/boot/dts/kirkwood-openrd.dtsi | 14 ++++---------
>> arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 2 +-
>> arch/arm/boot/dts/kirkwood-rd88f6192.dts | 20 ++++++++----------
>> arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 2 +-
>> arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 2 +-
>> arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 20 ++++++++----------
>> arch/arm/boot/dts/kirkwood-rs212.dts | 6 +++++-
>> arch/arm/boot/dts/kirkwood-synology.dtsi | 22 ++++++++------------
>> arch/arm/boot/dts/kirkwood-t5325.dts | 22 +++++++++-----------
>> arch/arm/boot/dts/kirkwood-ts219-6281.dts | 4 ++--
>> arch/arm/boot/dts/kirkwood-ts219-6282.dts | 16 ++++-----------
>> arch/arm/boot/dts/kirkwood-ts219.dtsi | 20 ++++++++----------
>> arch/arm/boot/dts/kirkwood-ts419-6282.dts | 15 +++-----------
>> arch/arm/boot/dts/kirkwood-ts419.dtsi | 4 ++--
>> arch/arm/boot/dts/kirkwood.dtsi | 2 +-
>> 50 files changed, 262 insertions(+), 322 deletions(-)
>>
>> --
>> 2.7.0
>>
>
> --
> Gregory Clement, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 0/8] Various Kirkwood DT warning fixup
2016-04-03 12:02 ` [PATCH 0/8] Various Kirkwood DT warning fixup Gregory CLEMENT
2016-04-03 12:16 ` Gregory CLEMENT
@ 2016-04-03 14:05 ` Andrew Lunn
1 sibling, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2016-04-03 14:05 UTC (permalink / raw)
To: linux-arm-kernel
> Could you tell me more about the comparison you did?
Hi Gregory
I used dtc -o foo.dts -O dts -I dtb foo.dtb to turn the generated
binary blob back into ascii and then used diff.
Andrew
^ permalink raw reply [flat|nested] 12+ messages in thread