Merge remote-tracking branch 'clk/clk-next'

Conflicts:
	drivers/clk/Makefile

diff --cc MAINTAINERS
index bac5fa512f9e4dd1b599926d94cb083d8e465742,51b2e1c1585b23923ed4bc9e7e25c7d14602a308..9d6b01b272b4fba47d567f5ea155c6bfdf8ca25f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7656,8 -7577,8 +7656,9 @@@ W:      http://opensource.wolfsonmicro.com/c
  S:    Supported
  F:    Documentation/hwmon/wm83??
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
+ F:    drivers/clk/clk-wm83*.c
  F:    drivers/leds/leds-wm83*.c
 +F:    drivers/gpio/gpio-*wm*.c
  F:    drivers/hwmon/wm83??-hwmon.c
  F:    drivers/input/misc/wm831x-on.c
  F:    drivers/input/touchscreen/wm831x-ts.c

diff --cc arch/arm/Kconfig
index 9b064da3519f8b94a5606419da0522216559b95d,f3c60ff41692e8917a3823d383129437046bf07c..e329d1da3a628a1ad8b902a9ae16a33e4a6c9583
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -337,8 -316,8 +337,9 @@@ config ARCH_VEXPRES
        select ICST
        select NO_IOPORT
        select PLAT_VERSATILE
+       select PLAT_VERSATILE_CLOCK
        select PLAT_VERSATILE_CLCD
 +      select REGULATOR_FIXED_VOLTAGE if REGULATOR
        help
          This enables support for the ARM Ltd Versatile Express boards.
  

diff --cc arch/arm/boot/dts/highbank.dts
index 4d641ea4e27119f4e622df1f234fc89bb94ff82d,2e1cfa00c25b4af5bd81f328f775471f9ed2bee9..9fecf1ae777bac14b2770c0cf09dd601e85b73b8
--- 1/arch/arm/boot/dts/highbank.dts
--- 2/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@@ -116,14 -127,9 +127,15 @@@
                        compatible = "calxeda,hb-sdhci";
                        reg = <0xffe0e000 0x1000>;
                        interrupts = <0 90 4>;
+                       clocks = <&eclk>;
                };
  
 +              memory-controller@fff00000 {
 +                      compatible = "calxeda,hb-ddr-ctrl";
 +                      reg = <0xfff00000 0x1000>;
 +                      interrupts = <0 91 4>;
 +              };
 +
                ipc@fff20000 {
                        compatible = "arm,pl320", "arm,primecell";
                        reg = <0xfff20000 0x1000>;
@@@ -192,14 -214,67 +220,73 @@@
                sregs@fff3c000 {
                        compatible = "calxeda,hb-sregs";
                        reg = <0xfff3c000 0x1000>;
+ 
+                       clocks {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+ 
+                               osc: oscillator {
+                                       #clock-cells = <0>;
+                                       compatible = "fixed-clock";
+                                       clock-frequency = <33333000>;
+                               };
+ 
+                               ddrpll: ddrpll {
+                                       #clock-cells = <0>;
+                                       compatible = "calxeda,hb-pll-clock";
+                                       clocks = <&osc>;
+                                       reg = <0x108>;
+                               };
+ 
+                               a9pll: a9pll {
+                                       #clock-cells = <0>;
+                                       compatible = "calxeda,hb-pll-clock";
+                                       clocks = <&osc>;
+                                       reg = <0x100>;
+                               };
+ 
+                               a9periphclk: a9periphclk {
+                                       #clock-cells = <0>;
+                                       compatible = "calxeda,hb-a9periph-clock";
+                                       clocks = <&a9pll>;
+                                       reg = <0x104>;
+                               };
+ 
+                               a9bclk: a9bclk {
+                                       #clock-cells = <0>;
+                                       compatible = "calxeda,hb-a9bus-clock";
+                                       clocks = <&a9pll>;
+                                       reg = <0x104>;
+                               };
+ 
+                               emmcpll: emmcpll {
+                                       #clock-cells = <0>;
+                                       compatible = "calxeda,hb-pll-clock";
+                                       clocks = <&osc>;
+                                       reg = <0x10C>;
+                               };
+ 
+                               eclk: eclk {
+                                       #clock-cells = <0>;
+                                       compatible = "calxeda,hb-emmc-clock";
+                                       clocks = <&emmcpll>;
+                                       reg = <0x114>;
+                               };
+ 
+                               pclk: pclk {
+                                       #clock-cells = <0>;
+                                       compatible = "fixed-clock";
+                                       clock-frequency = <150000000>;
+                               };
+                       };
                };
  
 +              sregs@fff3c200 {
 +                      compatible = "calxeda,hb-sregs-l2-ecc";
 +                      reg = <0xfff3c200 0x100>;
 +                      interrupts = <0 71 4  0 72 4>;
 +              };
 +
                dma@fff3d000 {
                        compatible = "arm,pl330", "arm,primecell";
                        reg = <0xfff3d000 0x1000>;

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc drivers/clk/Makefile
index 3669761d1bac7e683ebc95055e75469e65d5e63d,02ffdf647b5ecee9ff4e445395e28cf6dba26522..5869ea3870545f0f7c3ab64a185e1c486243b4e1
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -3,7 -3,11 +3,13 @@@ obj-$(CONFIG_CLKDEV_LOOKUP)    += clkdev.
  obj-$(CONFIG_COMMON_CLK)      += clk.o clk-fixed-rate.o clk-gate.o \
                                   clk-mux.o clk-divider.o clk-fixed-factor.o
  # SoCs specific
 +obj-$(CONFIG_ARCH_NOMADIK)    += clk-nomadik.o
+ obj-$(CONFIG_ARCH_HIGHBANK)   += clk-highbank.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_ARCH_INTEGRATOR) += versatile/
+ 
+ # Chip specific
+ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o

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