From: Sivaram Nair Date: Tue, 23 Oct 2012 07:02:41 +0000 (+0300) Subject: ARM: tegra: cardhu: moving to clk prepare APIs X-Git-Tag: daily-2013.07.26.0_rel-roth-mp-3-partner~1223 X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=commitdiff_plain;h=dcfc6fe2ccb372b154af965be4c0b07926bf2bf3 ARM: tegra: cardhu: moving to clk prepare APIs The clk_enable/clk_disable pair of APIs are replaced with tegra_clk_prepare_enable and tegra_clk_disable_unprepare. This is needed for the migration to common clk framework. Bug 920915 Change-Id: If56780dfe147a3d6d9b0dbd5877bff8552a5b510 Signed-off-by: Sivaram Nair Reviewed-on: http://git-master/r/146785 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Laxman Dewangan --- diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index a453f1860e4..95278f81cb7 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -837,7 +837,7 @@ static int __init cardhu_touch_init(void) || CARDHU_DT_PLATFORM) { tegra_clk_init_from_table(spi_clk_init_table); tegra_clk_init_from_table(touch_clk_init_table); - clk_enable(tegra_get_clock_by_name("clk_out_3")); + tegra_clk_prepare_enable(tegra_get_clock_by_name("clk_out_3")); rm31080a_cardhu_spi_board[0].irq = gpio_to_irq(TOUCH_GPIO_IRQ_RAYDIUM_SPI); touch_init_raydium(TOUCH_GPIO_IRQ_RAYDIUM_SPI, TOUCH_GPIO_RST_RAYDIUM_SPI,