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

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / clock34xx.c

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index 859ad1d4062a0f35775164a67f6e3c26a8b41081..1a4bc336c8a3bcb7b0dfb3573d5e6f333a9562d4 100644 (file)
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -155,7 +155,7 @@ static struct omap_clk omap34xx_clks[] = {
        CLK(NULL,       "uart1_fck",    &uart1_fck,     CK_343X),
        CLK(NULL,       "fshostusb_fck", &fshostusb_fck, CK_3430ES1),
        CLK(NULL,       "core_12m_fck", &core_12m_fck,  CK_343X),
-       CLK(NULL,       "hdq_fck",      &hdq_fck,       CK_343X),
+       CLK("omap_hdq.0", "fck",        &hdq_fck,       CK_343X),
        CLK(NULL,       "ssi_ssr_fck",  &ssi_ssr_fck,   CK_343X),
        CLK(NULL,       "ssi_sst_fck",  &ssi_sst_fck,   CK_343X),
        CLK(NULL,       "core_l3_ick",  &core_l3_ick,   CK_343X),
@@ -174,7 +174,7 @@ static struct omap_clk omap34xx_clks[] = {
        CLK("mmci-omap-hs.1",   "mmchs_ick",    &mmchs2_ick,    CK_343X),
        CLK("mmci-omap-hs.0",   "mmchs_ick",    &mmchs1_ick,    CK_343X),
        CLK(NULL,       "mspro_ick",    &mspro_ick,     CK_343X),
-       CLK(NULL,       "hdq_ick",      &hdq_ick,       CK_343X),
+       CLK("omap_hdq.0", "ick",        &hdq_ick,       CK_343X),
        CLK("omap2_mcspi.4", "ick",     &mcspi4_ick,    CK_343X),
        CLK("omap2_mcspi.3", "ick",     &mcspi3_ick,    CK_343X),
        CLK("omap2_mcspi.2", "ick",     &mcspi2_ick,    CK_343X),