arm: tegra: Add raydium touch clock names
Aly Hirani [Fri, 7 Dec 2012 23:16:29 +0000 (15:16 -0800)]
Add the clock names for the raydium touch driver. Also remove
clk_enable()s as the raydium driver now properly enables the touch
clock.

Bug 1188790

Change-Id: Ia9dce83b7943dab35e3902dbefdb8d806df365ae
Signed-off-by: Aly Hirani <ahirani@nvidia.com>
Reviewed-on: http://git-master/r/172909
(cherry picked from commit 2f63800433896ac34b510038f665b19e6a630c1c)

Signed-off-by: David Jung <djung@nvidia.com>
Change-Id: Ib3f920c0dce00ba13e3e540b06959a0668771947
Reviewed-on: http://git-master/r/201264
Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com>
Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>

arch/arm/mach-tegra/board-dalmore.c
arch/arm/mach-tegra/board-pluto.c
arch/arm/mach-tegra/board-roth.c

index 7ccbfe5..e0123ea 100644 (file)
@@ -699,6 +699,7 @@ struct rm_spi_ts_platform_data rm31080ts_dalmore_data = {
        .config = 0,
        .platform_id = RM_PLATFORM_D010,
        .name_of_clock = "clk_out_2",
+       .name_of_clock_con = "extern2",
 };
 
 static struct tegra_spi_device_controller_data dev_cdata = {
@@ -721,7 +722,6 @@ struct spi_board_info rm31080a_dalmore_spi_board[1] = {
 static int __init dalmore_touch_init(void)
 {
        tegra_clk_init_from_table(touch_clk_init_table);
-       clk_enable(tegra_get_clock_by_name("clk_out_2"));
        if (display_board_info.board_id == BOARD_E1582)
                rm31080ts_dalmore_data.platform_id = RM_PLATFORM_P005;
        else
index 0426fe7..6d0a6cd 100644 (file)
@@ -1256,6 +1256,7 @@ struct rm_spi_ts_platform_data rm31080ts_pluto_data = {
        .config = 0,
        .platform_id = RM_PLATFORM_P005,
        .name_of_clock = "clk_out_2",
+       .name_of_clock_con = "extern2",
 };
 
 static struct tegra_spi_device_controller_data dev_cdata = {
@@ -1278,8 +1279,6 @@ struct spi_board_info rm31080a_pluto_spi_board[1] = {
 static int __init pluto_touch_init(void)
 {
        tegra_clk_init_from_table(touch_clk_init_table);
-       clk_enable(tegra_get_clock_by_name("clk_out_2"));
-       mdelay(20);
        rm31080a_pluto_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,
index c132314..7d93975 100644 (file)
@@ -616,6 +616,7 @@ struct rm_spi_ts_platform_data rm31080ts_roth_data = {
        .config = 0,
        .platform_id = RM_PLATFORM_D010,
        .name_of_clock = "clk_out_2",
+       .name_of_clock_con = "extern2",
 };
 
 static struct tegra_spi_device_controller_data dev_cdata = {