summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-bonaire-panel.c
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2013-10-03 14:50:05 +0530
committerTerje Bergstrom <tbergstrom@nvidia.com>2013-10-29 04:43:15 -0700
commit1a48e3a1826b6347b95aa3c1c96ab1c957a240ac (patch)
tree6d79f2f64ae627ed046c84cef5722f0533a7862c /arch/arm/mach-tegra/board-bonaire-panel.c
parent39bdca23b86d419b53f1fc4f511a2d205a251431 (diff)
ARM: tegra12: enable DT support for host1x
- make board file changes to enable DT support for host1x - rename duplicate ISP clock name to tegra_isp.0 since with DT, device name becomes isp.0 now bug 1366383 Change-Id: I3b8f08c8c52035dfcd019126774c9d1569499d8c Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/299483 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-bonaire-panel.c')
-rw-r--r--arch/arm/mach-tegra/board-bonaire-panel.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-bonaire-panel.c b/arch/arm/mach-tegra/board-bonaire-panel.c
index 712c1417fc36..4a3f04a430ed 100644
--- a/arch/arm/mach-tegra/board-bonaire-panel.c
+++ b/arch/arm/mach-tegra/board-bonaire-panel.c
@@ -61,16 +61,16 @@ struct platform_device * __init bonaire_host1x_init(void)
struct platform_device *pdev = NULL;
#ifdef CONFIG_TEGRA_GRHOST
- /* FIXME: remove this #if 0 and below line when DT will be enabled for
- * bonaire */
-#if 0
if (!of_have_populated_dt())
pdev = tegra12_register_host1x_devices();
else
pdev = to_platform_device(bus_find_device_by_name(
&platform_bus_type, NULL, "host1x"));
-#endif
- pdev = tegra12_register_host1x_devices();
+
+ if (!pdev) {
+ pr_err("host1x devices registration failed\n");
+ return NULL;
+ }
#endif
return pdev;
}