target/linux/mvebu/patches-3.18/010-add_node_alias_to_pinctrl_and_add_base_address.patch

   1 From 264a05e19bf50f93f1a377e16497a626ae9f931e Mon Sep 17 00:00:00 2001
   2 From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
   3 Date: Fri, 19 Sep 2014 21:12:00 +0200
   4 Subject: ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address
   5
   6 In other MVEBU SoCs, the pin controller node is called pin-ctrl with
   7 its base address added. Also, we have a node alias to access the pinctrl
   8 node easily. Fix this for Armada XP pinctrl nodes to be consistent with
   9 other SoCs.
  10
  11 Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  12 Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  13 Tested-By: Benoit Masson <yahoo@perenite.com>
  14 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  15
  16 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
  17 +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
  18 @@ -60,7 +60,7 @@
  19                 };
  20
  21                 internal-regs {
  22 -                       pinctrl {
  23 +                       pinctrl: pin-ctrl@18000 {
  24                                 pinctrl-0 = <&pmx_phy_int>;
  25                                 pinctrl-names = "default";
  26
  27 --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
  28 +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
  29 @@ -51,7 +51,7 @@
  30                 };
  31
  32                 internal-regs {
  33 -                       pinctrl {
  34 +                       pinctrl: pin-ctrl@18000 {
  35                                 poweroff_pin: poweroff-pin {
  36                                         marvell,pins = "mpp24";
  37                                         marvell,function = "gpio";
  38 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
  39 +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
  40 @@ -167,7 +167,7 @@
  41                 };
  42
  43                 internal-regs {
  44 -                       pinctrl {
  45 +                       pinctrl: pin-ctrl@18000 {
  46                                 compatible = "marvell,mv78230-pinctrl";
  47                         };
  48
  49 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
  50 +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
  51 @@ -251,7 +251,7 @@
  52                 };
  53
  54                 internal-regs {
  55 -                       pinctrl {
  56 +                       pinctrl: pin-ctrl@18000 {
  57                                 compatible = "marvell,mv78260-pinctrl";
  58                         };
  59
  60 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
  61 +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
  62 @@ -289,7 +289,7 @@
  63                 };
  64
  65                 internal-regs {
  66 -                       pinctrl {
  67 +                       pinctrl: pin-ctrl@18000 {
  68                                 compatible = "marvell,mv78460-pinctrl";
  69                         };
  70
  71 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
  72 +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
  73 @@ -55,7 +55,7 @@
  74                 };
  75
  76                 internal-regs {
  77 -                       pinctrl {
  78 +                       pinctrl: pin-ctrl@18000 {
  79                                 poweroff: poweroff {
  80                                         marvell,pins = "mpp42";
  81                                         marvell,function = "gpio";
  82 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
  83 +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
  84 @@ -81,7 +81,7 @@
  85                         serial@12100 {
  86                                 status = "okay";
  87                         };
  88 -                       pinctrl {
  89 +                       pinctrl: pin-ctrl@18000 {
  90                                 led_pins: led-pins-0 {
  91                                         marvell,pins = "mpp49", "mpp51", "mpp53";
  92                                         marvell,function = "gpio";
  93 --- a/arch/arm/boot/dts/armada-xp.dtsi
  94 +++ b/arch/arm/boot/dts/armada-xp.dtsi
  95 @@ -72,7 +72,7 @@
  96                                 status = "disabled";
  97                         };
  98
  99 -                       pinctrl {
 100 +                       pinctrl: pin-ctrl@18000 {
 101                                 reg = <0x18000 0x38>;
 102
 103                                 sdio_pins: sdio-pins {