[U-Boot] [PATCH 09/23] tegra: Allow driver model to be used for the PWM

[Simon Glass]

We can skip this manual init when using driver model for the PWM.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 arch/arm/mach-tegra/board2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index a650abd..6e36dce 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
-- 
2.6.0.rc2.230.g3dd15c0