From 3f2997a40c78ad4dae48809a5c9fdfe9505787c5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 30 Jan 2016 16:37:48 -0700 Subject: 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 Signed-off-by: Tom Warren --- arch/arm/mach-tegra/board2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-tegra/board2.c') diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 60e19c83878..15b5cb6a0de 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 -- cgit v1.2.3