Browse Source

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>
Simon Glass 9 years ago
parent
commit
3f2997a40c
1 changed files with 2 additions and 1 deletions
  1. 2 1
      arch/arm/mach-tegra/board2.c

+ 2 - 1
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