diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-09-02 12:08:42 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-12 16:15:14 -0400 |
commit | 435b6e94b88af96c3f5b5798c087978c3793400c (patch) | |
tree | 1d48945a3a294aea722a428adeb4d6b59dc3a1cc | |
parent | 6549e6c9575c897514b183071a2b5d839cef9469 (diff) |
[ARM] pxa: Make STUART and FICP clocks available
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 62a770121bfa..ef40c049d9e2 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -115,8 +115,8 @@ static struct clk pxa25x_clks[] = { | |||
115 | INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), | 115 | INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), |
116 | INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev), | 116 | INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev), |
117 | INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), | 117 | INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), |
118 | INIT_CKEN("UARTCLK", STUART, 14745600, 1, &pxa_device_stuart.dev), | ||
119 | INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), | 118 | INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), |
119 | INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL), | ||
120 | INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev), | 120 | INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev), |
121 | INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev), | 121 | INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev), |
122 | INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev), | 122 | INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev), |
@@ -126,8 +126,8 @@ static struct clk pxa25x_clks[] = { | |||
126 | INIT_CKEN("SSPCLK", SSP, 3686400, 0, NULL), | 126 | INIT_CKEN("SSPCLK", SSP, 3686400, 0, NULL), |
127 | INIT_CKEN("I2SCLK", I2S, 14745600, 0, NULL), | 127 | INIT_CKEN("I2SCLK", I2S, 14745600, 0, NULL), |
128 | INIT_CKEN("NSSPCLK", NSSP, 3686400, 0, NULL), | 128 | INIT_CKEN("NSSPCLK", NSSP, 3686400, 0, NULL), |
129 | INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), | ||
130 | */ | 129 | */ |
130 | INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), | ||
131 | }; | 131 | }; |
132 | 132 | ||
133 | #ifdef CONFIG_PM | 133 | #ifdef CONFIG_PM |
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 433644edf791..f7762bf18623 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -136,9 +136,9 @@ static struct clk pxa27x_clks[] = { | |||
136 | INIT_CK("LCDCLK", LCD, &clk_pxa27x_lcd_ops, &pxa_device_fb.dev), | 136 | INIT_CK("LCDCLK", LCD, &clk_pxa27x_lcd_ops, &pxa_device_fb.dev), |
137 | INIT_CK("CAMCLK", CAMERA, &clk_pxa27x_lcd_ops, NULL), | 137 | INIT_CK("CAMCLK", CAMERA, &clk_pxa27x_lcd_ops, NULL), |
138 | 138 | ||
139 | INIT_CKEN("UARTCLK", STUART, 14857000, 1, &pxa_device_stuart.dev), | ||
140 | INIT_CKEN("UARTCLK", FFUART, 14857000, 1, &pxa_device_ffuart.dev), | 139 | INIT_CKEN("UARTCLK", FFUART, 14857000, 1, &pxa_device_ffuart.dev), |
141 | INIT_CKEN("UARTCLK", BTUART, 14857000, 1, &pxa_device_btuart.dev), | 140 | INIT_CKEN("UARTCLK", BTUART, 14857000, 1, &pxa_device_btuart.dev), |
141 | INIT_CKEN("UARTCLK", STUART, 14857000, 1, NULL), | ||
142 | 142 | ||
143 | INIT_CKEN("I2SCLK", I2S, 14682000, 0, &pxa_device_i2s.dev), | 143 | INIT_CKEN("I2SCLK", I2S, 14682000, 0, &pxa_device_i2s.dev), |
144 | INIT_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), | 144 | INIT_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), |