Merge branch 'next/dt' into next/multiplatform

* next/dt: (182 commits)
  ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support
  ARM: tegra: Add Avionic Design Medcom-Wide support
  ARM: tegra: Add Avionic Design Plutux support
  ARM: tegra: Add Avionic Design Tamonten support
  ARM: tegra: dts: Add pwm label
  ARM: dt: tegra: whistler: configure power off
  ARM: mxs: m28evk: Disable OCOTP OUI loading
  ARM: imx6q: use pll2_pfd2_396m as the enfc_sel's parent
  ARM: dts: imx6q-sabrelite: add usbotg pinctrl support
  ARM: dts: imx23-olinuxino: Add USB host support
  ARM: dts: imx6q-sabrelite: add usbmisc device
  ARM: dts: mx23: Add USB resources
  ARM: dts: mxs: Add ethernetX to macX aliases
  ARM: msm: Remove non-DT targets from 8960
  ARM: msm: Add DT support for 8960
  ARM: msm: Move io mapping prototypes to common.h
  ARM: msm: Rename board-msm8x60 to signify its DT only status
  ARM: msm: Make 8660 a DT only target
  ARM: msm: Move 8660 to DT timer
  ARM: msm: Add DT support to msm_timer
  ...

7 files changed, 10 insertions, 122 deletions

diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 45868bb43cbd..ff007d15e0ec 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -30,7 +30,6 @@
 #include <linux/ata_platform.h>
 #include <linux/amba/mmci.h>
 #include <linux/gfp.h>
-#include <linux/clkdev.h>
 #include <linux/mtd/physmap.h>
 
 #include <mach/hardware.h>
@@ -226,115 +225,10 @@ struct mmci_platform_data realview_mmc1_plat_data = {
         .cd_invert      = true,
 };
 
-/*
- * Clock handling
- */
-static const struct icst_params realview_oscvco_params = {
-        .ref            = 24000000,
-        .vco_max        = ICST307_VCO_MAX,
-        .vco_min        = ICST307_VCO_MIN,
-        .vd_min         = 4 + 8,
-        .vd_max         = 511 + 8,
-        .rd_min         = 1 + 2,
-        .rd_max         = 127 + 2,
-        .s2div          = icst307_s2div,
-        .idx2s          = icst307_idx2s,
-};
-
-static void realview_oscvco_set(struct clk *clk, struct icst_vco vco)
-{
-        void __iomem *sys_lock = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LOCK_OFFSET;
-        u32 val;
-
-        val = readl(clk->vcoreg) & ~0x7ffff;
-        val |= vco.v | (vco.r << 9) | (vco.s << 16);
-
-        writel(0xa05f, sys_lock);
-        writel(val, clk->vcoreg);
-        writel(0, sys_lock);
-}
-
-static const struct clk_ops oscvco_clk_ops = {
-        .round  = icst_clk_round,
-        .set    = icst_clk_set,
-        .setvco = realview_oscvco_set,
-};
-
-static struct clk oscvco_clk = {
-        .ops    = &oscvco_clk_ops,
-        .params = &realview_oscvco_params,
-};
-
-/*
- * These are fixed clocks.
- */
-static struct clk ref24_clk = {
-        .rate   = 24000000,
-};
-
-static struct clk sp804_clk = {
-        .rate   = 1000000,
-};
-
-static struct clk dummy_apb_pclk;
-
-static struct clk_lookup lookups[] = {
-        {       /* Bus clock */
-                .con_id         = "apb_pclk",
-                .clk            = &dummy_apb_pclk,
-        }, {    /* UART0 */
-                .dev_id         = "dev:uart0",
-                .clk            = &ref24_clk,
-        }, {    /* UART1 */
-                .dev_id         = "dev:uart1",
-                .clk            = &ref24_clk,
-        }, {    /* UART2 */
-                .dev_id         = "dev:uart2",
-                .clk            = &ref24_clk,
-        }, {    /* UART3 */
-                .dev_id         = "fpga:uart3",
-                .clk            = &ref24_clk,
-        }, {    /* UART3 is on the dev chip in PB1176 */
-                .dev_id         = "dev:uart3",
-                .clk            = &ref24_clk,
-        }, {    /* UART4 only exists in PB1176 */
-                .dev_id         = "fpga:uart4",
-                .clk            = &ref24_clk,
-        }, {    /* KMI0 */
-                .dev_id         = "fpga:kmi0",
-                .clk            = &ref24_clk,
-        }, {    /* KMI1 */
-                .dev_id         = "fpga:kmi1",
-                .clk            = &ref24_clk,
-        }, {    /* MMC0 */
-                .dev_id         = "fpga:mmc0",
-                .clk            = &ref24_clk,
-        }, {    /* CLCD is in the PB1176 and EB DevChip */
-                .dev_id         = "dev:clcd",
-                .clk            = &oscvco_clk,
-        }, {    /* PB:CLCD */
-                .dev_id         = "issp:clcd",
-                .clk            = &oscvco_clk,
-        }, {    /* SSP */
-                .dev_id         = "dev:ssp0",
-                .clk            = &ref24_clk,
-        }, {    /* SP804 timers */
-                .dev_id         = "sp804",
-                .clk            = &sp804_clk,
-        },
-};
-
 void __init realview_init_early(void)
 {
         void __iomem *sys = __io_address(REALVIEW_SYS_BASE);
 
-        if (machine_is_realview_pb1176())
-                oscvco_clk.vcoreg = sys + REALVIEW_SYS_OSC0_OFFSET;
-        else
-                oscvco_clk.vcoreg = sys + REALVIEW_SYS_OSC4_OFFSET;
-
-        clkdev_add_table(lookups, ARRAY_SIZE(lookups));
-
         versatile_sched_clock_init(sys + REALVIEW_SYS_24MHz_OFFSET, 24000000);
 }
 
diff --git a/arch/arm/mach-realview/include/mach/clkdev.h b/arch/arm/mach-realview/include/mach/clkdev.h
deleted file mode 100644
index e58d0771b64e..000000000000
--- a/arch/arm/mach-realview/include/mach/clkdev.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __ASM_MACH_CLKDEV_H
-#define __ASM_MACH_CLKDEV_H
-
-#include <plat/clock.h>
-
-struct clk {
-        unsigned long           rate;
-        const struct clk_ops    *ops;
-        const struct icst_params *params;
-        void __iomem            *vcoreg;
-};
-
-#define __clk_get(clk) ({ 1; })
-#define __clk_put(clk) do { } while (0)
-
-#endif
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index d7a6e9cebba4..ce7747692c8b 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -27,6 +27,7 @@
 #include <linux/amba/mmci.h>
 #include <linux/amba/pl022.h>
 #include <linux/io.h>
+#include <linux/platform_data/clk-realview.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
@@ -413,6 +414,7 @@ static void __init realview_eb_timer_init(void)
         else
                 timer_irq = IRQ_EB_TIMER0_1;
 
+        realview_clk_init(__io_address(REALVIEW_SYS_BASE), false);
         realview_timer_init(timer_irq);
         realview_eb_twd_init();
 }
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index 361f898884c8..e21711d72ee2 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -29,6 +29,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
+#include <linux/platform_data/clk-realview.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
@@ -325,6 +326,7 @@ static void __init realview_pb1176_timer_init(void)
         timer2_va_base = __io_address(REALVIEW_PB1176_TIMER2_3_BASE);
         timer3_va_base = __io_address(REALVIEW_PB1176_TIMER2_3_BASE) + 0x20;
 
+        realview_clk_init(__io_address(REALVIEW_SYS_BASE), true);
         realview_timer_init(IRQ_DC1176_TIMER0);
 }
 
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index c56bc8d4d11b..b442fb276d57 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -27,6 +27,7 @@
 #include <linux/amba/mmci.h>
 #include <linux/amba/pl022.h>
 #include <linux/io.h>
+#include <linux/platform_data/clk-realview.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
@@ -311,6 +312,7 @@ static void __init realview_pb11mp_timer_init(void)
         timer2_va_base = __io_address(REALVIEW_PB11MP_TIMER2_3_BASE);
         timer3_va_base = __io_address(REALVIEW_PB11MP_TIMER2_3_BASE) + 0x20;
 
+        realview_clk_init(__io_address(REALVIEW_SYS_BASE), false);
         realview_timer_init(IRQ_TC11MP_TIMER0_1);
         realview_pb11mp_twd_init();
 }
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index 040937582453..1435cd863965 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -27,6 +27,7 @@
 #include <linux/amba/mmci.h>
 #include <linux/amba/pl022.h>
 #include <linux/io.h>
+#include <linux/platform_data/clk-realview.h>
 
 #include <asm/irq.h>
 #include <asm/leds.h>
@@ -260,6 +261,7 @@ static void __init realview_pba8_timer_init(void)
         timer2_va_base = __io_address(REALVIEW_PBA8_TIMER2_3_BASE);
         timer3_va_base = __io_address(REALVIEW_PBA8_TIMER2_3_BASE) + 0x20;
 
+        realview_clk_init(__io_address(REALVIEW_SYS_BASE), false);
         realview_timer_init(IRQ_PBA8_TIMER0_1);
 }
 
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 97885dc11e8c..5d2c8bebb069 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -26,6 +26,7 @@
 #include <linux/amba/mmci.h>
 #include <linux/amba/pl022.h>
 #include <linux/io.h>
+#include <linux/platform_data/clk-realview.h>
 
 #include <asm/irq.h>
 #include <asm/leds.h>
@@ -319,6 +320,7 @@ static void __init realview_pbx_timer_init(void)
         timer2_va_base = __io_address(REALVIEW_PBX_TIMER2_3_BASE);
         timer3_va_base = __io_address(REALVIEW_PBX_TIMER2_3_BASE) + 0x20;
 
+        realview_clk_init(__io_address(REALVIEW_SYS_BASE), false);
         realview_timer_init(IRQ_PBX_TIMER0_1);
         realview_pbx_twd_init();
 }