ARM: Tegra: Pluto: Roth: Remove Touch Regulator References
Matt Wagner [Wed, 7 Nov 2012 19:16:34 +0000 (11:16 -0800)]
Touch regulators are now handled in the touch driver.

Bug 1171845

Change-Id: Ie4cdb9b6f00dd80ad980e1feb259122100f0d6fc
Signed-off-by: Matt Wagner <mwagner@nvidia.com>
Reviewed-on: http://git-master/r/162084
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>

arch/arm/mach-tegra/board-pluto-panel.c
arch/arm/mach-tegra/board-pluto-power.c
arch/arm/mach-tegra/board-roth-panel.c

index cc87705..c242d21 100644 (file)
@@ -94,9 +94,6 @@ static struct regulator *vdd_sys_bl_3v7;
 /* for PANEL_5_LG_720_1280 and PANEL_4_7_JDI_720_1280 */
 static struct regulator *avdd_lcd_3v0_2v8;
 
-/* for PANEL_5_LG_720_1280 and PANEL_5_SHARP_1080p */
-static struct regulator *avdd_ts_3v0;
-
 /* hdmi pins for hotplug */
 #define pluto_hdmi_hpd         TEGRA_GPIO_PN7
 
@@ -487,16 +484,6 @@ static int pluto_dsi_regulator_get(struct device *dev)
        if (dsi_reg_requested)
                return 0;
 
-#if PANEL_5_LG_720_1280 || PANEL_5_SHARP_1080p
-       avdd_ts_3v0 = regulator_get(dev, "avdd_ts_3v0");
-       if (IS_ERR_OR_NULL(avdd_ts_3v0)) {
-               pr_err("avdd_ts_3v0 regulator get failed\n");
-               err = PTR_ERR(avdd_ts_3v0);
-               avdd_ts_3v0 = NULL;
-               goto fail;
-       }
-#endif
-
 #if PANEL_5_LG_720_1280 || PANEL_4_7_JDI_720_1280
        avdd_lcd_3v0_2v8 = regulator_get(dev, "avdd_lcd");
        if (IS_ERR_OR_NULL(avdd_lcd_3v0_2v8)) {
@@ -597,15 +584,6 @@ static int pluto_dsi_panel_enable(struct device *dev)
        }
        usleep_range(3000, 5000);
 
-       if (avdd_ts_3v0) {
-               err = regulator_enable(avdd_ts_3v0);
-               if (err < 0) {
-                       pr_err("avdd_ts_3v0 regulator enable failed\n");
-                       goto fail;
-               }
-       }
-       usleep_range(3000, 5000);
-
        if (vdd_lcd_s_1v8) {
                err = regulator_enable(vdd_lcd_s_1v8);
                if (err < 0) {
@@ -657,9 +635,6 @@ static int pluto_dsi_panel_disable(void)
        if (vdd_lcd_s_1v8)
                regulator_disable(vdd_lcd_s_1v8);
 
-       if (avdd_ts_3v0)
-               regulator_disable(avdd_ts_3v0);
-
        if (avdd_lcd_3v0_2v8)
                regulator_disable(avdd_lcd_3v0_2v8);
 
index 3c141ef..f513eba 100644 (file)
@@ -161,7 +161,6 @@ static struct regulator_consumer_supply palmas_ldo5_supply[] = {
 static struct regulator_consumer_supply palmas_ldo6_supply[] = {
        REGULATOR_SUPPLY("vdd_temp", NULL),
        REGULATOR_SUPPLY("vdd_mb", NULL),
-       REGULATOR_SUPPLY("avdd_ts_3v0", NULL),
        REGULATOR_SUPPLY("avdd_backlight_3v0", "1-004d"),
        REGULATOR_SUPPLY("vdd_nfc_3v0", NULL),
        REGULATOR_SUPPLY("vdd_irled", NULL),
index 821eb32..f18d316 100644 (file)
@@ -74,7 +74,6 @@ static bool gpio_requested;
 static struct regulator *vdd_lcd_s_1v8;
 static struct regulator *vdd_sys_bl_3v7;
 static struct regulator *avdd_lcd_3v0_2v8;
-static struct regulator *avdd_ts_3v0;
 
 static struct regulator *roth_hdmi_vddio;
 
@@ -258,13 +257,6 @@ static int roth_dsi_regulator_get(void)
        if (reg_requested)
                return 0;
 
-       avdd_ts_3v0 = regulator_get(NULL, "vdd_ts_3v3");
-       if (IS_ERR_OR_NULL(avdd_ts_3v0)) {
-               pr_err("avdd_ts_3v0 regulator get failed\n");
-               err = PTR_ERR(avdd_ts_3v0);
-               avdd_ts_3v0 = NULL;
-               goto fail;
-       }
        avdd_lcd_3v0_2v8 = regulator_get(NULL, "avdd_lcd");
        if (IS_ERR_OR_NULL(avdd_lcd_3v0_2v8)) {
                pr_err("avdd_lcd regulator get failed\n");
@@ -350,15 +342,6 @@ static int roth_dsi_panel_enable(struct device *dev)
        }
        usleep_range(3000, 5000);
 
-       if (avdd_ts_3v0) {
-               err = regulator_enable(avdd_ts_3v0);
-               if (err < 0) {
-                       pr_err("avdd_ts_3v0 regulator enable failed\n");
-                       goto fail;
-               }
-       }
-       usleep_range(3000, 5000);
-
        if (vdd_lcd_s_1v8) {
                err = regulator_enable(vdd_lcd_s_1v8);
                if (err < 0) {
@@ -402,9 +385,6 @@ static int roth_dsi_panel_disable(void)
        if (vdd_lcd_s_1v8)
                regulator_disable(vdd_lcd_s_1v8);
 
-       if (avdd_ts_3v0)
-               regulator_disable(avdd_ts_3v0);
-
        if (avdd_lcd_3v0_2v8)
                regulator_disable(avdd_lcd_3v0_2v8);