projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tqma9263: update board definition for 3.x series and fix config choose
[librecmc/librecmc.git]
/
target
/
linux
/
at91
/
files
/
arch
/
arm
/
mach-at91
/
board-tqma9263.c
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 1f0c2fd492b97eb5339ff2faa9631b8336def1e4..cae1fe9359bf300fbfb085daad819ed6704fbfe6 100644
(file)
--- 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 */
unsigned pins;
/* Initialize processor: 18.432 MHz crystal */
- at91
sam9263
_initialize(18432000);
+ at91_initialize(18432000);
/* DGBU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
/* 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 },
/*
* 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
*/
/*
* 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,
};
.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,
.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 = {
};
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) */
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);
}
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 */
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,
.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
.init_machine = tqma9263_board_init,
MACHINE_END