summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Ekici <aekici@nvidia.com>2012-02-01 15:51:58 -0800
committerSimone Willett <swillett@nvidia.com>2012-02-18 10:48:21 -0800
commit2c6262611454d6db62386928077c8a894ce9ed2f (patch)
treeb1ffac2bb1fae3fea46908a3db24eb329aa5eb9b
parenta1a27202b7ebf3ebeb3119ba3c60aafb4c3ed0cd (diff)
arm: tegra: Kai: Touch setup
Modified touch setup and init calls, so that Raydium DirectTouch can support both Kai and Cardhu. Bug 832605 Signed-off-by: Ali Ekici <aekici@nvidia.com> Change-Id: I13f57129b17e96b0f198b5d87a249008b2b3b4cb Reviewed-on: http://git-master/r/80127 Reviewed-by: Lokesh Pathak <lpathak@nvidia.com> Tested-by: Lokesh Pathak <lpathak@nvidia.com> (cherry picked from commit 659e18eb209d0d93025ff6ea07e91f7e27a762e1) Reviewed-on: http://git-master/r/83570 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-kai.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-kai.c b/arch/arm/mach-tegra/board-kai.c
index ae0b51d5d41f..6706de500ba3 100644
--- a/arch/arm/mach-tegra/board-kai.c
+++ b/arch/arm/mach-tegra/board-kai.c
@@ -565,7 +565,7 @@ static struct platform_device *kai_devices[] __initdata = {
static __initdata struct tegra_clk_init_table spi_clk_init_table[] = {
/* name parent rate enabled */
- { "sbc1", "pll_p", 72000000, true},
+ { "sbc1", "pll_p", 52000000, true},
{ NULL, NULL, 0, 0},
};
@@ -606,7 +606,7 @@ static int __init kai_touch_init(void)
case 0:
pr_info("Raydium PCB based touch init\n");
tegra_clk_init_from_table(spi_clk_init_table);
- touch_init_raydium();
+ touch_init_raydium(TEGRA_GPIO_PZ3, TEGRA_GPIO_PN5, 0);
break;
case 1:
pr_info("Raydium On-Board touch init\n");
@@ -614,7 +614,7 @@ static int __init kai_touch_init(void)
tegra_clk_init_from_table(touch_clk_init_table);
clk_enable(tegra_get_clock_by_name("clk_out_3"));
- touch_init_raydium();
+ touch_init_raydium(TEGRA_GPIO_PZ3, TEGRA_GPIO_PN5, 1);
break;
case 3:
pr_info("Synaptics PCB based touch init\n");