[ARM] omap: convert omap RNG clocks to match by devid and conid

[safe/jmp/linux-2.6] / arch / arm / mach-omap2 / clock24xx.c

diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 36093ea..1e9ac83 100644 (file)
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -139,22 +139,22 @@ static struct omap_clk omap24xx_clks[] = {
        CLK(NULL,       "gpt11_fck",    &gpt11_fck,     CK_243X | CK_242X),
        CLK(NULL,       "gpt12_ick",    &gpt12_ick,     CK_243X | CK_242X),
        CLK(NULL,       "gpt12_fck",    &gpt12_fck,     CK_243X | CK_242X),
-       CLK("omap-mcbsp.1", "mcbsp_ick", &mcbsp1_ick,   CK_243X | CK_242X),
-       CLK("omap-mcbsp.1", "mcbsp_fck", &mcbsp1_fck,   CK_243X | CK_242X),
-       CLK("omap-mcbsp.2", "mcbsp_ick", &mcbsp2_ick,   CK_243X | CK_242X),
-       CLK("omap-mcbsp.2", "mcbsp_fck", &mcbsp2_fck,   CK_243X | CK_242X),
-       CLK("omap-mcbsp.3", "mcbsp_ick", &mcbsp3_ick,   CK_243X),
-       CLK("omap-mcbsp.3", "mcbsp_fck", &mcbsp3_fck,   CK_243X),
-       CLK("omap-mcbsp.4", "mcbsp_ick", &mcbsp4_ick,   CK_243X),
-       CLK("omap-mcbsp.4", "mcbsp_fck", &mcbsp4_fck,   CK_243X),
-       CLK("omap-mcbsp.5", "mcbsp_ick", &mcbsp5_ick,   CK_243X),
-       CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck,   CK_243X),
-       CLK("omap2_mcspi.1", "mcspi_ick", &mcspi1_ick,  CK_243X | CK_242X),
-       CLK("omap2_mcspi.1", "mcspi_fck", &mcspi1_fck,  CK_243X | CK_242X),
-       CLK("omap2_mcspi.2", "mcspi_ick", &mcspi2_ick,  CK_243X | CK_242X),
-       CLK("omap2_mcspi.2", "mcspi_fck", &mcspi2_fck,  CK_243X | CK_242X),
-       CLK("omap2_mcspi.3", "mcspi_ick", &mcspi3_ick,  CK_243X),
-       CLK("omap2_mcspi.3", "mcspi_fck", &mcspi3_fck,  CK_243X),
+       CLK("omap-mcbsp.1", "ick",      &mcbsp1_ick,    CK_243X | CK_242X),
+       CLK("omap-mcbsp.1", "fck",      &mcbsp1_fck,    CK_243X | CK_242X),
+       CLK("omap-mcbsp.2", "ick",      &mcbsp2_ick,    CK_243X | CK_242X),
+       CLK("omap-mcbsp.2", "fck",      &mcbsp2_fck,    CK_243X | CK_242X),
+       CLK("omap-mcbsp.3", "ick",      &mcbsp3_ick,    CK_243X),
+       CLK("omap-mcbsp.3", "fck",      &mcbsp3_fck,    CK_243X),
+       CLK("omap-mcbsp.4", "ick",      &mcbsp4_ick,    CK_243X),
+       CLK("omap-mcbsp.4", "fck",      &mcbsp4_fck,    CK_243X),
+       CLK("omap-mcbsp.5", "ick",      &mcbsp5_ick,    CK_243X),
+       CLK("omap-mcbsp.5", "fck",      &mcbsp5_fck,    CK_243X),
+       CLK("omap2_mcspi.1", "ick",     &mcspi1_ick,    CK_243X | CK_242X),
+       CLK("omap2_mcspi.1", "fck",     &mcspi1_fck,    CK_243X | CK_242X),
+       CLK("omap2_mcspi.2", "ick",     &mcspi2_ick,    CK_243X | CK_242X),
+       CLK("omap2_mcspi.2", "fck",     &mcspi2_fck,    CK_243X | CK_242X),
+       CLK("omap2_mcspi.3", "ick",     &mcspi3_ick,    CK_243X),
+       CLK("omap2_mcspi.3", "fck",     &mcspi3_fck,    CK_243X),
        CLK(NULL,       "uart1_ick",    &uart1_ick,     CK_243X | CK_242X),
        CLK(NULL,       "uart1_fck",    &uart1_fck,     CK_243X | CK_242X),
        CLK(NULL,       "uart2_ick",    &uart2_ick,     CK_243X | CK_242X),
@@ -163,8 +163,8 @@ static struct omap_clk omap24xx_clks[] = {
        CLK(NULL,       "uart3_fck",    &uart3_fck,     CK_243X | CK_242X),
        CLK(NULL,       "gpios_ick",    &gpios_ick,     CK_243X | CK_242X),
        CLK(NULL,       "gpios_fck",    &gpios_fck,     CK_243X | CK_242X),
-       CLK(NULL,       "mpu_wdt_ick",  &mpu_wdt_ick,   CK_243X | CK_242X),
-       CLK(NULL,       "mpu_wdt_fck",  &mpu_wdt_fck,   CK_243X | CK_242X),
+       CLK("omap_wdt", "ick",          &mpu_wdt_ick,   CK_243X | CK_242X),
+       CLK("omap_wdt", "fck",          &mpu_wdt_fck,   CK_243X | CK_242X),
        CLK(NULL,       "sync_32k_ick", &sync_32k_ick,  CK_243X | CK_242X),
        CLK(NULL,       "wdt1_ick",     &wdt1_ick,      CK_243X | CK_242X),
        CLK(NULL,       "omapctrl_ick", &omapctrl_ick,  CK_243X | CK_242X),
@@ -178,20 +178,20 @@ static struct omap_clk omap24xx_clks[] = {
        CLK(NULL,       "wdt3_fck",     &wdt3_fck,      CK_242X),
        CLK(NULL,       "mspro_ick",    &mspro_ick,     CK_243X | CK_242X),
        CLK(NULL,       "mspro_fck",    &mspro_fck,     CK_243X | CK_242X),
-       CLK(NULL,       "mmc_ick",      &mmc_ick,       CK_242X),
-       CLK(NULL,       "mmc_fck",      &mmc_fck,       CK_242X),
+       CLK("mmci-omap.0", "ick",       &mmc_ick,       CK_242X),
+       CLK("mmci-omap.0", "fck",       &mmc_fck,       CK_242X),
        CLK(NULL,       "fac_ick",      &fac_ick,       CK_243X | CK_242X),
        CLK(NULL,       "fac_fck",      &fac_fck,       CK_243X | CK_242X),
        CLK(NULL,       "eac_ick",      &eac_ick,       CK_242X),
        CLK(NULL,       "eac_fck",      &eac_fck,       CK_242X),
-       CLK(NULL,       "hdq_ick",      &hdq_ick,       CK_243X | CK_242X),
-       CLK(NULL,       "hdq_fck",      &hdq_fck,       CK_243X | CK_242X),
-       CLK("i2c_omap.1", "i2c_ick",    &i2c1_ick,      CK_243X | CK_242X),
-       CLK("i2c_omap.1", "i2c_fck",    &i2c1_fck,      CK_242X),
-       CLK("i2c_omap.1", "i2c_fck",    &i2chs1_fck,    CK_243X),
-       CLK("i2c_omap.2", "i2c_ick",    &i2c2_ick,      CK_243X | CK_242X),
-       CLK("i2c_omap.2", "i2c_fck",    &i2c2_fck,      CK_242X),
-       CLK("i2c_omap.2", "i2c_fck",    &i2chs2_fck,    CK_243X),
+       CLK("omap_hdq.0", "ick",        &hdq_ick,       CK_243X | CK_242X),
+       CLK("omap_hdq.1", "fck",        &hdq_fck,       CK_243X | CK_242X),
+       CLK("i2c_omap.1", "ick",        &i2c1_ick,      CK_243X | CK_242X),
+       CLK("i2c_omap.1", "fck",        &i2c1_fck,      CK_242X),
+       CLK("i2c_omap.1", "fck",        &i2chs1_fck,    CK_243X),
+       CLK("i2c_omap.2", "ick",        &i2c2_ick,      CK_243X | CK_242X),
+       CLK("i2c_omap.2", "fck",        &i2c2_fck,      CK_242X),
+       CLK("i2c_omap.2", "fck",        &i2chs2_fck,    CK_243X),
        CLK(NULL,       "gpmc_fck",     &gpmc_fck,      CK_243X | CK_242X),
        CLK(NULL,       "sdma_fck",     &sdma_fck,      CK_243X | CK_242X),
        CLK(NULL,       "sdma_ick",     &sdma_ick,      CK_243X | CK_242X),
@@ -200,7 +200,7 @@ static struct omap_clk omap24xx_clks[] = {
        CLK(NULL,       "sdrc_ick",     &sdrc_ick,      CK_243X),
        CLK(NULL,       "des_ick",      &des_ick,       CK_243X | CK_242X),
        CLK(NULL,       "sha_ick",      &sha_ick,       CK_243X | CK_242X),
-       CLK(NULL,       "rng_ick",      &rng_ick,       CK_243X | CK_242X),
+       CLK("omap_rng", "ick",          &rng_ick,       CK_243X | CK_242X),
        CLK(NULL,       "aes_ick",      &aes_ick,       CK_243X | CK_242X),
        CLK(NULL,       "pka_ick",      &pka_ick,       CK_243X | CK_242X),
        CLK(NULL,       "usb_fck",      &usb_fck,       CK_243X | CK_242X),