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

Pull in the platform base tree for resynching with the latest platform
base code. This is mainly done to optimize the precompiler macro usage
in pdata-quirks, and for better merge conflict resolutions.

* '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
  ARM: dts: DRA7: Add PMU nodes
  ARM: dts: OMAP5: add pmu node
  ti_config_fragments/baseport.cfg: Fix a comment using unsupported format

Signed-off-by: Suman Anna <s-anna@ti.com>

Conflicts:
	arch/arm/boot/dts/dra74x.dtsi

11 files changed, 81 insertions, 10 deletions

diff --git a/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt
new file mode 100644
index 00000000000..af225fe72c8
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt
@@ -0,0 +1,11 @@
+OMAP Pinctrl definitions
+
+Required properties:
+- compatible : Should be one of:
+  "ti,omap3-padconf" - OMAP3 compatible pinctrl
+  "ti,omap4-padconf" - OMAP4 compatible pinctrl
+  "ti,omap5-padconf" - OMAP5 compatible pinctrl
+  "ti,dra7-padconf" - DRA7 compatible pinctrl
+  "ti,am437-padconf" - AM437x compatible pinctrl
+
+See Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt for further details.
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 98c19518bf1..72398311c3e 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -58,10 +58,12 @@
         };
 
         am43xx_pinmux: pinmux@44e10800 {
-                compatible = "pinctrl-single";
+                compatible = "ti,am437-padconf", "pinctrl-single";
                 reg = <0x44e10800 0x31c>;
                 #address-cells = <1>;
                 #size-cells = <0>;
+                #interrupt-cells = <1>;
+                interrupt-controller;
                 pinctrl-single,register-width = <32>;
                 pinctrl-single,function-mask = <0xffffffff>;
         };
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 7456bace28d..28671c6fbef 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -161,10 +161,12 @@
                 };
 
                 dra7_pmx_core: pinmux@4a003400 {
-                        compatible = "pinctrl-single";
+                        compatible = "ti,dra7-padconf", "pinctrl-single";
                         reg = <0x4a003400 0x0464>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        #interrupt-cells = <1>;
+                        interrupt-controller;
                         pinctrl-single,register-width = <32>;
                         pinctrl-single,function-mask = <0x3fffffff>;
                 };
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index 16ea1d2d1e9..285172caeb6 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -33,6 +33,12 @@
                         0x404 (PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */
                 >;
         };
+
+        tps65917_pins_default: tps65917_pins_default {
+                pinctrl-single,pins = <
+                        0x424 (PIN_INPUT_PULLUP | MUX_MODE1)    /* wakeup3.sys_nirq1 */
+                >;
+        };
 };
 
 &i2c1 {
@@ -45,7 +51,10 @@
                 compatible = "ti,tps65917";
                 reg = <0x58>;
 
-                interrupts = <GIC_SPI 2 IRQ_TYPE_NONE>;  /* IRQ_SYS_1N */
+                pinctrl-names = "default";
+                pinctrl-0 = <&tps65917_pins_default>;
+                interrupts-extended = <&gic GIC_SPI 2 IRQ_TYPE_NONE
+                                        &dra7_pmx_core 0x424>;
                 interrupt-parent = <&gic>;
                 interrupt-controller;
                 #interrupt-cells = <2>;
diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
index f1ec22f6ebf..e5a3d23a3df 100644
--- a/arch/arm/boot/dts/dra72x.dtsi
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@ -22,4 +22,9 @@
                         reg = <0>;
                 };
         };
+
+        pmu {
+                compatible = "arm,cortex-a15-pmu";
+                interrupts = <GIC_SPI DIRECT_IRQ(131) IRQ_TYPE_LEVEL_HIGH>;
+        };
 };
diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi
index 390dd68c955..c345bde066b 100644
--- a/arch/arm/boot/dts/dra74x.dtsi
+++ b/arch/arm/boot/dts/dra74x.dtsi
@@ -58,4 +58,10 @@
                         status = "disabled";
                 };
         };
+
+        pmu {
+                compatible = "arm,cortex-a15-pmu";
+                interrupts = <GIC_SPI DIRECT_IRQ(131) IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI DIRECT_IRQ(132) IRQ_TYPE_LEVEL_HIGH>;
+        };
 };
diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index 3b980e857f2..01f1ddafd5f 100644
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -673,10 +673,12 @@
 
         l3_iclk_div: l3_iclk_div {
                 #clock-cells = <0>;
-                compatible = "fixed-factor-clock";
+                compatible = "ti,divider-clock";
+                ti,max-div = <2>;
+                ti,bit-shift = <4>;
+                reg = <0x0100>;
                 clocks = <&dpll_core_h12x2_ck>;
-                clock-mult = <1>;
-                clock-div = <1>;
+                ti,index-power-of-two;
         };
 
         l4_root_clk_div: l4_root_clk_div {
@@ -684,7 +686,7 @@
                 compatible = "fixed-factor-clock";
                 clocks = <&l3_iclk_div>;
                 clock-mult = <1>;
-                clock-div = <1>;
+                clock-div = <2>;
         };
 
         video1_clk2_div: video1_clk2_div {
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 52b5b31d287..b12a6798a32 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -81,6 +81,12 @@
                              <GIC_PPI 10 (GIC_CPU_MASK_RAW(3) | IRQ_TYPE_LEVEL_LOW)>;
         };
 
+        pmu {
+                compatible = "arm,cortex-a15-pmu";
+                interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
         gic: interrupt-controller@48211000 {
                 compatible = "arm,cortex-a15-gic";
                 interrupt-controller;
@@ -181,18 +187,22 @@
                 };
 
                 omap5_pmx_core: pinmux@4a002840 {
-                        compatible = "ti,omap4-padconf", "pinctrl-single";
+                        compatible = "ti,omap5-padconf", "pinctrl-single";
                         reg = <0x4a002840 0x01b6>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        #interrupt-cells = <1>;
+                        interrupt-controller;
                         pinctrl-single,register-width = <16>;
                         pinctrl-single,function-mask = <0x7fff>;
                 };
                 omap5_pmx_wkup: pinmux@4ae0c840 {
-                        compatible = "ti,omap4-padconf", "pinctrl-single";
+                        compatible = "ti,omap5-padconf", "pinctrl-single";
                         reg = <0x4ae0c840 0x0038>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        #interrupt-cells = <1>;
+                        interrupt-controller;
                         pinctrl-single,register-width = <16>;
                         pinctrl-single,function-mask = <0x7fff>;
                 };
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 915ee6cf6a4..0e9b744ce58 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -275,6 +275,16 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
         OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a100040, "4a100040.pinmux", &pcs_pdata),
         OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a31e040, "4a31e040.pinmux", &pcs_pdata),
 #endif
+#ifdef CONFIG_SOC_OMAP5
+        OF_DEV_AUXDATA("ti,omap5-padconf", 0x4a002840, "4a002840.pinmux", &pcs_pdata),
+        OF_DEV_AUXDATA("ti,omap5-padconf", 0x4ae0c840, "4ae0c840.pinmux", &pcs_pdata),
+#endif
+#ifdef CONFIG_SOC_DRA7XX
+        OF_DEV_AUXDATA("ti,dra7-padconf", 0x4a003400, "4a003400.pinmux", &pcs_pdata),
+#endif
+#ifdef CONFIG_SOC_AM43XX
+        OF_DEV_AUXDATA("ti,am437-padconf", 0x44e10800, "44e10800.pinmux", &pcs_pdata),
+#endif
 #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
         OF_DEV_AUXDATA("ti,omap4-iommu", 0x4a066000, "4a066000.mmu",
                        &omap4_iommu_pdata),
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index de6459628b4..e1718619c63 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -2022,6 +2022,18 @@ static const struct pcs_soc_data pinctrl_single_omap_wkup = {
         .irq_status_mask = (1 << 15),   /* OMAP_WAKEUP_EVENT */
 };
 
+static const struct pcs_soc_data pinctrl_single_dra7 = {
+        .flags = PCS_QUIRK_SHARED_IRQ,
+        .irq_enable_mask = (1 << 24),   /* WAKEUPENABLE */
+        .irq_status_mask = (1 << 25),   /* WAKEUPEVENT */
+};
+
+static const struct pcs_soc_data pinctrl_single_am437x = {
+        .flags = PCS_QUIRK_SHARED_IRQ,
+        .irq_enable_mask = (1 << 29),   /* OMAP_WAKEUP_EN */
+        .irq_status_mask = (1 << 30),   /* OMAP_WAKEUP_EVENT */
+};
+
 static const struct pcs_soc_data pinctrl_single = {
 };
 
@@ -2033,6 +2045,8 @@ static struct of_device_id pcs_of_match[] = {
         { .compatible = "ti,omap3-padconf", .data = &pinctrl_single_omap_wkup },
         { .compatible = "ti,omap4-padconf", .data = &pinctrl_single_omap_wkup },
         { .compatible = "ti,omap5-padconf", .data = &pinctrl_single_omap_wkup },
+        { .compatible = "ti,dra7-padconf", .data = &pinctrl_single_dra7 },
+        { .compatible = "ti,am437-padconf", .data = &pinctrl_single_am437x },
         { .compatible = "pinctrl-single", .data = &pinctrl_single },
         { .compatible = "pinconf-single", .data = &pinconf_single },
         { },
diff --git a/ti_config_fragments/baseport.cfg b/ti_config_fragments/baseport.cfg
index 072ce6cef5d..3c3ac921220 100644
--- a/ti_config_fragments/baseport.cfg
+++ b/ti_config_fragments/baseport.cfg
@@ -5,7 +5,7 @@ CONFIG_CGROUPS=y
 
 CONFIG_REGULATOR_GPIO=y
 
-/* Crypto Modules */
+# Crypto hardware accelerators
 CONFIG_CRYPTO_DEV_OMAP_SHAM=y
 CONFIG_CRYPTO_DEV_OMAP_AES=y
 CONFIG_CRYPTO_DEV_OMAP_DES=y