diff options
| author | Animesh Kishore <ankishore@nvidia.com> | 2013-07-03 05:21:36 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:29:48 -0700 |
| commit | ec0a9a392eae0458d44a24fa534a1c6c3f059ab9 (patch) | |
| tree | 2ebd1872cf8853793de6fa16c2f4f74d9706acba /arch/arm/mach-tegra/panel-s-wqxga-10-1.c | |
| parent | 039cda7ca76136caf4b654bf518c977db8daf432 (diff) | |
arm: tegra: ardbeg: Enable regulator and gpios for sharp 25x16
Bug 1283850
Change-Id: Id727c5c59de8d498c45a1632dbd2797af5ecbb85
Signed-off-by: Animesh Kishore <ankishore@nvidia.com>
Reviewed-on: http://git-master/r/244741
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/panel-s-wqxga-10-1.c')
| -rw-r--r-- | arch/arm/mach-tegra/panel-s-wqxga-10-1.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/panel-s-wqxga-10-1.c b/arch/arm/mach-tegra/panel-s-wqxga-10-1.c index 85c37ed32dfd..fe79f8dc91c3 100644 --- a/arch/arm/mach-tegra/panel-s-wqxga-10-1.c +++ b/arch/arm/mach-tegra/panel-s-wqxga-10-1.c @@ -252,18 +252,19 @@ static int dsi_s_wqxga_10_1_enable(struct device *dev) { int err = 0; - if (machine_is_dalmore()) - err = dalmore_dsi_regulator_get(dev); - else if (machine_is_macallan()) + if (machine_is_macallan()) err = macallan_dsi_regulator_get(dev); + else + err = dalmore_dsi_regulator_get(dev); if (err < 0) { pr_err("dsi regulator get failed\n"); goto fail; } - if (machine_is_dalmore()) - err = dalmore_dsi_gpio_get(); - else if (machine_is_macallan()) + + if (machine_is_macallan()) err = macallan_dsi_gpio_get(); + else + err = dalmore_dsi_gpio_get(); if (err < 0) { pr_err("dsi gpio request failed\n"); goto fail; |