Revert "ARM i.MX25: Fix PWM per clock lookups"
Arnd Bergmann [Sat, 27 Oct 2012 15:41:13 +0000 (17:41 +0200)]
This reverts commit 92063cee118655d25b50d04eb77b012f3287357a, it
was applied prematurely, causing this build error for
imx_v4_v5_defconfig:

arch/arm/mach-imx/clk-imx25.c: In function 'mx25_clocks_init':
arch/arm/mach-imx/clk-imx25.c:206:26: error: 'pwm_ipg_per' undeclared (first use in this function)
arch/arm/mach-imx/clk-imx25.c:206:26: note: each undeclared identifier is reported only once for each function it appears in

Sascha Hauer explains:
> There are several gates missing in clk-imx25.c. I have a patch which
> adds support for them and I seem to have missed that the above depends
> on it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

arch/arm/mach-imx/clk-imx25.c

index 840fdfa..01e2f84 100644 (file)
@@ -203,13 +203,13 @@ int __init mx25_clocks_init(void)
        clk_register_clkdev(clk[cspi2_ipg], NULL, "imx35-cspi.1");
        clk_register_clkdev(clk[cspi3_ipg], NULL, "imx35-cspi.2");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.0");
-       clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.0");
+       clk_register_clkdev(clk[per10], "per", "mxc_pwm.0");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.1");
-       clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.1");
+       clk_register_clkdev(clk[per10], "per", "mxc_pwm.1");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.2");
-       clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.2");
+       clk_register_clkdev(clk[per10], "per", "mxc_pwm.2");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.3");
-       clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.3");
+       clk_register_clkdev(clk[per10], "per", "mxc_pwm.3");
        clk_register_clkdev(clk[kpp_ipg], NULL, "imx-keypad");
        clk_register_clkdev(clk[tsc_ipg], NULL, "mx25-adc");
        clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.0");