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:
  clk: ti: add "ti,gpio-gate-clock" controlled clock
  ARM: DTS: dra72-evm: Rename mmc2_3v3 regulator to the board level power name
  ARM: DTS: dra7-evm: Rename mmc2_3v3 regulator to the board level power name
  clk: ti: set CLK_SET_RATE_NO_REPARENT for ti,mux-clock
  clk: ti: fix clk_init retry logic with generic of_clk_init use

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

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

diff --cc arch/arm/boot/dts/dra7-evm.dts
index 911b4f4,30ed061..adf1cac
--- 1/arch/arm/boot/dts/dra7-evm.dts
--- 2/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@@ -20,43 -19,9 +20,43 @@@
                reg = <0x80000000 0x60000000>; /* 1536 MB */
        };
  
-       mmc2_3v3: fixedregulator-mmc2 {
 +      reserved-memory {
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              ranges;
 +
 +              ipu2_cma_pool: ipu2_cma@95800000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x95800000 0x3800000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +
 +              dsp1_cma_pool: dsp1_cma@99000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x99000000 0x4000000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +
 +              ipu1_cma_pool: ipu1_cma@9d000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x9d000000 0x2000000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +
 +              dsp2_cma_pool: dsp2_cma@9f000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x9f000000 0x800000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +      };
 +
+       evm_3v3_sw: fixedregulator-evm_3v3_sw {
                compatible = "regulator-fixed";
-               regulator-name = "mmc2_3v3";
+               regulator-name = "evm_3v3_sw";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };

diff --cc arch/arm/boot/dts/dra72-evm.dts
index ba595b4,7525bca..22fc402
--- 1/arch/arm/boot/dts/dra72-evm.dts
--- 2/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@@ -24,78 -18,9 +24,78 @@@
                reg = <0x80000000 0x40000000>; /* 1024 MB */
        };
  
-       mmc2_3v3: fixedregulator-mmc2 {
 +      tpd12s015: encoder@0 {
 +              compatible = "omapdss,ti,tpd12s015";
 +
 +                gpios = <&pcf_hdmi 4 GPIO_ACTIVE_HIGH>,       /* P4, CT CP HPD */
 +                        <&pcf_hdmi 5 GPIO_ACTIVE_HIGH>,       /* P5, LS OE */
 +                        <&gpio7 12 GPIO_ACTIVE_HIGH>; /* gpio7_12/sp1_cs2, HPD */
 +
 +              ports {
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
 +
 +                      port@0 {
 +                              reg = <0>;
 +
 +                              tpd12s015_in: endpoint@0 {
 +                                      remote-endpoint = <&hdmi_out>;
 +                              };
 +                      };
 +
 +                      port@1 {
 +                              reg = <1>;
 +
 +                              tpd12s015_out: endpoint@0 {
 +                                      remote-endpoint = <&hdmi_connector_in>;
 +                              };
 +                      };
 +              };
 +      };
 +
 +      hdmi0: connector@0 {
 +              compatible = "omapdss,hdmi-connector";
 +              label = "hdmi";
 +
 +              type = "a";
 +
 +              port {
 +                      hdmi_connector_in: endpoint {
 +                              remote-endpoint = <&tpd12s015_out>;
 +                      };
 +              };
 +      };
 +
 +      reserved-memory {
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              ranges;
 +
 +              ipu2_cma_pool: ipu2_cma@95800000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x95800000 0x3800000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +
 +              dsp1_cma_pool: dsp1_cma@99000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x99000000 0x4000000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +
 +              ipu1_cma_pool: ipu1_cma@9d000000 {
 +                      compatible = "shared-dma-pool";
 +                      reg = <0x9d000000 0x2000000>;
 +                      reusable;
 +                      status = "okay";
 +              };
 +      };
 +
+       evm_3v3: fixedregulator-evm_3v3 {
                compatible = "regulator-fixed";
-               regulator-name = "mmc2_3v3";
+               regulator-name = "evm_3v3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };

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

diff --cc drivers/clk/ti/mux.c
Simple merge

diff --cc include/linux/clk/ti.h
Simple merge