diff options
| author | Tom Rini <trini@ti.com> | 2014-11-24 12:01:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-24 12:01:48 -0500 |
| commit | 1739564e753bc3a8097f8937a3cbe738bdaaed5d (patch) | |
| tree | 56fe759e62f129dc055b6f6a22f299f6c8b5cdde /arch/arm/cpu/arm926ejs | |
| parent | 746667f1e56bf08d03e66a178df3c4f4f6c806e1 (diff) | |
| parent | 17b28edb37a33d0c89089faf36e4edd7084f65fa (diff) | |
| download | talos-obmc-uboot-1739564e753bc3a8097f8937a3cbe738bdaaed5d.tar.gz talos-obmc-uboot-1739564e753bc3a8097f8937a3cbe738bdaaed5d.zip | |
Merge git://git.denx.de/u-boot-dm
Conflicts:
drivers/serial/serial-uclass.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c index 7a7fd7dfb2..efb53d673f 100644 --- a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c +++ b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <dm.h> #include <asm/io.h> #include <asm/arch/at91sam9260_matrix.h> #include <asm/arch/at91_common.h> @@ -229,3 +230,16 @@ void at91_sdram_hw_init(void) at91_set_a_periph(AT91_PIO_PORTC, 30, 0); at91_set_a_periph(AT91_PIO_PORTC, 31, 0); } + +/* Platform data for the GPIOs */ +static const struct at91_port_platdata at91sam9260_plat[] = { + { ATMEL_BASE_PIOA, "PA" }, + { ATMEL_BASE_PIOB, "PB" }, + { ATMEL_BASE_PIOC, "PC" }, +}; + +U_BOOT_DEVICES(at91sam9260_gpios) = { + { "gpio_at91", &at91sam9260_plat[0] }, + { "gpio_at91", &at91sam9260_plat[1] }, + { "gpio_at91", &at91sam9260_plat[2] }, +}; |
