Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC device tree changes from Arnd Bergmann:
 "These changes from 30 individual branches for the most part update
  device tree files, but there are also a few source code changes that
  have crept in this time, usually in order to atomically move over a
  driver from using hardcoded data to DT probing.

  A number of platforms change their DT files to use the C preprocessor,
  which is causing a bit of churn, but that is hopefully only this once"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits)
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string
  ARM: Kirkwood: Fix the internal register ranges translation
  ARM: dts: bcm281xx: change comment to C89 style
  ARM: mmc: bcm281xx SDHCI driver (dt mods)
  ARM: nomadik: add the new clocks to the device tree
  clk: nomadik: implement the Nomadik clocks properly
  ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
  ARM: dts: omap4-panda: Fix DVI EDID reads
  ARM: dts: omap4-panda: Add USB Host support
  arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
  ARM: shmobile: irqpin: add a DT property to enable masking on parent
  ARM: dts: AM43x EPOS EVM support
  ARM: dts: OMAP5: Add bandgap DT entry
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
  ...

1 files changed, 12 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 996c7fefd253..31b17f5b9d28 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -8,16 +8,6 @@
 
         ocp@f1000000 {
                 pinctrl: pinctrl@10000 {
-
-                        pinctrl-0 = < &pmx_power_hdd &pmx_usb_vbus
-                                      &pmx_fan_low &pmx_fan_high
-                                      &pmx_led_function_red &pmx_led_alarm
-                                      &pmx_led_info &pmx_led_power
-                                      &pmx_fan_lock &pmx_button_function
-                                      &pmx_power_switch &pmx_power_auto_switch
-                                      &pmx_led_function_blue >;
-                        pinctrl-names = "default";
-
                         pmx_power_hdd: pmx-power-hdd {
                                 marvell,pins = "mpp10";
                                 marvell,function = "gpo";
@@ -112,6 +102,10 @@
                 compatible = "gpio-keys";
                 #address-cells = <1>;
                 #size-cells = <0>;
+                pinctrl-0 = <&pmx_button_function &pmx_power_switch
+                             &pmx_power_auto_switch>;
+                pinctrl-names = "default";
+
                 button@1 {
                         label = "Function Button";
                         linux,code = <357>;
@@ -133,6 +127,10 @@
 
         gpio_leds {
                 compatible = "gpio-leds";
+                pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm
+                             &pmx_led_info &pmx_led_power
+                             &pmx_led_function_blue>;
+                pinctrl-names = "default";
 
                 led@1 {
                         label = "lsxl:blue:func";
@@ -163,6 +161,8 @@
 
         gpio_fan {
                 compatible = "gpio-fan";
+                pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>;
+                pinctrl-names = "default";
                 gpios = <&gpio0 19 1
                          &gpio0 18 1>;
                 gpio-fan,speed-map = <0    3
@@ -180,6 +180,8 @@
                 compatible = "simple-bus";
                 #address-cells = <1>;
                 #size-cells = <0>;
+                pinctrl-0 = <&pmx_power_hdd &pmx_usb_vbus>;
+                pinctrl-names = "default";
 
                 usb_power: regulator@1 {
                         compatible = "regulator-fixed";