diff options
author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2013-01-22 14:26:27 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-26 11:21:37 +0400 |
commit | 3343b7a6d2cd0a980d0c4a0ce02ef48b6bfcc12a (patch) | |
tree | 09a2525b7710c0366dc99ba86cd51ec5a6e4c6f8 /include/linux/spi | |
parent | 7f86bde90e2e1f693d93922fc0f4d50f001ce1a5 (diff) | |
download | linux-3343b7a6d2cd0a980d0c4a0ce02ef48b6bfcc12a.tar.xz |
spi/pxa2xx: convert to the common clk framework
Convert clk_enable() to clk_prepare_enable() and clk_disable() to
clk_disable_unprepare() respectively in order to support the common clk
framework. Otherwise we get warnings on the console as the clock is not
prepared before it is enabled.
In addition we must cache the maximum clock rate to drv_data->max_clk_rate
at probe time because clk_get_rate() cannot be called in tasklet context.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux/spi')
-rw-r--r-- | include/linux/spi/pxa2xx_spi.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h index 6b99f09b717d..053b5ba51b25 100644 --- a/include/linux/spi/pxa2xx_spi.h +++ b/include/linux/spi/pxa2xx_spi.h @@ -133,23 +133,5 @@ static inline void pxa_free_dma(int dma_ch) { } -/* - * The CE4100 does not have the clk framework implemented and SPI clock can - * not be switched on/off or the divider changed. - */ -static inline void clk_disable(struct clk *clk) -{ -} - -static inline int clk_enable(struct clk *clk) -{ - return 0; -} - -static inline unsigned long clk_get_rate(struct clk *clk) -{ - return 3686400; -} - #endif #endif |