diff options
author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-04-26 04:14:52 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-05-29 01:50:31 -0400 |
commit | 20faa59e0f3e3e6a6afeeaa7d976debacfce4fe3 (patch) | |
tree | 4209bb3dd0fd2f25877e932e5e7a7f192991c0ff /drivers/clk | |
parent | 1a0483d2a4c2c5e218d415c90d1a62b3b917d34e (diff) |
clk: ux500: abx500-clk: rename ux500 audio codec aliases
Change soc-audio related clk_register_clkdev() device names to reflect
the ones actually used in current snd-soc-mop500 and ab8500-codec
drivers.
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/ux500/abx500-clk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clk/ux500/abx500-clk.c b/drivers/clk/ux500/abx500-clk.c index a0fca004abc1..e7bd62cf60b3 100644 --- a/drivers/clk/ux500/abx500-clk.c +++ b/drivers/clk/ux500/abx500-clk.c | |||
@@ -45,7 +45,7 @@ static int ab8500_reg_clks(struct device *dev) | |||
45 | CLK_IS_ROOT); | 45 | CLK_IS_ROOT); |
46 | clk_register_clkdev(clk, "sysclk", "ab8500-usb.0"); | 46 | clk_register_clkdev(clk, "sysclk", "ab8500-usb.0"); |
47 | clk_register_clkdev(clk, "sysclk", "ab-iddet.0"); | 47 | clk_register_clkdev(clk, "sysclk", "ab-iddet.0"); |
48 | clk_register_clkdev(clk, "sysclk", "ab85xx-codec.0"); | 48 | clk_register_clkdev(clk, "sysclk", "snd-soc-mop500.0"); |
49 | clk_register_clkdev(clk, "sysclk", "shrm_bus"); | 49 | clk_register_clkdev(clk, "sysclk", "shrm_bus"); |
50 | 50 | ||
51 | /* ab8500_sysclk2 */ | 51 | /* ab8500_sysclk2 */ |
@@ -70,19 +70,19 @@ static int ab8500_reg_clks(struct device *dev) | |||
70 | AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_ULPCLKREQ, | 70 | AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_ULPCLKREQ, |
71 | AB8500_SYSULPCLKCTRL1_ULPCLKREQ, | 71 | AB8500_SYSULPCLKCTRL1_ULPCLKREQ, |
72 | 38400000, 9000, CLK_IS_ROOT); | 72 | 38400000, 9000, CLK_IS_ROOT); |
73 | clk_register_clkdev(clk, "ulpclk", "ab85xx-codec.0"); | 73 | clk_register_clkdev(clk, "ulpclk", "snd-soc-mop500.0"); |
74 | 74 | ||
75 | /* ab8500_intclk */ | 75 | /* ab8500_intclk */ |
76 | clk = clk_reg_sysctrl_set_parent(dev , "intclk", intclk_parents, 2, | 76 | clk = clk_reg_sysctrl_set_parent(dev , "intclk", intclk_parents, 2, |
77 | intclk_reg_sel, intclk_reg_mask, intclk_reg_bits, 0); | 77 | intclk_reg_sel, intclk_reg_mask, intclk_reg_bits, 0); |
78 | clk_register_clkdev(clk, "intclk", "ab85xx-codec.0"); | 78 | clk_register_clkdev(clk, "intclk", "snd-soc-mop500.0"); |
79 | clk_register_clkdev(clk, NULL, "ab8500-pwm.1"); | 79 | clk_register_clkdev(clk, NULL, "ab8500-pwm.1"); |
80 | 80 | ||
81 | /* ab8500_audioclk */ | 81 | /* ab8500_audioclk */ |
82 | clk = clk_reg_sysctrl_gate(dev , "audioclk", "intclk", | 82 | clk = clk_reg_sysctrl_gate(dev , "audioclk", "intclk", |
83 | AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_AUDIOCLKENA, | 83 | AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_AUDIOCLKENA, |
84 | AB8500_SYSULPCLKCTRL1_AUDIOCLKENA, 0, 0); | 84 | AB8500_SYSULPCLKCTRL1_AUDIOCLKENA, 0, 0); |
85 | clk_register_clkdev(clk, "audioclk", "ab85xx-codec.0"); | 85 | clk_register_clkdev(clk, "audioclk", "ab8500-codec.0"); |
86 | 86 | ||
87 | return 0; | 87 | return 0; |
88 | } | 88 | } |