diff options
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 9e5d8a8c6424..305452b56e91 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
| @@ -166,8 +166,7 @@ static struct clk pxa25x_hwuart_clk = | |||
| 166 | ; | 166 | ; |
| 167 | 167 | ||
| 168 | /* | 168 | /* |
| 169 | * PXA 2xx clock declarations. Order is important (see aliases below) | 169 | * PXA 2xx clock declarations. |
| 170 | * Please be careful not to disrupt the ordering. | ||
| 171 | */ | 170 | */ |
| 172 | static struct clk pxa25x_clks[] = { | 171 | static struct clk pxa25x_clks[] = { |
| 173 | INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), | 172 | INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), |
| @@ -194,11 +193,6 @@ static struct clk pxa25x_clks[] = { | |||
| 194 | INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), | 193 | INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), |
| 195 | }; | 194 | }; |
| 196 | 195 | ||
| 197 | static struct clk pxa2xx_clk_aliases[] = { | ||
| 198 | INIT_CKOTHER("GPIO7_CLK", &pxa25x_clks[4], NULL), | ||
| 199 | INIT_CKOTHER("SA1111_CLK", &pxa25x_clks[5], NULL), | ||
| 200 | }; | ||
| 201 | |||
| 202 | #ifdef CONFIG_PM | 196 | #ifdef CONFIG_PM |
| 203 | 197 | ||
| 204 | #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x | 198 | #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x |
| @@ -375,8 +369,6 @@ static int __init pxa25x_init(void) | |||
| 375 | if (cpu_is_pxa255()) | 369 | if (cpu_is_pxa255()) |
| 376 | ret = platform_device_register(&pxa_device_hwuart); | 370 | ret = platform_device_register(&pxa_device_hwuart); |
| 377 | 371 | ||
| 378 | clks_register(pxa2xx_clk_aliases, ARRAY_SIZE(pxa2xx_clk_aliases)); | ||
| 379 | |||
| 380 | return ret; | 372 | return ret; |
| 381 | } | 373 | } |
| 382 | 374 | ||
