summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board-apalis_t30-panel.c35
-rw-r--r--arch/arm/mach-tegra/board-apalis_t30-power.c1
-rw-r--r--arch/arm/mach-tegra/board-colibri_t30-panel.c35
-rw-r--r--arch/arm/mach-tegra/board-colibri_t30-power.c2
4 files changed, 0 insertions, 73 deletions
diff --git a/arch/arm/mach-tegra/board-apalis_t30-panel.c b/arch/arm/mach-tegra/board-apalis_t30-panel.c
index aac0db6f6a05..cb76ca99c083 100644
--- a/arch/arm/mach-tegra/board-apalis_t30-panel.c
+++ b/arch/arm/mach-tegra/board-apalis_t30-panel.c
@@ -50,7 +50,6 @@
static struct regulator *apalis_t30_hdmi_pll = NULL;
static struct regulator *apalis_t30_hdmi_reg = NULL;
-static struct regulator *apalis_t30_hdmi_vddio = NULL;
static int apalis_t30_backlight_init(struct device *dev) {
int ret;
@@ -117,37 +116,6 @@ static int apalis_t30_panel_disable(void)
}
#ifdef CONFIG_TEGRA_DC
-static int apalis_t30_hdmi_vddio_enable(void)
-{
- int ret;
- if (!apalis_t30_hdmi_vddio) {
- apalis_t30_hdmi_vddio = regulator_get(NULL, "vdd_hdmi_con");
- if (IS_ERR_OR_NULL(apalis_t30_hdmi_vddio)) {
- ret = PTR_ERR(apalis_t30_hdmi_vddio);
- pr_err("hdmi: couldn't get regulator vdd_hdmi_con\n");
- apalis_t30_hdmi_vddio = NULL;
- return ret;
- }
- }
- ret = regulator_enable(apalis_t30_hdmi_vddio);
- if (ret < 0) {
- pr_err("hdmi: couldn't enable regulator vdd_hdmi_con\n");
- regulator_put(apalis_t30_hdmi_vddio);
- apalis_t30_hdmi_vddio = NULL;
- return ret;
- }
- return ret;
-}
-
-static int apalis_t30_hdmi_vddio_disable(void)
-{
- if (apalis_t30_hdmi_vddio) {
- regulator_disable(apalis_t30_hdmi_vddio);
- regulator_put(apalis_t30_hdmi_vddio);
- apalis_t30_hdmi_vddio = NULL;
- }
- return 0;
-}
static int apalis_t30_hdmi_enable(void)
{
@@ -568,9 +536,6 @@ static struct tegra_dc_out apalis_t30_disp2_out = {
.enable = apalis_t30_hdmi_enable,
.disable = apalis_t30_hdmi_disable,
-
- .postsuspend = apalis_t30_hdmi_vddio_disable,
- .hotplug_init = apalis_t30_hdmi_vddio_enable,
};
static struct tegra_dc_platform_data apalis_t30_disp1_pdata = {
diff --git a/arch/arm/mach-tegra/board-apalis_t30-power.c b/arch/arm/mach-tegra/board-apalis_t30-power.c
index 043ccd96fcad..7b2744a0fe8b 100644
--- a/arch/arm/mach-tegra/board-apalis_t30-power.c
+++ b/arch/arm/mach-tegra/board-apalis_t30-power.c
@@ -343,7 +343,6 @@ static struct regulator_consumer_supply fixed_reg_en_hdmi_supply[] = {
REGULATOR_SUPPLY("avdd_hdmi", NULL),
REGULATOR_SUPPLY("avdd_hdmi_pll", NULL),
// REGULATOR_SUPPLY("vdd_3v3_hdmi_cec", NULL),
-// REGULATOR_SUPPLY("vdd_hdmi_con", NULL),
};
//EN_VDD_CORE PMIC GPIO2
diff --git a/arch/arm/mach-tegra/board-colibri_t30-panel.c b/arch/arm/mach-tegra/board-colibri_t30-panel.c
index cc5759683d70..bbbbbe3dddd3 100644
--- a/arch/arm/mach-tegra/board-colibri_t30-panel.c
+++ b/arch/arm/mach-tegra/board-colibri_t30-panel.c
@@ -52,7 +52,6 @@
static struct regulator *colibri_t30_hdmi_pll = NULL;
static struct regulator *colibri_t30_hdmi_reg = NULL;
-static struct regulator *colibri_t30_hdmi_vddio = NULL;
#ifndef COLIBRI_T30_VI
static int colibri_t30_backlight_init(struct device *dev) {
@@ -121,37 +120,6 @@ static int colibri_t30_panel_disable(void)
}
#ifdef CONFIG_TEGRA_DC
-static int colibri_t30_hdmi_vddio_enable(void)
-{
- int ret;
- if (!colibri_t30_hdmi_vddio) {
- colibri_t30_hdmi_vddio = regulator_get(NULL, "vdd_hdmi_con");
- if (IS_ERR_OR_NULL(colibri_t30_hdmi_vddio)) {
- ret = PTR_ERR(colibri_t30_hdmi_vddio);
- pr_err("hdmi: couldn't get regulator vdd_hdmi_con\n");
- colibri_t30_hdmi_vddio = NULL;
- return ret;
- }
- }
- ret = regulator_enable(colibri_t30_hdmi_vddio);
- if (ret < 0) {
- pr_err("hdmi: couldn't enable regulator vdd_hdmi_con\n");
- regulator_put(colibri_t30_hdmi_vddio);
- colibri_t30_hdmi_vddio = NULL;
- return ret;
- }
- return ret;
-}
-
-static int colibri_t30_hdmi_vddio_disable(void)
-{
- if (colibri_t30_hdmi_vddio) {
- regulator_disable(colibri_t30_hdmi_vddio);
- regulator_put(colibri_t30_hdmi_vddio);
- colibri_t30_hdmi_vddio = NULL;
- }
- return 0;
-}
static int colibri_t30_hdmi_enable(void)
{
@@ -569,9 +537,6 @@ static struct tegra_dc_out colibri_t30_disp2_out = {
.enable = colibri_t30_hdmi_enable,
.disable = colibri_t30_hdmi_disable,
-
- .postsuspend = colibri_t30_hdmi_vddio_disable,
- .hotplug_init = colibri_t30_hdmi_vddio_enable,
};
static struct tegra_dc_platform_data colibri_t30_disp1_pdata = {
diff --git a/arch/arm/mach-tegra/board-colibri_t30-power.c b/arch/arm/mach-tegra/board-colibri_t30-power.c
index c25e4cac01d8..9a76b110cbf6 100644
--- a/arch/arm/mach-tegra/board-colibri_t30-power.c
+++ b/arch/arm/mach-tegra/board-colibri_t30-power.c
@@ -39,7 +39,6 @@
#include <mach/iomap.h>
#include <mach/irqs.h>
#include <mach/pinmux.h>
-//#include <mach/suspend.h>
#include "board-colibri_t30.h"
#include "board.h"
@@ -341,7 +340,6 @@ static struct regulator_consumer_supply fixed_reg_en_hdmi_supply[] = {
REGULATOR_SUPPLY("avdd_hdmi", NULL),
REGULATOR_SUPPLY("avdd_hdmi_pll", NULL),
// REGULATOR_SUPPLY("vdd_3v3_hdmi_cec", NULL),
-// REGULATOR_SUPPLY("vdd_hdmi_con", NULL),
};
//EN_VDD_CORE PMIC GPIO2