diff options
| author | Robert Collins <rcollins@nvidia.com> | 2012-12-06 22:08:30 -0800 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-01-24 16:16:44 -0800 |
| commit | 1eaadfd926977c44c26f3b67cac2364cd03ecf84 (patch) | |
| tree | 501ee433d66143fcc94a1c3864d2430e848118b3 /arch/arm/mach-tegra/board-roth-power.c | |
| parent | 9cf3e314099f1b5a415fd25431f14a6452094755 (diff) | |
ARM: tegra: Roth: Implement touch infrastructure
Nvidia changes to add Roth board files.
Bug 1178869
Change-Id: I11d5fafe34f1e3c7eb9389887bff2352e4103608
Signed-off-by: Robert Collins <rcollins@nvidia.com>
Reviewed-on: http://git-master/r/171519
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: David Jung <djung@nvidia.com>
Tested-by: David Jung <djung@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'arch/arm/mach-tegra/board-roth-power.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-roth-power.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/board-roth-power.c b/arch/arm/mach-tegra/board-roth-power.c index 12d581b03b49..3bd89e646518 100644 --- a/arch/arm/mach-tegra/board-roth-power.c +++ b/arch/arm/mach-tegra/board-roth-power.c @@ -210,6 +210,7 @@ static struct regulator_consumer_supply palmas_smps3_supply[] = { REGULATOR_SUPPLY("dbvdd", NULL), REGULATOR_SUPPLY("dvdd_lcd", NULL), REGULATOR_SUPPLY("vlogic", "0-0068"), + REGULATOR_SUPPLY("dvdd", "spi3.2"), }; static struct regulator_consumer_supply palmas_smps45_supply[] = { @@ -464,12 +465,6 @@ static struct regulator_consumer_supply fixed_reg_lcd_bl_en_supply[] = { REGULATOR_SUPPLY("vdd_lcd_bl_en", NULL), }; -/* Touch 3v3 GMI_AD13 */ -static struct regulator_consumer_supply fixed_reg_ts_3v3_supply[] = { - REGULATOR_SUPPLY("vdd_ts_3v3", NULL), - REGULATOR_SUPPLY("vdd_display", NULL), -}; - /* VDD_3V3_COM controled by Wifi */ static struct regulator_consumer_supply fixed_reg_com_3v3_supply[] = { REGULATOR_SUPPLY("vdd_wl_pa", "bcm4329_wlan.1"), @@ -489,6 +484,11 @@ static struct regulator_consumer_supply fixed_reg_sd_3v3_supply[] = { REGULATOR_SUPPLY("vddio_sd_slot", "sdhci-tegra.2"), }; +/* EN_3V3_TS From TEGRA_GPIO_PH5 */ +static struct regulator_consumer_supply fixed_reg_avdd_ts_supply[] = { + REGULATOR_SUPPLY("avdd", "spi3.2"), +}; + /* Macro for defining fixed regulator sub device data */ #define FIXED_SUPPLY(_name) "fixed_reg_"#_name #define FIXED_REG(_id, _var, _name, _in_supply, _always_on, _boot_on, \ @@ -539,7 +539,7 @@ FIXED_REG(2, lcd_bl_en, lcd_bl_en, NULL, 0, 0, TEGRA_GPIO_PH2, false, true, 0, 5000); -FIXED_REG(3, ts_3v3, ts_3v3, +FIXED_REG(3, avdd_ts, avdd_ts, palmas_rails(regen1), 0, 0, TEGRA_GPIO_PH5, false, true, 0, 3300); @@ -579,7 +579,7 @@ static struct platform_device *fixed_reg_devs_roth[] = { ADD_FIXED_REG(fan_5v0), ADD_FIXED_REG(vdd_hdmi_5v0), ADD_FIXED_REG(lcd_bl_en), - ADD_FIXED_REG(ts_3v3), + ADD_FIXED_REG(avdd_ts), ADD_FIXED_REG(com_3v3), ADD_FIXED_REG(sd_3v3), ADD_FIXED_REG(com_1v8), |