Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-3.14.y

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: dts: dra7xx-clocks: Fix the l3 and l4 clock rates
  ARM: dts: dra72-evm: Mark TPS as wakeup capable pin
  ARM: AM437x: use pdata quirks for pinctrl information
  ARM: DRA7: use pdata quirks for pinctrl information
  ARM: OMAP5: use pdata quirks for pinctrl information
  pinctrl: single: AM437x: Add pinctrl compatibility
  pinctrl: single: add DRA7 pinctrl compatibility
  pinctrl: bindings: Add OMAP pinctrl binding
  ARM: dts: AM437x: switch to compatible pinctrl
  ARM: dts: DRA7: switch to compatible pinctrl
  ARM: dts: OMAP5: switch to compatible pinctrl

Conflicts:
	arch/arm/boot/dts/dra72-evm.dts

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dra72-evm.dts
index f10cf9b,36de6e2..9e3d2d2
--- 1/arch/arm/boot/dts/dra72-evm.dts
--- 2/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@@ -34,57 -34,11 +34,63 @@@
                >;
        };
  
 +      cpsw_default: cpsw_default {
 +              pinctrl-single,pins = <
 +                      /* Slave 2 */
 +                      0x198 (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_tclk */
 +                      0x19c (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_tctl */
 +                      0x1a0 (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_td3 */
 +                      0x1a4 (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_td2 */
 +                      0x1a8 (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_td1 */
 +                      0x1ac (PIN_OUTPUT | MUX_MODE3)  /* rgmii2_td0 */
 +                      0x1b0 (PIN_INPUT | MUX_MODE3)   /* rgmii2_rclk */
 +                      0x1b4 (PIN_INPUT | MUX_MODE3)   /* rgmii2_rctl */
 +                      0x1b8 (PIN_INPUT | MUX_MODE3)   /* rgmii2_rd3 */
 +                      0x1bc (PIN_INPUT | MUX_MODE3)   /* rgmii2_rd2 */
 +                      0x1c0 (PIN_INPUT | MUX_MODE3)   /* rgmii2_rd1 */
 +                      0x1c4 (PIN_INPUT | MUX_MODE3)   /* rgmii2_rd0 */
 +              >;
 +
 +      };
 +
 +      cpsw_sleep: cpsw_sleep {
 +              pinctrl-single,pins = <
 +                      /* Slave 1 */
 +                      0x198 (PIN_OFF_NONE)
 +                      0x19c (PIN_OFF_NONE)
 +                      0x1a0 (PIN_OFF_NONE)
 +                      0x1a4 (PIN_OFF_NONE)
 +                      0x1a8 (PIN_OFF_NONE)
 +                      0x1ac (PIN_OFF_NONE)
 +                      0x1b0 (PIN_OFF_NONE)
 +                      0x1b4 (PIN_OFF_NONE)
 +                      0x1b8 (PIN_OFF_NONE)
 +                      0x1bc (PIN_OFF_NONE)
 +                      0x1c0 (PIN_OFF_NONE)
 +                      0x1c4 (PIN_OFF_NONE)
 +              >;
 +      };
 +
 +      davinci_mdio_default: davinci_mdio_default {
 +              pinctrl-single,pins = <
 +                      /* MDIO */
 +                      0x23c (PIN_OUTPUT_PULLUP | MUX_MODE0)   /* mdio_data */
 +                      0x240 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mdio_clk */
 +              >;
 +      };
 +
 +      davinci_mdio_sleep: davinci_mdio_sleep {
 +              pinctrl-single,pins = <
 +                      0x23c (PIN_OFF_NONE)
 +                      0x240 (PIN_OFF_NONE)
 +              >;
 +      };
++
+       tps65917_pins_default: tps65917_pins_default {
+               pinctrl-single,pins = <
+                       0x424 (PIN_INPUT_PULLUP | MUX_MODE1)    /* wakeup3.sys_nirq1 */
+               >;
+       };
  };
  
  &i2c1 {

diff --cc arch/arm/boot/dts/dra7xx-clocks.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge

diff --cc arch/arm/mach-omap2/pdata-quirks.c
Simple merge