snowball: Adding CPU clock initialisation

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: John Rigby <john.rigby@linaro.org>

diff --git a/arch/arm/cpu/armv7/u8500/clock.c b/arch/arm/cpu/armv7/u8500/clock.c
index 9e3b87394dd9ebc30a667de337c97338c809374e..fcfd61a1f4f8a3954aefdd35204f7b143b76d986 100644 (file)
--- a/arch/arm/cpu/armv7/u8500/clock.c
+++ b/arch/arm/cpu/armv7/u8500/clock.c
@@ -54,3 +54,37 @@ void u8500_clock_enable(int periph, int cluster, int kern)
        if (cluster != -1)
                writel(1 << cluster, &clkrst->pcken);
 }
+
+void db8500_clocks_init(void)
+{
+       /*
+        * Enable all clocks. This is u-boot, we can enable it all. There is no
+        * powersave in u-boot.
+        */
+
+       u8500_clock_enable(1, 9, -1); /* GPIO0 */
+       u8500_clock_enable(2, 11, -1);/* GPIO1 */
+       u8500_clock_enable(3, 8, -1); /* GPIO2 */
+       u8500_clock_enable(5, 1, -1); /* GPIO3 */
+       u8500_clock_enable(3, 6, 6);  /* UART2 */
+       u8500_clock_enable(3, 3, 3);  /* I2C0 */
+       u8500_clock_enable(1, 5, 5);  /* SDI0 */
+       u8500_clock_enable(2, 4, 2);  /* SDI4 */
+       u8500_clock_enable(6, 6, -1); /* MTU0 */
+       u8500_clock_enable(3, 4, 4);  /* SDI2 */
+
+       /*
+        * Enabling clocks for all devices which are AMBA devices in the
+        * kernel.  Otherwise they will not get probe()'d because the
+        * peripheral ID register will not be powered.
+        */
+
+       /* XXX: some of these differ between ED/V1 */
+
+       u8500_clock_enable(1, 1, 1);  /* UART1 */
+       u8500_clock_enable(1, 0, 0);  /* UART0 */
+       u8500_clock_enable(3, 2, 2);  /* SSP1 */
+       u8500_clock_enable(3, 1, 1);  /* SSP0 */
+       u8500_clock_enable(2, 8, -1); /* SPI0 */
+       u8500_clock_enable(2, 5, 3);  /* MSP2 */
+}

diff --git a/arch/arm/cpu/armv7/u8500/cpu.c b/arch/arm/cpu/armv7/u8500/cpu.c
index 04f4b1928c5ab21f93af797aca8eb0869ebedd19..fece201f3f007ea40b03738bb90212deef96e0ac 100644 (file)
--- a/arch/arm/cpu/armv7/u8500/cpu.c
+++ b/arch/arm/cpu/armv7/u8500/cpu.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/prcmu.h>
+#include <asm/arch/clock.h>
 
 #ifdef CONFIG_ARCH_CPU_INIT
 /*
@@ -35,6 +36,7 @@
 int arch_cpu_init(void)
 {
        db8500_prcmu_init();
+       db8500_clocks_init();
 
        return 0;
 }

diff --git a/arch/arm/include/asm/arch-u8500/clock.h b/arch/arm/include/asm/arch-u8500/clock.h
index b00ab0d215f1a06feee3667cbf4a0ff898a3d3b9..2a147840932ab4e49f91e1f5e8d98c8d35ad20ad 100644 (file)
--- a/arch/arm/include/asm/arch-u8500/clock.h
+++ b/arch/arm/include/asm/arch-u8500/clock.h
@@ -64,9 +64,6 @@ struct prcmu {
 
 extern void u8500_clock_enable(int periph, int kern, int cluster);
 
-static inline void u8500_prcmu_enable(unsigned int *reg)
-{
-       writel(readl(reg) | (1 << 8), reg);
-}
+void db8500_clocks_init(void);
 
 #endif /* __ASM_ARCH_CLOCK */