024-ARM-mvebu-a38x-Fix-node-names.patch 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485
  1. From 4a25432b13090b57d257fa0ffb6712d8acf94523 Mon Sep 17 00:00:00 2001
  2. From: Maxime Ripard <maxime.ripard@free-electrons.com>
  3. Date: Thu, 8 Jan 2015 18:38:05 +0100
  4. Subject: [PATCH 1/4] ARM: mvebu: a38x: Fix node names
  5. Some nodes in the DTs have a reg property but no unit name in their node name.
  6. This contradicts the way the ePAPR defines the node names. Fix this.
  7. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  8. Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
  9. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
  10. Signed-off-by: Andrew Lunn <andrew@lunn.ch>
  11. ---
  12. arch/arm/boot/dts/armada-380.dtsi | 2 +-
  13. arch/arm/boot/dts/armada-385-db.dts | 2 +-
  14. arch/arm/boot/dts/armada-385-rd.dts | 2 +-
  15. arch/arm/boot/dts/armada-385.dtsi | 2 +-
  16. arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
  17. 5 files changed, 6 insertions(+), 6 deletions(-)
  18. --- a/arch/arm/boot/dts/armada-380.dtsi
  19. +++ b/arch/arm/boot/dts/armada-380.dtsi
  20. @@ -32,7 +32,7 @@
  21. soc {
  22. internal-regs {
  23. - pinctrl {
  24. + pinctrl@18000 {
  25. compatible = "marvell,mv88f6810-pinctrl";
  26. reg = <0x18000 0x20>;
  27. };
  28. --- a/arch/arm/boot/dts/armada-385-db.dts
  29. +++ b/arch/arm/boot/dts/armada-385-db.dts
  30. @@ -74,7 +74,7 @@
  31. phy-mode = "rgmii-id";
  32. };
  33. - mdio {
  34. + mdio@72004 {
  35. phy0: ethernet-phy@0 {
  36. reg = <0>;
  37. };
  38. --- a/arch/arm/boot/dts/armada-385-rd.dts
  39. +++ b/arch/arm/boot/dts/armada-385-rd.dts
  40. @@ -67,7 +67,7 @@
  41. };
  42. - mdio {
  43. + mdio@72004 {
  44. phy0: ethernet-phy@0 {
  45. reg = <0>;
  46. };
  47. --- a/arch/arm/boot/dts/armada-385.dtsi
  48. +++ b/arch/arm/boot/dts/armada-385.dtsi
  49. @@ -37,7 +37,7 @@
  50. soc {
  51. internal-regs {
  52. - pinctrl {
  53. + pinctrl@18000 {
  54. compatible = "marvell,mv88f6820-pinctrl";
  55. reg = <0x18000 0x20>;
  56. };
  57. --- a/arch/arm/boot/dts/armada-38x.dtsi
  58. +++ b/arch/arm/boot/dts/armada-38x.dtsi
  59. @@ -193,7 +193,7 @@
  60. status = "disabled";
  61. };
  62. - pinctrl {
  63. + pinctrl@18000 {
  64. compatible = "marvell,mv88f6820-pinctrl";
  65. reg = <0x18000 0x20>;
  66. @@ -412,7 +412,7 @@
  67. status = "disabled";
  68. };
  69. - mdio {
  70. + mdio@72004 {
  71. #address-cells = <1>;
  72. #size-cells = <0>;
  73. compatible = "marvell,orion-mdio";