diff options
| author | claudio <claudio@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-22 09:09:53 +0000 |
|---|---|---|
| committer | claudio <claudio@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-22 09:09:53 +0000 |
| commit | 28aee0e33581d160b3c19255292090d23e8b885a (patch) | |
| tree | a708568979a0e428ab45d19526b540cd0ac628f6 /target/linux/at91 | |
| parent | a559a0ea16cb42805c6768fe4c0b887e3b9fece0 (diff) | |
[at91] tqma9263: update board definition for 3.x series and fix config choose
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31436 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/at91')
| -rw-r--r-- | target/linux/at91/9263/config-default | 3 | ||||
| -rw-r--r-- | target/linux/at91/config-default | 2 | ||||
| -rw-r--r-- | target/linux/at91/files/arch/arm/mach-at91/board-tqma9263.c | 20 |
3 files changed, 7 insertions, 18 deletions
diff --git a/target/linux/at91/9263/config-default b/target/linux/at91/9263/config-default index 70ee3adc6..15ec97c87 100644 --- a/target/linux/at91/9263/config-default +++ b/target/linux/at91/9263/config-default @@ -18,5 +18,4 @@ CONFIG_MTD_NAND_ATMEL_ECC_HW=y CONFIG_MTD_NAND_ECC=y # CONFIG_MTD_SM_COMMON is not set # CONFIG_USB_FUNCTIONFS is not set -# CONFIG_USB_G_HID is not set -# CONFIG_USB_G_WEBCAM is not set +CONFIG_AT91_EARLY_DBGU1=y diff --git a/target/linux/at91/config-default b/target/linux/at91/config-default index fe7934047..c1e754f2c 100644 --- a/target/linux/at91/config-default +++ b/target/linux/at91/config-default @@ -6,7 +6,7 @@ CONFIG_ARCH_AT91=y # CONFIG_ARCH_AT91SAM9261 is not set # CONFIG_ARCH_AT91SAM9263 is not set # CONFIG_ARCH_AT91SAM9G10 is not set -CONFIG_ARCH_AT91SAM9G20=y +# CONFIG_ARCH_AT91SAM9G20 is not set # CONFIG_ARCH_AT91SAM9G45 is not set # CONFIG_ARCH_AT91SAM9RL is not set # CONFIG_ARCH_AT91X40 is not set diff --git a/target/linux/at91/files/arch/arm/mach-at91/board-tqma9263.c b/target/linux/at91/files/arch/arm/mach-at91/board-tqma9263.c index 1f0c2fd49..cae1fe935 100644 --- a/target/linux/at91/files/arch/arm/mach-at91/board-tqma9263.c +++ b/target/linux/at91/files/arch/arm/mach-at91/board-tqma9263.c @@ -51,7 +51,7 @@ static void __init tqma9263_map_io(void) unsigned pins; /* Initialize processor: 18.432 MHz crystal */ - at91sam9263_initialize(18432000); + at91_initialize(18432000); /* DGBU on ttyS0. (Rx & Tx only) */ at91_register_uart(0, 0, 0); @@ -75,19 +75,13 @@ static void __init tqma9263_map_io(void) } -static void __init tqma9263_init_irq(void) -{ - at91sam9263_init_interrupts(NULL); -} - - /* * USB Host port */ static struct at91_usbh_data __initdata tqma9263_usbh_data = { .ports = 2, .vbus_pin = { AT91_PIN_PA24, AT91_PIN_PA21 }, - .vbus_active_high = 1, + .vbus_pin_active_low = 0, }; @@ -113,7 +107,7 @@ static struct at91_mmc_data __initdata tqma9263_mmc_data = { /* * MACB Ethernet device */ -static struct at91_eth_data __initdata tqma9263_macb_data = { +static struct macb_platform_data __initdata tqma9263_macb_data = { .phy_irq_pin = AT91_PIN_PE31, .is_rmii = 1, }; @@ -169,7 +163,6 @@ static struct atmel_nand_data __initdata tqma9263_nand_data = { .cle = 22, .rdy_pin = AT91_PIN_PD14, .enable_pin = AT91_PIN_PD15, - .partition_info = nand_partitions, }; static struct sam9_smc_config __initdata tqma9263_nand_smc_config = { @@ -193,7 +186,7 @@ static struct sam9_smc_config __initdata tqma9263_nand_smc_config = { static void __init tqma9263_add_device_nand(void) { /* configure chip-select 3 (NAND) */ - sam9_smc_configure(3, &tqma9263_nand_smc_config); + sam9_smc_configure(0, 3, &tqma9263_nand_smc_config); at91_add_device_nand(&tqma9263_nand_data); } @@ -219,11 +212,8 @@ static void __init tqma9263_board_init(void) MACHINE_START(TQMA9263, "TQ Components TQMa9263") /* Maintainer: Michael Heimpold */ - .phys_io = AT91_BASE_SYS, - .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc, - .boot_params = AT91_SDRAM_BASE + 0x100, .timer = &at91sam926x_timer, .map_io = tqma9263_map_io, - .init_irq = tqma9263_init_irq, + .init_irq = at91_init_irq_default, .init_machine = tqma9263_board_init, MACHINE_END |