diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-05 15:49:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-05 15:49:09 -0400 |
| commit | 2253e40caef5b45bcae2ccdb238f9cf037eefc0b (patch) | |
| tree | 2414554a9caff9998089915eefc4c4e9fce044f3 /arch/arm/mach-omap2/omap3/board.c | |
| parent | 6d93d245c148f10f15724601650fab3a665f102c (diff) | |
| parent | ea41b15617fa6869a6bb628dad8f972db4d77139 (diff) | |
Merge branch '2019-06-05-master-imports'
- More DaVinci fixes
- BuR platform fix
Diffstat (limited to 'arch/arm/mach-omap2/omap3/board.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap3/board.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index 2d25fc60a0e..658ef8c1f11 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -34,6 +34,8 @@ static void omap3_invalidate_l2_cache_secure(void); #endif #ifdef CONFIG_DM_GPIO +#if !CONFIG_IS_ENABLED(OF_CONTROL) +/* Manually initialize GPIO banks when OF_CONTROL doesn't */ static const struct omap_gpio_platdata omap34xx_gpio[] = { { 0, OMAP34XX_GPIO1_BASE }, { 1, OMAP34XX_GPIO2_BASE }, @@ -51,7 +53,7 @@ U_BOOT_DEVICES(omap34xx_gpios) = { { "gpio_omap", &omap34xx_gpio[4] }, { "gpio_omap", &omap34xx_gpio[5] }, }; - +#endif #else static const struct gpio_bank gpio_bank_34xx[6] = { |