Home Explore Help
Register Sign In
wareck
/
openwrt_chaos_calmer
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: c3df3ea581
Branches Tags
openwrt_chaos_c...
/
target
/
linux
/
mvebu
/
patches-3.18
/
008-armada-xp_consolidate_pinctrl_node.patch

008-armada-xp_consolidate_pinctrl_node.patch 2.3 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081 
  1. From b324fa60ac94b9c00c59f621743715c036d134fa Mon Sep 17 00:00:00 2001
    2. 

  2. From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
    3. 

  3. Date: Fri, 19 Sep 2014 21:07:09 +0200
    4. 

  4. Subject: ARM: mvebu: armada-xp: Consolidate pinctrl node
    5. 

  5. 

  6. All current Armada XP SoCs have their pin controller at 0x18000/0x38.
    7. 

  7. Move the common properties of pinctrl nodes to armada-xp.dtsi to allow
    8. 

  8. to share pinctrl settings later.
    9. 

  9. 

  10. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
    11. 

  11. Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
    12. 

  12. Tested-By: Benoit Masson <yahoo@perenite.com>
    13. 

  13. Signed-off-by: Jason Cooper <jason@lakedaemon.net>
    14. 

  14. 

  15. --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
    16. 

  16. +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
    17. 

  17. @@ -169,13 +169,6 @@
    18. 

  18.  		internal-regs {
    19. 

  19.  			pinctrl {
    20. 

  20.  				compatible = "marvell,mv78230-pinctrl";
    21. 

  21. -				reg = <0x18000 0x38>;
    22. 

  22. -
    23. 

  23. -				sdio_pins: sdio-pins {
    24. 

  24. -					marvell,pins = "mpp30", "mpp31", "mpp32",
    25. 

  25. -						       "mpp33", "mpp34", "mpp35";
    26. 

  26. -					marvell,function = "sd0";
    27. 

  27. -				};
    28. 

  28.  			};
    29. 

  29.  
    30. 

  30.  			gpio0: gpio@18100 {
    31. 

  31. --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
    32. 

  32. +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
    33. 

  33. @@ -253,13 +253,6 @@
    34. 

  34.  		internal-regs {
    35. 

  35.  			pinctrl {
    36. 

  36.  				compatible = "marvell,mv78260-pinctrl";
    37. 

  37. -				reg = <0x18000 0x38>;
    38. 

  38. -
    39. 

  39. -				sdio_pins: sdio-pins {
    40. 

  40. -					marvell,pins = "mpp30", "mpp31", "mpp32",
    41. 

  41. -						       "mpp33", "mpp34", "mpp35";
    42. 

  42. -					marvell,function = "sd0";
    43. 

  43. -				};
    44. 

  44.  			};
    45. 

  45.  
    46. 

  46.  			gpio0: gpio@18100 {
    47. 

  47. --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
    48. 

  48. +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
    49. 

  49. @@ -291,13 +291,6 @@
    50. 

  50.  		internal-regs {
    51. 

  51.  			pinctrl {
    52. 

  52.  				compatible = "marvell,mv78460-pinctrl";
    53. 

  53. -				reg = <0x18000 0x38>;
    54. 

  54. -
    55. 

  55. -				sdio_pins: sdio-pins {
    56. 

  56. -					marvell,pins = "mpp30", "mpp31", "mpp32",
    57. 

  57. -						       "mpp33", "mpp34", "mpp35";
    58. 

  58. -					marvell,function = "sd0";
    59. 

  59. -				};
    60. 

  60.  			};
    61. 

  61.  
    62. 

  62.  			gpio0: gpio@18100 {
    63. 

  63. --- a/arch/arm/boot/dts/armada-xp.dtsi
    64. 

  64. +++ b/arch/arm/boot/dts/armada-xp.dtsi
    65. 

  65. @@ -72,6 +72,16 @@
    66. 

  66.  				status = "disabled";
    67. 

  67.  			};
    68. 

  68.  
    69. 

  69. +			pinctrl {
    70. 

  70. +				reg = <0x18000 0x38>;
    71. 

  71. +
    72. 

  72. +				sdio_pins: sdio-pins {
    73. 

  73. +					marvell,pins = "mpp30", "mpp31", "mpp32",
    74. 

  74. +						       "mpp33", "mpp34", "mpp35";
    75. 

  75. +					marvell,function = "sd0";
    76. 

  76. +				};
    77. 

  77. +			};
    78. 

  78. +
    79. 

  79.  			system-controller@18200 {
    80. 

  80.  				compatible = "marvell,armada-370-xp-system-controller";
    81. 

  81.  				reg = <0x18200 0x500>;
    82.