From: Simon Glass <sjg@chromium.org>
Date: Sat, 30 Jan 2016 23:37:48 +0000 (-0700)
Subject: tegra: Allow driver model to be used for the PWM
X-Git-Tag: v2016.03-rc3~86^2~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3f2997a40c78ad4dae48809a5c9fdfe9505787c5;p=oweals%2Fu-boot.git

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>
---

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 60e19c8387..15b5cb6a0d 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