Merge tag 'clk-for-linus-3.14-part2' of git://git.linaro.org/people/mike.turquette...

Pull more clock framework changes from Mike Turquette:
 "The second half of the clock framework pull requeust for 3.14 is
  dominated by platform support for Qualcomm's MSM SoCs, DT binding
  updates for TI's OMAP-ish processors and additional support for
  Samsung chips.

  Additionally there are other smaller clock driver changes and several
  last minute fixes.  This pull request also includes the HiSilicon
  support that depends on the already-merged arm-soc pull request"

[ Fix up stupid compile error in the source tree with evil merge  - Grumpy Linus ]

* tag 'clk-for-linus-3.14-part2' of git://git.linaro.org/people/mike.turquette/linux: (49 commits)
  clk: sort Makefile
  clk: sunxi: fix overflow when setting up divided factors
  clk: Export more clk-provider functions
  dt-bindings: qcom: Fix warning with duplicate dt define
  clk: si5351: remove variant from platform_data
  clk: samsung: Remove unneeded semicolon
  clk: qcom: Fix modular build
  ARM: OMAP3: use DT clock init if DT data is available
  ARM: AM33xx: remove old clock data and link in new clock init code
  ARM: AM43xx: Enable clock init
  ARM: OMAP: DRA7: Enable clock init
  ARM: OMAP4: remove old clock data and link in new clock init code
  ARM: OMAP2+: io: use new clock init API
  ARM: OMAP2+: PRM: add support for initializing PRCM clock modules from DT
  ARM: OMAP3: hwmod: initialize clkdm from clkdm_name
  ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm
  ARM: OMAP2+: clock: use driver API instead of direct memory read/write
  ARM: OMAP2+: clock: add support for indexed memmaps
  ARM: dts: am43xx clock data
  ARM: dts: AM35xx: use DT clock data
  ...

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

diff --cc arch/arm/boot/dts/omap34xx.dtsi
index 77d124678c9587905b4da1fb9ee18b9759883efe,d531abfc6e9425ee23efc083672f9e8421b8f729..2e92360da1f36d29d094ef67c8183a8824c0f047
--- 1/arch/arm/boot/dts/omap34xx.dtsi
--- 2/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@@ -25,17 -25,8 +25,21 @@@
                        clock-latency = <300000>; /* From legacy driver */
                };
        };
 +
 +      ocp {
 +              omap3_pmx_core2: pinmux@480025d8 {
 +                      compatible = "ti,omap3-padconf", "pinctrl-single";
 +                      reg = <0x480025d8 0x24>;
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
 +                      #interrupt-cells = <1>;
 +                      interrupt-controller;
 +                      pinctrl-single,register-width = <16>;
 +                      pinctrl-single,function-mask = <0xff1f>;
 +              };
 +      };
  };
 -/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
+ 
+ /include/ "omap34xx-omap36xx-clocks.dtsi"
+ /include/ "omap36xx-omap3430es2plus-clocks.dtsi"
++/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"

diff --cc arch/arm/boot/dts/omap36xx.dtsi
index b7c7bd96c4041e70752e64c7f70c16c4d7ff4456,55ebaaa358b17e90ca382a0da0ef50006b6d6942..7e8dee9175d6a4d1d796a5a9389b4a9c3300125d
--- 1/arch/arm/boot/dts/omap36xx.dtsi
--- 2/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@@ -38,16 -38,10 +38,21 @@@
                        ti,hwmods = "uart4";
                        clock-frequency = <48000000>;
                };
 +
 +              omap3_pmx_core2: pinmux@480025a0 {
 +                      compatible = "ti,omap3-padconf", "pinctrl-single";
 +                      reg = <0x480025a0 0x5c>;
 +                      #address-cells = <1>;
 +                      #size-cells = <0>;
 +                      #interrupt-cells = <1>;
 +                      interrupt-controller;
 +                      pinctrl-single,register-width = <16>;
 +                      pinctrl-single,function-mask = <0xff1f>;
 +              };
        };
  };
 -/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
+ 
+ /include/ "omap36xx-clocks.dtsi"
+ /include/ "omap34xx-omap36xx-clocks.dtsi"
+ /include/ "omap36xx-omap3430es2plus-clocks.dtsi"
++/include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"

diff --cc arch/arm/boot/dts/omap443x.dtsi
index ab607a19a6137fe0c9f3fa779f6934131cc623f3,f67e191c1e745e6da74a9f4674e5f2a44312440e..8c1cfad30d603714ce267820186dd8c6635ff923
--- 1/arch/arm/boot/dts/omap443x.dtsi
--- 2/arch/arm/boot/dts/omap443x.dtsi
+++ b/arch/arm/boot/dts/omap443x.dtsi
@@@ -30,17 -25,11 +30,19 @@@
                };
        };
  
 -      bandgap {
 -              reg = <0x4a002260 0x4
 -                     0x4a00232C 0x4>;
 -              compatible = "ti,omap4430-bandgap";
 +      thermal-zones {
 +              #include "omap4-cpu-thermal.dtsi"
 +      };
 +
 +      ocp {
 +              bandgap: bandgap {
 +                      reg = <0x4a002260 0x4
 +                             0x4a00232C 0x4>;
 +                      compatible = "ti,omap4430-bandgap";
 +
 +                      #thermal-sensor-cells = <0>;
 +              };
        };
  };
+ 
+ /include/ "omap443x-clocks.dtsi"

diff --cc arch/arm/boot/dts/omap4460.dtsi
index 11566bed00358485634f1def11ffb980a2a48981,1758601b96b4b589f0b75e368bb984e3c31a24ca..6b32f520741a9cb1398bf586a614a9358f04d3e5
--- 1/arch/arm/boot/dts/omap4460.dtsi
--- 2/arch/arm/boot/dts/omap4460.dtsi
+++ b/arch/arm/boot/dts/omap4460.dtsi
@@@ -35,20 -30,14 +35,22 @@@
                ti,hwmods = "debugss";
        };
  
 -      bandgap {
 -              reg = <0x4a002260 0x4
 -                     0x4a00232C 0x4
 -                     0x4a002378 0x18>;
 -              compatible = "ti,omap4460-bandgap";
 -              interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>; /* talert */
 -              gpios = <&gpio3 22 0>; /* tshut */
 +      thermal-zones {
 +              #include "omap4-cpu-thermal.dtsi"
 +      };
 +
 +      ocp {
 +              bandgap: bandgap {
 +                      reg = <0x4a002260 0x4
 +                             0x4a00232C 0x4
 +                             0x4a002378 0x18>;
 +                      compatible = "ti,omap4460-bandgap";
 +                      interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>; /* talert */
 +                      gpios = <&gpio3 22 0>; /* tshut */
 +
 +                      #thermal-sensor-cells = <0>;
 +              };
        };
  };
+ 
+ /include/ "omap446x-clocks.dtsi"

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

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/common.h
Simple merge

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

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

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

diff --cc drivers/clk/Makefile
index 0c16e9cdfb87857c3fd528eebefa72f4af28f629,51a4c0dac1af034cb87c0ce008ed9f0108f9549e..a367a98317175f59745e5b61e6fdf175f29342bc
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -9,45 -9,43 +9,44 @@@ obj-$(CONFIG_COMMON_CLK)      += clk-gate.
  obj-$(CONFIG_COMMON_CLK)      += clk-mux.o
  obj-$(CONFIG_COMMON_CLK)      += clk-composite.o
  
- # SoCs specific
- obj-$(CONFIG_ARCH_BCM2835)    += clk-bcm2835.o
- obj-$(CONFIG_ARCH_EFM32)      += clk-efm32gg.o
- obj-$(CONFIG_ARCH_NOMADIK)    += clk-nomadik.o
- obj-$(CONFIG_ARCH_HIGHBANK)   += clk-highbank.o
- obj-$(CONFIG_ARCH_HI3xxx)     += hisilicon/
- obj-$(CONFIG_ARCH_NSPIRE)     += clk-nspire.o
- obj-$(CONFIG_ARCH_MXS)                += mxs/
- obj-$(CONFIG_ARCH_SOCFPGA)    += socfpga/
- obj-$(CONFIG_PLAT_SPEAR)      += spear/
- obj-$(CONFIG_ARCH_U300)               += clk-u300.o
- obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/
- obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/
- obj-$(CONFIG_PLAT_ORION)      += mvebu/
+ # hardware specific clock types
+ # please keep this section sorted lexicographically by file/directory path name
+ obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN)   += clk-axi-clkgen.o
+ obj-$(CONFIG_ARCH_BCM2835)            += clk-bcm2835.o
+ obj-$(CONFIG_ARCH_EFM32)              += clk-efm32gg.o
+ obj-$(CONFIG_ARCH_HIGHBANK)           += clk-highbank.o
+ obj-$(CONFIG_MACH_LOONGSON1)          += clk-ls1x.o
+ obj-$(CONFIG_COMMON_CLK_MAX77686)     += clk-max77686.o
+ obj-$(CONFIG_ARCH_NOMADIK)            += clk-nomadik.o
+ obj-$(CONFIG_ARCH_NSPIRE)             += clk-nspire.o
+ obj-$(CONFIG_CLK_PPC_CORENET)         += clk-ppc-corenet.o
+ obj-$(CONFIG_COMMON_CLK_S2MPS11)      += clk-s2mps11.o
+ obj-$(CONFIG_COMMON_CLK_SI5351)               += clk-si5351.o
+ obj-$(CONFIG_COMMON_CLK_SI570)                += clk-si570.o
+ obj-$(CONFIG_CLK_TWL6040)             += clk-twl6040.o
+ obj-$(CONFIG_ARCH_U300)                       += clk-u300.o
+ obj-$(CONFIG_ARCH_VT8500)             += clk-vt8500.o
+ obj-$(CONFIG_COMMON_CLK_WM831X)               += clk-wm831x.o
+ obj-$(CONFIG_COMMON_CLK_XGENE)                += clk-xgene.o
++obj-$(CONFIG_COMMON_CLK_AT91)         += at91/
+ obj-$(CONFIG_ARCH_HI3xxx)             += hisilicon/
+ obj-$(CONFIG_COMMON_CLK_KEYSTONE)     += keystone/
  ifeq ($(CONFIG_COMMON_CLK), y)
- obj-$(CONFIG_ARCH_MMP)                += mmp/
+ obj-$(CONFIG_ARCH_MMP)                        += mmp/
  endif
- obj-$(CONFIG_MACH_LOONGSON1)  += clk-ls1x.o
- obj-$(CONFIG_ARCH_ROCKCHIP)   += rockchip/
- obj-$(CONFIG_ARCH_SUNXI)      += sunxi/
- obj-$(CONFIG_ARCH_U8500)      += ux500/
- obj-$(CONFIG_ARCH_VT8500)     += clk-vt8500.o
- obj-$(CONFIG_ARCH_SIRF)               += sirf/
- obj-$(CONFIG_ARCH_ZYNQ)               += zynq/
- obj-$(CONFIG_ARCH_TEGRA)      += tegra/
- obj-$(CONFIG_PLAT_SAMSUNG)    += samsung/
- obj-$(CONFIG_COMMON_CLK_XGENE)  += clk-xgene.o
- obj-$(CONFIG_COMMON_CLK_KEYSTONE)     += keystone/
- obj-$(CONFIG_COMMON_CLK_AT91) += at91/
+ obj-$(CONFIG_PLAT_ORION)              += mvebu/
+ obj-$(CONFIG_ARCH_MXS)                        += mxs/
+ obj-$(CONFIG_COMMON_CLK_QCOM)         += qcom/
+ obj-$(CONFIG_ARCH_ROCKCHIP)           += rockchip/
+ obj-$(CONFIG_PLAT_SAMSUNG)            += samsung/
  obj-$(CONFIG_ARCH_SHMOBILE_MULTI)     += shmobile/
- 
- obj-$(CONFIG_X86)             += x86/
- 
- # Chip specific
- obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += clk-axi-clkgen.o
- obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
- obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o
- obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o
- obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o
- obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o
- obj-$(CONFIG_CLK_TWL6040)     += clk-twl6040.o
- obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o
+ obj-$(CONFIG_ARCH_SIRF)                       += sirf/
+ obj-$(CONFIG_ARCH_SOCFPGA)            += socfpga/
+ obj-$(CONFIG_PLAT_SPEAR)              += spear/
+ obj-$(CONFIG_ARCH_SUNXI)              += sunxi/
+ obj-$(CONFIG_ARCH_TEGRA)              += tegra/
+ obj-$(CONFIG_ARCH_OMAP2PLUS)          += ti/
+ obj-$(CONFIG_ARCH_U8500)              += ux500/
+ obj-$(CONFIG_COMMON_CLK_VERSATILE)    += versatile/
+ obj-$(CONFIG_X86)                     += x86/
+ obj-$(CONFIG_ARCH_ZYNQ)                       += zynq/

diff --cc drivers/clk/clk-si5351.c
index c50e83744b0aec3a0a8841f068bbbe05adc5ef8d,b95aa09b7aed7b3fe4950e9ec692c1d310f011f5..3b2a66f78755113fe9afde8f9caaa4d4e801260b
--- 1/drivers/clk/clk-si5351.c
--- 2/drivers/clk/clk-si5351.c
+++ b/drivers/clk/clk-si5351.c
@@@ -1298,7 -1293,7 +1293,7 @@@ static int si5351_dt_parse(struct i2c_c
        return 0;
  }
  #else
--static int si5351_dt_parse(struct i2c_client *client)
++static int si5351_dt_parse(struct i2c_client *client, enum si5351_variant variant)
  {
        return 0;
  }