diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2013-11-20 12:54:58 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2013-11-20 12:54:58 +0100 |
| commit | e514ae82078b5efc565f143bee1e31836a4142c5 (patch) | |
| tree | b7bc687ded0aeab78a52cc5261a1089062537529 /arch/arm/mach-tegra/board-colibri_t30-panel.c | |
| parent | eaa8626901b2d33824895e2ad6d926dedbabe2f7 (diff) | |
colibri_t30/apalis_t30: remove vdd_hdmi_con regulator
Remove vdd_hdmi_con regulator from dc1 since we don't have a dedicated
regulator for this connector on our baseboards.
Diffstat (limited to 'arch/arm/mach-tegra/board-colibri_t30-panel.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t30-panel.c | 35 |
1 files changed, 0 insertions, 35 deletions
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 = { |