12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485 |
- From 4a25432b13090b57d257fa0ffb6712d8acf94523 Mon Sep 17 00:00:00 2001
- From: Maxime Ripard <maxime.ripard@free-electrons.com>
- Date: Thu, 8 Jan 2015 18:38:05 +0100
- Subject: [PATCH 1/4] ARM: mvebu: a38x: Fix node names
- Some nodes in the DTs have a reg property but no unit name in their node name.
- This contradicts the way the ePAPR defines the node names. Fix this.
- Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
- Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
- Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
- Signed-off-by: Andrew Lunn <andrew@lunn.ch>
- ---
- arch/arm/boot/dts/armada-380.dtsi | 2 +-
- arch/arm/boot/dts/armada-385-db.dts | 2 +-
- arch/arm/boot/dts/armada-385-rd.dts | 2 +-
- arch/arm/boot/dts/armada-385.dtsi | 2 +-
- arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
- 5 files changed, 6 insertions(+), 6 deletions(-)
- --- a/arch/arm/boot/dts/armada-380.dtsi
- +++ b/arch/arm/boot/dts/armada-380.dtsi
- @@ -32,7 +32,7 @@
-
- soc {
- internal-regs {
- - pinctrl {
- + pinctrl@18000 {
- compatible = "marvell,mv88f6810-pinctrl";
- reg = <0x18000 0x20>;
- };
- --- a/arch/arm/boot/dts/armada-385-db.dts
- +++ b/arch/arm/boot/dts/armada-385-db.dts
- @@ -74,7 +74,7 @@
- phy-mode = "rgmii-id";
- };
-
- - mdio {
- + mdio@72004 {
- phy0: ethernet-phy@0 {
- reg = <0>;
- };
- --- a/arch/arm/boot/dts/armada-385-rd.dts
- +++ b/arch/arm/boot/dts/armada-385-rd.dts
- @@ -67,7 +67,7 @@
- };
-
-
- - mdio {
- + mdio@72004 {
- phy0: ethernet-phy@0 {
- reg = <0>;
- };
- --- a/arch/arm/boot/dts/armada-385.dtsi
- +++ b/arch/arm/boot/dts/armada-385.dtsi
- @@ -37,7 +37,7 @@
-
- soc {
- internal-regs {
- - pinctrl {
- + pinctrl@18000 {
- compatible = "marvell,mv88f6820-pinctrl";
- reg = <0x18000 0x20>;
- };
- --- a/arch/arm/boot/dts/armada-38x.dtsi
- +++ b/arch/arm/boot/dts/armada-38x.dtsi
- @@ -193,7 +193,7 @@
- status = "disabled";
- };
-
- - pinctrl {
- + pinctrl@18000 {
- compatible = "marvell,mv88f6820-pinctrl";
- reg = <0x18000 0x20>;
-
- @@ -412,7 +412,7 @@
- status = "disabled";
- };
-
- - mdio {
- + mdio@72004 {
- #address-cells = <1>;
- #size-cells = <0>;
- compatible = "marvell,orion-mdio";
|