diff options
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r-- | arch/arm/cpu/armv7/am33xx/board.c | 12 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap3/board.c | 24 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap4/hwinit.c | 12 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap5/hwinit.c | 18 |
4 files changed, 34 insertions, 32 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index a1cb4ec..bd14326 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -73,13 +73,13 @@ U_BOOT_DEVICES(am33xx_uarts) = { #ifndef CONFIG_DM_GPIO static const struct gpio_bank gpio_bank_am33xx[] = { - { (void *)AM33XX_GPIO0_BASE, METHOD_GPIO_24XX }, - { (void *)AM33XX_GPIO1_BASE, METHOD_GPIO_24XX }, - { (void *)AM33XX_GPIO2_BASE, METHOD_GPIO_24XX }, - { (void *)AM33XX_GPIO3_BASE, METHOD_GPIO_24XX }, + { (void *)AM33XX_GPIO0_BASE }, + { (void *)AM33XX_GPIO1_BASE }, + { (void *)AM33XX_GPIO2_BASE }, + { (void *)AM33XX_GPIO3_BASE }, #ifdef CONFIG_AM43XX - { (void *)AM33XX_GPIO4_BASE, METHOD_GPIO_24XX }, - { (void *)AM33XX_GPIO5_BASE, METHOD_GPIO_24XX }, + { (void *)AM33XX_GPIO4_BASE }, + { (void *)AM33XX_GPIO5_BASE }, #endif }; diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index 17cb5b7..8252b32 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -38,12 +38,12 @@ static void omap3_invalidate_l2_cache_secure(void); #ifdef CONFIG_DM_GPIO static const struct omap_gpio_platdata omap34xx_gpio[] = { - { 0, OMAP34XX_GPIO1_BASE, METHOD_GPIO_24XX }, - { 1, OMAP34XX_GPIO2_BASE, METHOD_GPIO_24XX }, - { 2, OMAP34XX_GPIO3_BASE, METHOD_GPIO_24XX }, - { 3, OMAP34XX_GPIO4_BASE, METHOD_GPIO_24XX }, - { 4, OMAP34XX_GPIO5_BASE, METHOD_GPIO_24XX }, - { 5, OMAP34XX_GPIO6_BASE, METHOD_GPIO_24XX }, + { 0, OMAP34XX_GPIO1_BASE }, + { 1, OMAP34XX_GPIO2_BASE }, + { 2, OMAP34XX_GPIO3_BASE }, + { 3, OMAP34XX_GPIO4_BASE }, + { 4, OMAP34XX_GPIO5_BASE }, + { 5, OMAP34XX_GPIO6_BASE }, }; U_BOOT_DEVICES(am33xx_gpios) = { @@ -58,12 +58,12 @@ U_BOOT_DEVICES(am33xx_gpios) = { #else static const struct gpio_bank gpio_bank_34xx[6] = { - { (void *)OMAP34XX_GPIO1_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP34XX_GPIO2_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP34XX_GPIO3_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP34XX_GPIO4_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP34XX_GPIO5_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP34XX_GPIO6_BASE, METHOD_GPIO_24XX }, + { (void *)OMAP34XX_GPIO1_BASE }, + { (void *)OMAP34XX_GPIO2_BASE }, + { (void *)OMAP34XX_GPIO3_BASE }, + { (void *)OMAP34XX_GPIO4_BASE }, + { (void *)OMAP34XX_GPIO5_BASE }, + { (void *)OMAP34XX_GPIO6_BASE }, }; const struct gpio_bank *const omap_gpio_bank = gpio_bank_34xx; diff --git a/arch/arm/cpu/armv7/omap4/hwinit.c b/arch/arm/cpu/armv7/omap4/hwinit.c index 9792761..a68947f 100644 --- a/arch/arm/cpu/armv7/omap4/hwinit.c +++ b/arch/arm/cpu/armv7/omap4/hwinit.c @@ -25,12 +25,12 @@ DECLARE_GLOBAL_DATA_PTR; u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV; static const struct gpio_bank gpio_bank_44xx[6] = { - { (void *)OMAP44XX_GPIO1_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP44XX_GPIO2_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP44XX_GPIO3_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP44XX_GPIO4_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP44XX_GPIO5_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP44XX_GPIO6_BASE, METHOD_GPIO_24XX }, + { (void *)OMAP44XX_GPIO1_BASE }, + { (void *)OMAP44XX_GPIO2_BASE }, + { (void *)OMAP44XX_GPIO3_BASE }, + { (void *)OMAP44XX_GPIO4_BASE }, + { (void *)OMAP44XX_GPIO5_BASE }, + { (void *)OMAP44XX_GPIO6_BASE }, }; const struct gpio_bank *const omap_gpio_bank = gpio_bank_44xx; diff --git a/arch/arm/cpu/armv7/omap5/hwinit.c b/arch/arm/cpu/armv7/omap5/hwinit.c index 22e0829..3699050 100644 --- a/arch/arm/cpu/armv7/omap5/hwinit.c +++ b/arch/arm/cpu/armv7/omap5/hwinit.c @@ -27,18 +27,20 @@ DECLARE_GLOBAL_DATA_PTR; u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV; +#ifndef CONFIG_DM_GPIO static struct gpio_bank gpio_bank_54xx[8] = { - { (void *)OMAP54XX_GPIO1_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP54XX_GPIO2_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP54XX_GPIO3_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP54XX_GPIO4_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP54XX_GPIO5_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP54XX_GPIO6_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP54XX_GPIO7_BASE, METHOD_GPIO_24XX }, - { (void *)OMAP54XX_GPIO8_BASE, METHOD_GPIO_24XX }, + { (void *)OMAP54XX_GPIO1_BASE }, + { (void *)OMAP54XX_GPIO2_BASE }, + { (void *)OMAP54XX_GPIO3_BASE }, + { (void *)OMAP54XX_GPIO4_BASE }, + { (void *)OMAP54XX_GPIO5_BASE }, + { (void *)OMAP54XX_GPIO6_BASE }, + { (void *)OMAP54XX_GPIO7_BASE }, + { (void *)OMAP54XX_GPIO8_BASE }, }; const struct gpio_bank *const omap_gpio_bank = gpio_bank_54xx; +#endif void do_set_mux32(u32 base, struct pad_conf_entry const *array, int size) { |