diff options
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 2d25fc60a0..658ef8c1f1 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); | |||
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #ifdef CONFIG_DM_GPIO | 36 | #ifdef CONFIG_DM_GPIO |
37 | #if !CONFIG_IS_ENABLED(OF_CONTROL) | ||
38 | /* Manually initialize GPIO banks when OF_CONTROL doesn't */ | ||
37 | static const struct omap_gpio_platdata omap34xx_gpio[] = { | 39 | static const struct omap_gpio_platdata omap34xx_gpio[] = { |
38 | { 0, OMAP34XX_GPIO1_BASE }, | 40 | { 0, OMAP34XX_GPIO1_BASE }, |
39 | { 1, OMAP34XX_GPIO2_BASE }, | 41 | { 1, OMAP34XX_GPIO2_BASE }, |
@@ -51,7 +53,7 @@ U_BOOT_DEVICES(omap34xx_gpios) = { | |||
51 | { "gpio_omap", &omap34xx_gpio[4] }, | 53 | { "gpio_omap", &omap34xx_gpio[4] }, |
52 | { "gpio_omap", &omap34xx_gpio[5] }, | 54 | { "gpio_omap", &omap34xx_gpio[5] }, |
53 | }; | 55 | }; |
54 | 56 | #endif | |
55 | #else | 57 | #else |
56 | 58 | ||
57 | static const struct gpio_bank gpio_bank_34xx[6] = { | 59 | static const struct gpio_bank gpio_bank_34xx[6] = { |