1 files changed, 16 insertions, 22 deletions

diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c
index ec35f0aa5665..1762c4728f1e 100644
--- a/arch/arm/mach-ux500/clock.c
+++ b/arch/arm/mach-ux500/clock.c
@@ -149,9 +149,7 @@ static unsigned long clk_mtu_get_rate(struct clk *clk)
         unsigned long mturate;
         unsigned long retclk;
 
-        if (cpu_is_u5500())
-                addr = __io_address(U5500_PRCMU_BASE);
-        else if (cpu_is_u8500())
+        if (cpu_is_u8500_family())
                 addr = __io_address(U8500_PRCMU_BASE);
         else
                 ux500_unknown_soc();
@@ -336,6 +334,7 @@ static DEFINE_PRCMU_CLK(uiccclk,	0x4, 1, UICCCLK); /* v1 */
  */
 
 /* Peripheral Cluster #1 */
+static DEFINE_PRCC_CLK(1, msp3,         11, 10, &clk_msp1clk);
 static DEFINE_PRCC_CLK(1, i2c4,         10, 9, &clk_i2cclk);
 static DEFINE_PRCC_CLK(1, gpio0,        9, -1, NULL);
 static DEFINE_PRCC_CLK(1, slimbus0,     8,  8, &clk_slimclk);
@@ -382,14 +381,15 @@ static DEFINE_PRCC_CLK(5, usb,		0,  0, NULL);
 /* Peripheral Cluster #6 */
 
 /* MTU ID in data */
-static DEFINE_PRCC_CLK_CUSTOM(6, mtu1, 8, -1, NULL, clk_mtu_get_rate, 1);
-static DEFINE_PRCC_CLK_CUSTOM(6, mtu0, 7, -1, NULL, clk_mtu_get_rate, 0);
-static DEFINE_PRCC_CLK(6, cfgreg,       6,  6, NULL);
-static DEFINE_PRCC_CLK(6, hash1,        5, -1, NULL);
-static DEFINE_PRCC_CLK(6, unipro,       4,  1, &clk_uniproclk);
-static DEFINE_PRCC_CLK(6, pka,          3, -1, NULL);
-static DEFINE_PRCC_CLK(6, hash0,        2, -1, NULL);
-static DEFINE_PRCC_CLK(6, cryp0,        1, -1, NULL);
+static DEFINE_PRCC_CLK_CUSTOM(6, mtu1, 9, -1, NULL, clk_mtu_get_rate, 1);
+static DEFINE_PRCC_CLK_CUSTOM(6, mtu0, 8, -1, NULL, clk_mtu_get_rate, 0);
+static DEFINE_PRCC_CLK(6, cfgreg,       7,  7, NULL);
+static DEFINE_PRCC_CLK(6, hash1,        6, -1, NULL);
+static DEFINE_PRCC_CLK(6, unipro,       5,  1, &clk_uniproclk);
+static DEFINE_PRCC_CLK(6, pka,          4, -1, NULL);
+static DEFINE_PRCC_CLK(6, hash0,        3, -1, NULL);
+static DEFINE_PRCC_CLK(6, cryp0,        2, -1, NULL);
+static DEFINE_PRCC_CLK(6, cryp1,    1, -1, NULL);
 static DEFINE_PRCC_CLK(6, rng,  0,  0, &clk_rngclk);
 
 static struct clk clk_dummy_apb_pclk = {
@@ -405,7 +405,7 @@ static struct clk_lookup u8500_clks[] = {
         CLK(slimbus0,   "slimbus0",     NULL),
         CLK(i2c2,       "nmk-i2c.2",    NULL),
         CLK(sdi0,       "sdi0",         NULL),
-        CLK(msp0,       "msp0",         NULL),
+        CLK(msp0,       "ux500-msp-i2s.0",      NULL),
         CLK(i2c1,       "nmk-i2c.1",    NULL),
         CLK(uart1,      "uart1",        NULL),
         CLK(uart0,      "uart0",        NULL),
@@ -431,6 +431,7 @@ static struct clk_lookup u8500_clks[] = {
         CLK(pka,        "pka",          NULL),
         CLK(hash0,      "hash0",        NULL),
         CLK(cryp0,      "cryp0",        NULL),
+        CLK(cryp1,  "cryp1",    NULL),
 
         /* PRCMU level clock gating */
 
@@ -455,7 +456,8 @@ static struct clk_lookup u8500_clks[] = {
         /* Peripheral Cluster #1 */
         CLK(i2c4,       "nmk-i2c.4",    NULL),
         CLK(spi3,       "spi3",         NULL),
-        CLK(msp1,       "msp1",         NULL),
+        CLK(msp1,       "ux500-msp-i2s.1",      NULL),
+        CLK(msp3,       "ux500-msp-i2s.3",      NULL),
 
         /* Peripheral Cluster #2 */
         CLK(gpio1,      "gpio.6",       NULL),
@@ -465,7 +467,7 @@ static struct clk_lookup u8500_clks[] = {
         CLK(spi0,       "spi0",         NULL),
         CLK(sdi3,       "sdi3",         NULL),
         CLK(sdi1,       "sdi1",         NULL),
-        CLK(msp2,       "msp2",         NULL),
+        CLK(msp2,       "ux500-msp-i2s.2",      NULL),
         CLK(sdi4,       "sdi4",         NULL),
         CLK(pwl,        "pwl",          NULL),
         CLK(spi1,       "spi1",         NULL),
@@ -705,14 +707,6 @@ late_initcall(clk_init_smp_twd_cpufreq);
 
 int __init clk_init(void)
 {
-        if (cpu_is_u5500()) {
-                /* Clock tree for U5500 not implemented yet */
-                clk_prcc_ops.enable = clk_prcc_ops.disable = NULL;
-                clk_prcmu_ops.enable = clk_prcmu_ops.disable = NULL;
-                clk_uartclk.rate = 36360000;
-                clk_sdmmcclk.rate = 99900000;
-        }
-
         clkdev_add_table(u8500_clks, ARRAY_SIZE(u8500_clks));
         clkdev_add(&clk_smp_twd_lookup);