diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-31 19:55:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-12 20:48:06 -0400 |
| commit | 1480fdf8a6dad28de70ade72974db436f7967525 (patch) | |
| tree | f6f6a11001745a64a5b09a9148897f08fc320ebc /arch/arm/cpu/armv7 | |
| parent | 8883ddafdeb398443870b7996a22cb65fd6d4bb4 (diff) | |
| download | talos-obmc-uboot-1480fdf8a6dad28de70ade72974db436f7967525.tar.gz talos-obmc-uboot-1480fdf8a6dad28de70ade72974db436f7967525.zip | |
am33xx: Update DT files, add am335x_gp_evm_config target
- Re-sync DT files for am33xx with Linux Kernel v4.1
- Include DT file now for the "AM335x GP EVM" and build target for it,
via device tree and DM.
- We only need to provide platform data for UART when OF_CONTROL isn't
also enabled really. We can just push GPIO to coming from DT
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/cpu/armv7')
| -rw-r--r-- | arch/arm/cpu/armv7/am33xx/board.c | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index 377c611eb6..a1cb4ecf57 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -38,45 +38,22 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_DM_GPIO -static const struct omap_gpio_platdata am33xx_gpio[] = { - { 0, AM33XX_GPIO0_BASE, METHOD_GPIO_24XX }, - { 1, AM33XX_GPIO1_BASE, METHOD_GPIO_24XX }, - { 2, AM33XX_GPIO2_BASE, METHOD_GPIO_24XX }, - { 3, AM33XX_GPIO3_BASE, METHOD_GPIO_24XX }, -#ifdef CONFIG_AM43XX - { 4, AM33XX_GPIO4_BASE, METHOD_GPIO_24XX }, - { 5, AM33XX_GPIO5_BASE, METHOD_GPIO_24XX }, -#endif -}; - -U_BOOT_DEVICES(am33xx_gpios) = { - { "gpio_omap", &am33xx_gpio[0] }, - { "gpio_omap", &am33xx_gpio[1] }, - { "gpio_omap", &am33xx_gpio[2] }, - { "gpio_omap", &am33xx_gpio[3] }, -#ifdef CONFIG_AM43XX - { "gpio_omap", &am33xx_gpio[4] }, - { "gpio_omap", &am33xx_gpio[5] }, -#endif -}; - -# ifndef CONFIG_OF_CONTROL +#if defined(CONFIG_DM_SERIAL) && !defined(CONFIG_OF_CONTROL) /* * TODO(sjg@chromium.org): When we can move SPL serial to DM, we can remove * the CONFIGs. At the same time, we should move this to the board files. */ static const struct ns16550_platdata am33xx_serial[] = { { CONFIG_SYS_NS16550_COM1, 2, CONFIG_SYS_NS16550_CLK }, -# ifdef CONFIG_SYS_NS16550_COM2 +# ifdef CONFIG_SYS_NS16550_COM2 { CONFIG_SYS_NS16550_COM2, 2, CONFIG_SYS_NS16550_CLK }, -# ifdef CONFIG_SYS_NS16550_COM3 +# ifdef CONFIG_SYS_NS16550_COM3 { CONFIG_SYS_NS16550_COM3, 2, CONFIG_SYS_NS16550_CLK }, { CONFIG_SYS_NS16550_COM4, 2, CONFIG_SYS_NS16550_CLK }, { CONFIG_SYS_NS16550_COM5, 2, CONFIG_SYS_NS16550_CLK }, { CONFIG_SYS_NS16550_COM6, 2, CONFIG_SYS_NS16550_CLK }, -# endif # endif +# endif }; U_BOOT_DEVICES(am33xx_uarts) = { @@ -91,10 +68,10 @@ U_BOOT_DEVICES(am33xx_uarts) = { # endif # endif }; -# endif +#endif -#else +#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 }, @@ -107,7 +84,6 @@ static const struct gpio_bank gpio_bank_am33xx[] = { }; const struct gpio_bank *const omap_gpio_bank = gpio_bank_am33xx; - #endif #if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD) |
