summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-30 23:37:48 (GMT)
committerTom Warren <twarren@nvidia.com>2016-02-16 16:17:51 (GMT)
commit3f2997a40c78ad4dae48809a5c9fdfe9505787c5 (patch)
treea602d0e02fadffcb45562e2f92d03d83005e1d91 /arch/arm
parent4dd811581ab8d85a9ac01ef49d5afbb697660976 (diff)
downloadu-boot-3f2997a40c78ad4dae48809a5c9fdfe9505787c5.tar.xz
tegra: Allow driver model to be used for the PWM
We can skip this manual init when using driver model for the PWM. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/board2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 60e19c8..15b5cb6 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -134,7 +134,8 @@ int board_init(void)
pin_mux_spi();
#endif
-#ifdef CONFIG_PWM_TEGRA
+ /* Init is handled automatically in the driver-model case */
+#if defined(CONFIG_PWM_TEGRA) && !defined(CONFIG_PWM)
if (pwm_init(gd->fdt_blob))
debug("%s: Failed to init pwm\n", __func__);
#endif