Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'

[u-boot] / arch / arm / cpu / arm926ejs / armada100 / cpu.c

diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c
index 62aa1753ce022354cfb7acd2cf19065bf213b26b..c21938e31fa28fc9269e771856c82d1bbb235655 100644 (file)
--- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
+++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
@@ -62,6 +62,16 @@ int arch_cpu_init(void)
        /* Enable GPIO clock */
        writel(APBC_APBCLK, &apb1clkres->gpio);
 
+#ifdef CONFIG_I2C_MV
+       /* Enable general I2C clock */
+       writel(APBC_RST | APBC_FNCLK | APBC_APBCLK, &apb1clkres->twsi0);
+       writel(APBC_FNCLK | APBC_APBCLK, &apb1clkres->twsi0);
+
+       /* Enable power I2C clock */
+       writel(APBC_RST | APBC_FNCLK | APBC_APBCLK, &apb1clkres->twsi1);
+       writel(APBC_FNCLK | APBC_APBCLK, &apb1clkres->twsi1);
+#endif
+
        /*
         * Enable Functional and APB clock at 14.7456MHz
         * for configured UART console
@@ -90,3 +100,9 @@ int print_cpuinfo(void)
        return 0;
 }
 #endif
+
+#ifdef CONFIG_I2C_MV
+void i2c_clk_enable(void)
+{
+}
+#endif