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-apalis_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-apalis_t30-panel.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-apalis_t30-panel.c | 35 |
1 files changed, 0 insertions, 35 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 = { |