diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-30 16:37:48 -0700 |
|---|---|---|
| committer | Tom Warren <twarren@nvidia.com> | 2016-02-16 09:17:51 -0700 |
| commit | 3f2997a40c78ad4dae48809a5c9fdfe9505787c5 (patch) | |
| tree | a602d0e02fadffcb45562e2f92d03d83005e1d91 /arch/arm/mach-tegra | |
| parent | 4dd811581ab8d85a9ac01ef49d5afbb697660976 (diff) | |
| download | talos-obmc-uboot-3f2997a40c78ad4dae48809a5c9fdfe9505787c5.tar.gz talos-obmc-uboot-3f2997a40c78ad4dae48809a5c9fdfe9505787c5.zip | |
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/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/board2.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 |
