summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorXiaohui Tao <xtao@nvidia.com>2013-04-22 10:22:59 -0700
committerSimone Willett <swillett@nvidia.com>2013-04-24 14:31:23 -0700
commita79f45c5357191fa8da61c8fefe3a79bef8afadb (patch)
treed5450f92d87f937adff9fe6df9ddbfcc928544a6 /arch
parent29178237b3073b45569dcec2fc85bdd7491a1f25 (diff)
ARM:tegra: Add support to parse touch panel id
Support to parse touch panel id for kernel Bug 1253012 Change-Id: I902a1a63efc030cb4b4e82e7301c00027c8e950c Signed-off-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-on: http://git-master/r/221647 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Robert Collins <rcollins@nvidia.com> Reviewed-by: Matt Wagner <mwagner@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board.h1
-rw-r--r--arch/arm/mach-tegra/common.c13
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index 0d6c919f5b86..bcd1a4f33801 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -188,6 +188,7 @@ void tegra_get_joystick_board_info(struct board_info *bi);
void tegra_get_rightspeaker_board_info(struct board_info *bi);
void tegra_get_leftspeaker_board_info(struct board_info *bi);
int tegra_get_board_panel_id(void);
+int tegra_get_touch_panel_id(void);
int get_core_edp(void);
enum panel_type get_panel_type(void);
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index d898eb292f28..f22fdc549e6f 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -129,6 +129,7 @@ static bool is_tegra_debug_uart_hsport;
static struct board_info pmu_board_info;
static struct board_info display_board_info;
static int panel_id;
+static int touch_panel_id;
static struct board_info camera_board_info;
static struct board_info io_board_info;
static struct board_info button_board_info;
@@ -890,6 +891,18 @@ static int __init tegra_board_panel_id(char *options)
}
__setup("display_panel=", tegra_board_panel_id);
+int tegra_get_touch_panel_id(void)
+{
+ return touch_panel_id;
+}
+static int __init tegra_touch_panel_id(char *options)
+{
+ char *p = options;
+ touch_panel_id = memparse(p, &p);
+ return touch_panel_id;
+}
+__setup("touch_panel_id=", tegra_touch_panel_id);
+
enum power_supply_type get_power_supply_type(void)
{
return pow_supply_type;