These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / clk / ux500 / u8540_clk.c
index 20c8add..d7bcb7a 100644 (file)
@@ -7,17 +7,51 @@
  * License terms: GNU General Public License (GPL) version 2
  */
 
-#include <linux/clk.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/clkdev.h>
 #include <linux/clk-provider.h>
 #include <linux/mfd/dbx500-prcmu.h>
 #include <linux/platform_data/clk-ux500.h>
 #include "clk.h"
 
-void u8540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
-                   u32 clkrst5_base, u32 clkrst6_base)
+static const struct of_device_id u8540_clk_of_match[] = {
+       { .compatible = "stericsson,u8540-clks", },
+       { }
+};
+
+/* CLKRST4 is missing making it hard to index things */
+enum clkrst_index {
+       CLKRST1_INDEX = 0,
+       CLKRST2_INDEX,
+       CLKRST3_INDEX,
+       CLKRST5_INDEX,
+       CLKRST6_INDEX,
+       CLKRST_MAX,
+};
+
+void u8540_clk_init(void)
 {
        struct clk *clk;
+       struct device_node *np = NULL;
+       u32 bases[CLKRST_MAX];
+       int i;
+
+       if (of_have_populated_dt())
+               np = of_find_matching_node(NULL, u8540_clk_of_match);
+       if (!np) {
+               pr_err("Either DT or U8540 Clock node not found\n");
+               return;
+       }
+       for (i = 0; i < ARRAY_SIZE(bases); i++) {
+               struct resource r;
+
+               if (of_address_to_resource(np, i, &r))
+                       /* Not much choice but to continue */
+                       pr_err("failed to get CLKRST %d base address\n",
+                              i + 1);
+               bases[i] = r.start;
+       }
 
        /* Clock sources. */
        /* Fixed ClockGen */
@@ -219,151 +253,151 @@ void u8540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
 
        /* PRCC P-clocks */
        /* Peripheral 1 : PRCC P-clocks */
-       clk = clk_reg_prcc_pclk("p1_pclk0", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk0", "per1clk", bases[CLKRST1_INDEX],
                                BIT(0), 0);
        clk_register_clkdev(clk, "apb_pclk", "uart0");
 
-       clk = clk_reg_prcc_pclk("p1_pclk1", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk1", "per1clk", bases[CLKRST1_INDEX],
                                BIT(1), 0);
        clk_register_clkdev(clk, "apb_pclk", "uart1");
 
-       clk = clk_reg_prcc_pclk("p1_pclk2", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk2", "per1clk", bases[CLKRST1_INDEX],
                                BIT(2), 0);
        clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.1");
 
-       clk = clk_reg_prcc_pclk("p1_pclk3", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk3", "per1clk", bases[CLKRST1_INDEX],
                                BIT(3), 0);
        clk_register_clkdev(clk, "apb_pclk", "msp0");
        clk_register_clkdev(clk, "apb_pclk", "dbx5x0-msp-i2s.0");
 
-       clk = clk_reg_prcc_pclk("p1_pclk4", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk4", "per1clk", bases[CLKRST1_INDEX],
                                BIT(4), 0);
        clk_register_clkdev(clk, "apb_pclk", "msp1");
        clk_register_clkdev(clk, "apb_pclk", "dbx5x0-msp-i2s.1");
 
-       clk = clk_reg_prcc_pclk("p1_pclk5", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk5", "per1clk", bases[CLKRST1_INDEX],
                                BIT(5), 0);
        clk_register_clkdev(clk, "apb_pclk", "sdi0");
 
-       clk = clk_reg_prcc_pclk("p1_pclk6", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk6", "per1clk", bases[CLKRST1_INDEX],
                                BIT(6), 0);
        clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.2");
 
-       clk = clk_reg_prcc_pclk("p1_pclk7", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk7", "per1clk", bases[CLKRST1_INDEX],
                                BIT(7), 0);
        clk_register_clkdev(clk, NULL, "spi3");
 
-       clk = clk_reg_prcc_pclk("p1_pclk8", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk8", "per1clk", bases[CLKRST1_INDEX],
                                BIT(8), 0);
        clk_register_clkdev(clk, "apb_pclk", "slimbus0");
 
-       clk = clk_reg_prcc_pclk("p1_pclk9", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk9", "per1clk", bases[CLKRST1_INDEX],
                                BIT(9), 0);
        clk_register_clkdev(clk, NULL, "gpio.0");
        clk_register_clkdev(clk, NULL, "gpio.1");
        clk_register_clkdev(clk, NULL, "gpioblock0");
        clk_register_clkdev(clk, "apb_pclk", "ab85xx-codec.0");
 
-       clk = clk_reg_prcc_pclk("p1_pclk10", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk10", "per1clk", bases[CLKRST1_INDEX],
                                BIT(10), 0);
        clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.4");
 
-       clk = clk_reg_prcc_pclk("p1_pclk11", "per1clk", clkrst1_base,
+       clk = clk_reg_prcc_pclk("p1_pclk11", "per1clk", bases[CLKRST1_INDEX],
                                BIT(11), 0);
        clk_register_clkdev(clk, "apb_pclk", "msp3");
        clk_register_clkdev(clk, "apb_pclk", "dbx5x0-msp-i2s.3");
 
        /* Peripheral 2 : PRCC P-clocks */
-       clk = clk_reg_prcc_pclk("p2_pclk0", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk0", "per2clk", bases[CLKRST2_INDEX],
                                BIT(0), 0);
        clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.3");
 
-       clk = clk_reg_prcc_pclk("p2_pclk1", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk1", "per2clk", bases[CLKRST2_INDEX],
                                BIT(1), 0);
        clk_register_clkdev(clk, NULL, "spi2");
 
-       clk = clk_reg_prcc_pclk("p2_pclk2", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk2", "per2clk", bases[CLKRST2_INDEX],
                                BIT(2), 0);
        clk_register_clkdev(clk, NULL, "spi1");
 
-       clk = clk_reg_prcc_pclk("p2_pclk3", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk3", "per2clk", bases[CLKRST2_INDEX],
                                BIT(3), 0);
        clk_register_clkdev(clk, NULL, "pwl");
 
-       clk = clk_reg_prcc_pclk("p2_pclk4", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk4", "per2clk", bases[CLKRST2_INDEX],
                                BIT(4), 0);
        clk_register_clkdev(clk, "apb_pclk", "sdi4");
 
-       clk = clk_reg_prcc_pclk("p2_pclk5", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk5", "per2clk", bases[CLKRST2_INDEX],
                                BIT(5), 0);
        clk_register_clkdev(clk, "apb_pclk", "msp2");
        clk_register_clkdev(clk, "apb_pclk", "dbx5x0-msp-i2s.2");
 
-       clk = clk_reg_prcc_pclk("p2_pclk6", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk6", "per2clk", bases[CLKRST2_INDEX],
                                BIT(6), 0);
        clk_register_clkdev(clk, "apb_pclk", "sdi1");
 
-       clk = clk_reg_prcc_pclk("p2_pclk7", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk7", "per2clk", bases[CLKRST2_INDEX],
                                BIT(7), 0);
        clk_register_clkdev(clk, "apb_pclk", "sdi3");
 
-       clk = clk_reg_prcc_pclk("p2_pclk8", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk8", "per2clk", bases[CLKRST2_INDEX],
                                BIT(8), 0);
        clk_register_clkdev(clk, NULL, "spi0");
 
-       clk = clk_reg_prcc_pclk("p2_pclk9", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk9", "per2clk", bases[CLKRST2_INDEX],
                                BIT(9), 0);
        clk_register_clkdev(clk, "hsir_hclk", "ste_hsi.0");
 
-       clk = clk_reg_prcc_pclk("p2_pclk10", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk10", "per2clk", bases[CLKRST2_INDEX],
                                BIT(10), 0);
        clk_register_clkdev(clk, "hsit_hclk", "ste_hsi.0");
 
-       clk = clk_reg_prcc_pclk("p2_pclk11", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk11", "per2clk", bases[CLKRST2_INDEX],
                                BIT(11), 0);
        clk_register_clkdev(clk, NULL, "gpio.6");
        clk_register_clkdev(clk, NULL, "gpio.7");
        clk_register_clkdev(clk, NULL, "gpioblock1");
 
-       clk = clk_reg_prcc_pclk("p2_pclk12", "per2clk", clkrst2_base,
+       clk = clk_reg_prcc_pclk("p2_pclk12", "per2clk", bases[CLKRST2_INDEX],
                                BIT(12), 0);
        clk_register_clkdev(clk, "msp4-pclk", "ab85xx-codec.0");
 
        /* Peripheral 3 : PRCC P-clocks */
-       clk = clk_reg_prcc_pclk("p3_pclk0", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk0", "per3clk", bases[CLKRST3_INDEX],
                                BIT(0), 0);
        clk_register_clkdev(clk, NULL, "fsmc");
 
-       clk = clk_reg_prcc_pclk("p3_pclk1", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk1", "per3clk", bases[CLKRST3_INDEX],
                                BIT(1), 0);
        clk_register_clkdev(clk, "apb_pclk", "ssp0");
 
-       clk = clk_reg_prcc_pclk("p3_pclk2", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk2", "per3clk", bases[CLKRST3_INDEX],
                                BIT(2), 0);
        clk_register_clkdev(clk, "apb_pclk", "ssp1");
 
-       clk = clk_reg_prcc_pclk("p3_pclk3", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk3", "per3clk", bases[CLKRST3_INDEX],
                                BIT(3), 0);
        clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.0");
 
-       clk = clk_reg_prcc_pclk("p3_pclk4", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk4", "per3clk", bases[CLKRST3_INDEX],
                                BIT(4), 0);
        clk_register_clkdev(clk, "apb_pclk", "sdi2");
 
-       clk = clk_reg_prcc_pclk("p3_pclk5", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk5", "per3clk", bases[CLKRST3_INDEX],
                                BIT(5), 0);
        clk_register_clkdev(clk, "apb_pclk", "ske");
        clk_register_clkdev(clk, "apb_pclk", "nmk-ske-keypad");
 
-       clk = clk_reg_prcc_pclk("p3_pclk6", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk6", "per3clk", bases[CLKRST3_INDEX],
                                BIT(6), 0);
        clk_register_clkdev(clk, "apb_pclk", "uart2");
 
-       clk = clk_reg_prcc_pclk("p3_pclk7", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk7", "per3clk", bases[CLKRST3_INDEX],
                                BIT(7), 0);
        clk_register_clkdev(clk, "apb_pclk", "sdi5");
 
-       clk = clk_reg_prcc_pclk("p3_pclk8", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk8", "per3clk", bases[CLKRST3_INDEX],
                                BIT(8), 0);
        clk_register_clkdev(clk, NULL, "gpio.2");
        clk_register_clkdev(clk, NULL, "gpio.3");
@@ -371,64 +405,64 @@ void u8540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
        clk_register_clkdev(clk, NULL, "gpio.5");
        clk_register_clkdev(clk, NULL, "gpioblock2");
 
-       clk = clk_reg_prcc_pclk("p3_pclk9", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk9", "per3clk", bases[CLKRST3_INDEX],
                                BIT(9), 0);
        clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.5");
 
-       clk = clk_reg_prcc_pclk("p3_pclk10", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk10", "per3clk", bases[CLKRST3_INDEX],
                                BIT(10), 0);
        clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.6");
 
-       clk = clk_reg_prcc_pclk("p3_pclk11", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk11", "per3clk", bases[CLKRST3_INDEX],
                                BIT(11), 0);
        clk_register_clkdev(clk, "apb_pclk", "uart3");
 
-       clk = clk_reg_prcc_pclk("p3_pclk12", "per3clk", clkrst3_base,
+       clk = clk_reg_prcc_pclk("p3_pclk12", "per3clk", bases[CLKRST3_INDEX],
                                BIT(12), 0);
        clk_register_clkdev(clk, "apb_pclk", "uart4");
 
        /* Peripheral 5 : PRCC P-clocks */
-       clk = clk_reg_prcc_pclk("p5_pclk0", "per5clk", clkrst5_base,
+       clk = clk_reg_prcc_pclk("p5_pclk0", "per5clk", bases[CLKRST5_INDEX],
                                BIT(0), 0);
        clk_register_clkdev(clk, "usb", "musb-ux500.0");
        clk_register_clkdev(clk, "usbclk", "ab-iddet.0");
 
-       clk = clk_reg_prcc_pclk("p5_pclk1", "per5clk", clkrst5_base,
+       clk = clk_reg_prcc_pclk("p5_pclk1", "per5clk", bases[CLKRST5_INDEX],
                                BIT(1), 0);
        clk_register_clkdev(clk, NULL, "gpio.8");
        clk_register_clkdev(clk, NULL, "gpioblock3");
 
        /* Peripheral 6 : PRCC P-clocks */
-       clk = clk_reg_prcc_pclk("p6_pclk0", "per6clk", clkrst6_base,
+       clk = clk_reg_prcc_pclk("p6_pclk0", "per6clk", bases[CLKRST6_INDEX],
                                BIT(0), 0);
        clk_register_clkdev(clk, "apb_pclk", "rng");
 
-       clk = clk_reg_prcc_pclk("p6_pclk1", "per6clk", clkrst6_base,
+       clk = clk_reg_prcc_pclk("p6_pclk1", "per6clk", bases[CLKRST6_INDEX],
                                BIT(1), 0);
        clk_register_clkdev(clk, NULL, "cryp0");
        clk_register_clkdev(clk, NULL, "cryp1");
 
-       clk = clk_reg_prcc_pclk("p6_pclk2", "per6clk", clkrst6_base,
+       clk = clk_reg_prcc_pclk("p6_pclk2", "per6clk", bases[CLKRST6_INDEX],
                                BIT(2), 0);
        clk_register_clkdev(clk, NULL, "hash0");
 
-       clk = clk_reg_prcc_pclk("p6_pclk3", "per6clk", clkrst6_base,
+       clk = clk_reg_prcc_pclk("p6_pclk3", "per6clk", bases[CLKRST6_INDEX],
                                BIT(3), 0);
        clk_register_clkdev(clk, NULL, "pka");
 
-       clk = clk_reg_prcc_pclk("p6_pclk4", "per6clk", clkrst6_base,
+       clk = clk_reg_prcc_pclk("p6_pclk4", "per6clk", bases[CLKRST6_INDEX],
                                BIT(4), 0);
        clk_register_clkdev(clk, NULL, "db8540-hash1");
 
-       clk = clk_reg_prcc_pclk("p6_pclk5", "per6clk", clkrst6_base,
+       clk = clk_reg_prcc_pclk("p6_pclk5", "per6clk", bases[CLKRST6_INDEX],
                                BIT(5), 0);
        clk_register_clkdev(clk, NULL, "cfgreg");
 
-       clk = clk_reg_prcc_pclk("p6_pclk6", "per6clk", clkrst6_base,
+       clk = clk_reg_prcc_pclk("p6_pclk6", "per6clk", bases[CLKRST6_INDEX],
                                BIT(6), 0);
        clk_register_clkdev(clk, "apb_pclk", "mtu0");
 
-       clk = clk_reg_prcc_pclk("p6_pclk7", "per6clk", clkrst6_base,
+       clk = clk_reg_prcc_pclk("p6_pclk7", "per6clk", bases[CLKRST6_INDEX],
                                BIT(7), 0);
        clk_register_clkdev(clk, "apb_pclk", "mtu1");
 
@@ -442,138 +476,138 @@ void u8540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
 
        /* Peripheral 1 : PRCC K-clocks */
        clk = clk_reg_prcc_kclk("p1_uart0_kclk", "uartclk",
-                       clkrst1_base, BIT(0), CLK_SET_RATE_GATE);
+                       bases[CLKRST1_INDEX], BIT(0), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "uart0");
 
        clk = clk_reg_prcc_kclk("p1_uart1_kclk", "uartclk",
-                       clkrst1_base, BIT(1), CLK_SET_RATE_GATE);
+                       bases[CLKRST1_INDEX], BIT(1), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "uart1");
 
        clk = clk_reg_prcc_kclk("p1_i2c1_kclk", "i2cclk",
-                       clkrst1_base, BIT(2), CLK_SET_RATE_GATE);
+                       bases[CLKRST1_INDEX], BIT(2), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "nmk-i2c.1");
 
        clk = clk_reg_prcc_kclk("p1_msp0_kclk", "msp02clk",
-                       clkrst1_base, BIT(3), CLK_SET_RATE_GATE);
+                       bases[CLKRST1_INDEX], BIT(3), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "msp0");
        clk_register_clkdev(clk, NULL, "dbx5x0-msp-i2s.0");
 
        clk = clk_reg_prcc_kclk("p1_msp1_kclk", "msp1clk",
-                       clkrst1_base, BIT(4), CLK_SET_RATE_GATE);
+                       bases[CLKRST1_INDEX], BIT(4), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "msp1");
        clk_register_clkdev(clk, NULL, "dbx5x0-msp-i2s.1");
 
        clk = clk_reg_prcc_kclk("p1_sdi0_kclk", "sdmmchclk",
-                       clkrst1_base, BIT(5), CLK_SET_RATE_GATE);
+                       bases[CLKRST1_INDEX], BIT(5), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "sdi0");
 
        clk = clk_reg_prcc_kclk("p1_i2c2_kclk", "i2cclk",
-                       clkrst1_base, BIT(6), CLK_SET_RATE_GATE);
+                       bases[CLKRST1_INDEX], BIT(6), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "nmk-i2c.2");
 
        clk = clk_reg_prcc_kclk("p1_slimbus0_kclk", "slimclk",
-                       clkrst1_base, BIT(8), CLK_SET_RATE_GATE);
+                       bases[CLKRST1_INDEX], BIT(8), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "slimbus0");
 
        clk = clk_reg_prcc_kclk("p1_i2c4_kclk", "i2cclk",
-                       clkrst1_base, BIT(9), CLK_SET_RATE_GATE);
+                       bases[CLKRST1_INDEX], BIT(9), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "nmk-i2c.4");
 
        clk = clk_reg_prcc_kclk("p1_msp3_kclk", "msp1clk",
-                       clkrst1_base, BIT(10), CLK_SET_RATE_GATE);
+                       bases[CLKRST1_INDEX], BIT(10), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "msp3");
        clk_register_clkdev(clk, NULL, "dbx5x0-msp-i2s.3");
 
        /* Peripheral 2 : PRCC K-clocks */
        clk = clk_reg_prcc_kclk("p2_i2c3_kclk", "i2cclk",
-                       clkrst2_base, BIT(0), CLK_SET_RATE_GATE);
+                       bases[CLKRST2_INDEX], BIT(0), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "nmk-i2c.3");
 
        clk = clk_reg_prcc_kclk("p2_pwl_kclk", "rtc32k",
-                       clkrst2_base, BIT(1), CLK_SET_RATE_GATE);
+                       bases[CLKRST2_INDEX], BIT(1), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "pwl");
 
        clk = clk_reg_prcc_kclk("p2_sdi4_kclk", "sdmmchclk",
-                       clkrst2_base, BIT(2), CLK_SET_RATE_GATE);
+                       bases[CLKRST2_INDEX], BIT(2), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "sdi4");
 
        clk = clk_reg_prcc_kclk("p2_msp2_kclk", "msp02clk",
-                       clkrst2_base, BIT(3), CLK_SET_RATE_GATE);
+                       bases[CLKRST2_INDEX], BIT(3), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "msp2");
        clk_register_clkdev(clk, NULL, "dbx5x0-msp-i2s.2");
 
        clk = clk_reg_prcc_kclk("p2_sdi1_kclk", "sdmmchclk",
-                       clkrst2_base, BIT(4), CLK_SET_RATE_GATE);
+                       bases[CLKRST2_INDEX], BIT(4), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "sdi1");
 
        clk = clk_reg_prcc_kclk("p2_sdi3_kclk", "sdmmcclk",
-                       clkrst2_base, BIT(5), CLK_SET_RATE_GATE);
+                       bases[CLKRST2_INDEX], BIT(5), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "sdi3");
 
        clk = clk_reg_prcc_kclk("p2_ssirx_kclk", "hsirxclk",
-                       clkrst2_base, BIT(6),
+                       bases[CLKRST2_INDEX], BIT(6),
                        CLK_SET_RATE_GATE|CLK_SET_RATE_PARENT);
        clk_register_clkdev(clk, "hsir_hsirxclk", "ste_hsi.0");
 
        clk = clk_reg_prcc_kclk("p2_ssitx_kclk", "hsitxclk",
-                       clkrst2_base, BIT(7),
+                       bases[CLKRST2_INDEX], BIT(7),
                        CLK_SET_RATE_GATE|CLK_SET_RATE_PARENT);
        clk_register_clkdev(clk, "hsit_hsitxclk", "ste_hsi.0");
 
        /* Should only be 9540, but might be added for 85xx as well */
        clk = clk_reg_prcc_kclk("p2_msp4_kclk", "msp02clk",
-                       clkrst2_base, BIT(9), CLK_SET_RATE_GATE);
+                       bases[CLKRST2_INDEX], BIT(9), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "msp4");
        clk_register_clkdev(clk, "msp4", "ab85xx-codec.0");
 
        /* Peripheral 3 : PRCC K-clocks */
        clk = clk_reg_prcc_kclk("p3_ssp0_kclk", "sspclk",
-                       clkrst3_base, BIT(1), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(1), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "ssp0");
 
        clk = clk_reg_prcc_kclk("p3_ssp1_kclk", "sspclk",
-                       clkrst3_base, BIT(2), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(2), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "ssp1");
 
        clk = clk_reg_prcc_kclk("p3_i2c0_kclk", "i2cclk",
-                       clkrst3_base, BIT(3), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(3), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "nmk-i2c.0");
 
        clk = clk_reg_prcc_kclk("p3_sdi2_kclk", "sdmmchclk",
-                       clkrst3_base, BIT(4), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(4), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "sdi2");
 
        clk = clk_reg_prcc_kclk("p3_ske_kclk", "rtc32k",
-                       clkrst3_base, BIT(5), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(5), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "ske");
        clk_register_clkdev(clk, NULL, "nmk-ske-keypad");
 
        clk = clk_reg_prcc_kclk("p3_uart2_kclk", "uartclk",
-                       clkrst3_base, BIT(6), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(6), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "uart2");
 
        clk = clk_reg_prcc_kclk("p3_sdi5_kclk", "sdmmcclk",
-                       clkrst3_base, BIT(7), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(7), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "sdi5");
 
        clk = clk_reg_prcc_kclk("p3_i2c5_kclk", "i2cclk",
-                       clkrst3_base, BIT(8), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(8), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "nmk-i2c.5");
 
        clk = clk_reg_prcc_kclk("p3_i2c6_kclk", "i2cclk",
-                       clkrst3_base, BIT(9), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(9), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "nmk-i2c.6");
 
        clk = clk_reg_prcc_kclk("p3_uart3_kclk", "uartclk",
-                       clkrst3_base, BIT(10), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(10), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "uart3");
 
        clk = clk_reg_prcc_kclk("p3_uart4_kclk", "uartclk",
-                       clkrst3_base, BIT(11), CLK_SET_RATE_GATE);
+                       bases[CLKRST3_INDEX], BIT(11), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "uart4");
 
        /* Peripheral 6 : PRCC K-clocks */
        clk = clk_reg_prcc_kclk("p6_rng_kclk", "rngclk",
-                       clkrst6_base, BIT(0), CLK_SET_RATE_GATE);
+                       bases[CLKRST6_INDEX], BIT(0), CLK_SET_RATE_GATE);
        clk_register_clkdev(clk, NULL, "rng");
 }