summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boards/freescale-mx51-pdk/board.c2
-rw-r--r--arch/arm/boards/karo-tx51/tx51.c2
-rw-r--r--arch/arm/boards/tny-a926x/init.c38
-rw-r--r--arch/arm/configs/tny_a9260_defconfig2
-rw-r--r--arch/arm/configs/tny_a9263_defconfig2
-rw-r--r--arch/arm/configs/tny_a9g20_defconfig2
-rw-r--r--arch/arm/mach-at91/Kconfig10
-rw-r--r--arch/arm/mach-at91/at91rm9200_devices.c13
-rw-r--r--arch/arm/mach-at91/at91sam9260_devices.c19
-rw-r--r--arch/arm/mach-at91/at91sam9261_devices.c10
-rw-r--r--arch/arm/mach-at91/at91sam9263_devices.c10
-rw-r--r--arch/arm/mach-at91/at91sam9g45_devices.c13
12 files changed, 39 insertions, 84 deletions
diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c
index 937fcfa3ad..74b32a99aa 100644
--- a/arch/arm/boards/freescale-mx51-pdk/board.c
+++ b/arch/arm/boards/freescale-mx51-pdk/board.c
@@ -66,7 +66,7 @@ static iomux_v3_cfg_t f3s_pads[] = {
MX51_PAD_NANDF_D11__FEC_RX_DV,
MX51_PAD_NANDF_D9__FEC_RDATA0,
MX51_PAD_NANDF_D8__FEC_TDATA0,
- MX51_PAD_CSPI1_SS0__GPIO4_24,
+ MX51_PAD_CSPI1_SS0__ECSPI1_SS0,
MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI,
MX51_PAD_CSPI1_MISO__ECSPI1_MISO,
MX51_PAD_CSPI1_RDY__ECSPI1_RDY,
diff --git a/arch/arm/boards/karo-tx51/tx51.c b/arch/arm/boards/karo-tx51/tx51.c
index 38aefed056..096683a1ad 100644
--- a/arch/arm/boards/karo-tx51/tx51.c
+++ b/arch/arm/boards/karo-tx51/tx51.c
@@ -210,7 +210,7 @@ static inline void tx51_fec_init(void)
gpio_set_value(TX51_FEC_PHY_PWR, 1);
/*
- * Wait some time to let the phy activate the internal regulator
+ * Wait some time to let the phy activate the internal regulator
*/
mdelay(10);
diff --git a/arch/arm/boards/tny-a926x/init.c b/arch/arm/boards/tny-a926x/init.c
index 79fc40feed..2cb7da7cff 100644
--- a/arch/arm/boards/tny-a926x/init.c
+++ b/arch/arm/boards/tny-a926x/init.c
@@ -121,42 +121,10 @@ static struct at91_ether_platform_data macb_pdata = {
.phy_addr = 0,
};
-static void tny_a9260_phy_reset(void)
-{
- unsigned long rstc;
- struct clk *clk = clk_get(NULL, "macb_clk");
-
- clk_enable(clk);
-
- at91_set_gpio_input(AT91_PIN_PA14, 0);
- at91_set_gpio_input(AT91_PIN_PA15, 0);
- at91_set_gpio_input(AT91_PIN_PA17, 0);
- at91_set_gpio_input(AT91_PIN_PA25, 0);
- at91_set_gpio_input(AT91_PIN_PA26, 0);
- at91_set_gpio_input(AT91_PIN_PA28, 0);
-
- rstc = at91_sys_read(AT91_RSTC_MR) & AT91_RSTC_ERSTL;
-
- /* Need to reset PHY -> 500ms reset */
- at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
- (AT91_RSTC_ERSTL & (0x0d << 8)) |
- AT91_RSTC_URSTEN);
-
- at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST);
-
- /* Wait for end hardware reset */
- while (!(at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_NRSTL));
-
- /* Restore NRST value */
- at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
- (rstc) |
- AT91_RSTC_URSTEN);
-}
-
static void __init ek_add_device_macb(void)
{
- tny_a9260_phy_reset();
- at91_add_device_eth(0, &macb_pdata);
+ if (IS_ENABLED(CONFIG_CALAO_MOB_TNY_MD2))
+ at91_add_device_eth(0, &macb_pdata);
}
#else
static void __init ek_add_device_macb(void) {}
@@ -240,6 +208,8 @@ device_initcall(tny_a9260_devices_init);
static int tny_a9260_console_init(void)
{
at91_register_uart(0, 0);
+ if (IS_ENABLED(CONFIG_CALAO_MOB_TNY_MD2))
+ at91_register_uart(2, ATMEL_UART_CTS | ATMEL_UART_RTS);
return 0;
}
console_initcall(tny_a9260_console_init);
diff --git a/arch/arm/configs/tny_a9260_defconfig b/arch/arm/configs/tny_a9260_defconfig
index adbd92d1b8..83293fb67c 100644
--- a/arch/arm/configs/tny_a9260_defconfig
+++ b/arch/arm/configs/tny_a9260_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARCH_AT91SAM9260=y
CONFIG_MACH_TNY_A9260=y
+CONFIG_CALAO_MOB_TNY_MD2=y
CONFIG_AEABI=y
# CONFIG_CMD_ARM_CPUINFO is not set
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
@@ -33,7 +34,6 @@ CONFIG_CMD_LOADB=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_MD5SUM=y
CONFIG_CMD_SHA1SUM=y
-CONFIG_CMD_SHA256SUM=y
CONFIG_CMD_MTEST=y
CONFIG_CMD_MTEST_ALTERNATIVE=y
CONFIG_CMD_FLASH=y
diff --git a/arch/arm/configs/tny_a9263_defconfig b/arch/arm/configs/tny_a9263_defconfig
index 0e4ef76530..dd68ba4d6d 100644
--- a/arch/arm/configs/tny_a9263_defconfig
+++ b/arch/arm/configs/tny_a9263_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARCH_AT91SAM9263=y
CONFIG_MACH_TNY_A9263=y
+CONFIG_CALAO_MOB_TNY_MD2=y
CONFIG_AEABI=y
# CONFIG_CMD_ARM_CPUINFO is not set
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
@@ -33,7 +34,6 @@ CONFIG_CMD_LOADB=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_MD5SUM=y
CONFIG_CMD_SHA1SUM=y
-CONFIG_CMD_SHA256SUM=y
CONFIG_CMD_MTEST=y
CONFIG_CMD_MTEST_ALTERNATIVE=y
CONFIG_CMD_FLASH=y
diff --git a/arch/arm/configs/tny_a9g20_defconfig b/arch/arm/configs/tny_a9g20_defconfig
index d1948e4243..62250cb5a4 100644
--- a/arch/arm/configs/tny_a9g20_defconfig
+++ b/arch/arm/configs/tny_a9g20_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARCH_AT91SAM9G20=y
CONFIG_MACH_TNY_A9G20=y
+CONFIG_CALAO_MOB_TNY_MD2=y
CONFIG_AEABI=y
# CONFIG_CMD_ARM_CPUINFO is not set
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
@@ -33,7 +34,6 @@ CONFIG_CMD_LOADB=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_MD5SUM=y
CONFIG_CMD_SHA1SUM=y
-CONFIG_CMD_SHA256SUM=y
CONFIG_CMD_MTEST=y
CONFIG_CMD_MTEST_ALTERNATIVE=y
CONFIG_CMD_FLASH=y
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 989d3d82e4..1bec3e5d0a 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -104,6 +104,9 @@ config ARCH_BAREBOX_MAX_BARE_INIT_SIZE
config SUPPORT_CALAO_DAB_MMX
bool
+config SUPPORT_CALAO_MOB_TNY_MD2
+ bool
+
# ----------------------------------------------------------
if ARCH_AT91RM9200
@@ -138,6 +141,7 @@ config MACH_AT91SAM9260EK
config MACH_TNY_A9260
bool "CALAO TNY-A9260"
+ select SUPPORT_CALAO_MOB_TNY_MD2
help
Select this if you are using a Calao Systems TNY-A9260.
<http://www.calao-systems.com>
@@ -214,6 +218,7 @@ config MACH_AT91SAM9G20EK
that embeds only one SD/MMC slot.
config MACH_TNY_A9G20
+ select SUPPORT_CALAO_MOB_TNY_MD2
bool "CALAO TNY-A9G20"
help
Select this if you are using a Calao Systems TNY-A9G20.
@@ -264,6 +269,7 @@ config MACH_PM9263
config MACH_TNY_A9263
bool "CALAO TNY-A9263"
+ select SUPPORT_CALAO_MOB_TNY_MD2
help
Select this if you are using a Calao Systems TNY-A9263.
<http://www.calao-systems.com>
@@ -362,4 +368,8 @@ config CALAO_DAB_MMX
bool "DAB MMX Daughter Board support"
depends on SUPPORT_CALAO_DAB_MMX
+config CALAO_MOB_TNY_MD2
+ bool "MOB TNY MD2 Motherboard Daughter Board support"
+ depends on SUPPORT_CALAO_MOB_TNY_MD2
+
endif
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index 9eb27f05b2..a165cc9459 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -273,27 +273,22 @@ struct device_d * __init at91_register_uart(unsigned id, unsigned pins)
case 0: /* DBGU */
configure_dbgu_pins();
start = AT91_BASE_SYS + AT91_DBGU;
- id = 0;
break;
- case AT91RM9200_ID_US0:
+ case 1:
configure_usart0_pins(pins);
start = AT91RM9200_BASE_US0;
- id = 1;
break;
- case AT91RM9200_ID_US1:
+ case 2:
configure_usart1_pins(pins);
start = AT91RM9200_BASE_US1;
- id = 2;
break;
- case AT91RM9200_ID_US2:
+ case 3:
configure_usart2_pins(pins);
start = AT91RM9200_BASE_US2;
- id = 3;
break;
- case AT91RM9200_ID_US3:
+ case 4:
configure_usart3_pins(pins);
start = AT91RM9200_BASE_US3;
- id = 4;
break;
default:
return NULL;
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index cce99adc97..33f070a91e 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -290,37 +290,30 @@ struct device_d * __init at91_register_uart(unsigned id, unsigned pins)
case 0: /* DBGU */
configure_dbgu_pins();
start = AT91_BASE_SYS + AT91_DBGU;
- id = 0;
break;
- case AT91SAM9260_ID_US0:
+ case 1:
configure_usart0_pins(pins);
start = AT91SAM9260_BASE_US0;
- id = 1;
break;
- case AT91SAM9260_ID_US1:
+ case 2:
configure_usart1_pins(pins);
start = AT91SAM9260_BASE_US1;
- id = 2;
break;
- case AT91SAM9260_ID_US2:
+ case 3:
configure_usart2_pins(pins);
start = AT91SAM9260_BASE_US2;
- id = 3;
break;
- case AT91SAM9260_ID_US3:
+ case 4:
configure_usart3_pins(pins);
start = AT91SAM9260_BASE_US3;
- id = 4;
break;
- case AT91SAM9260_ID_US4:
+ case 5:
configure_usart4_pins();
start = AT91SAM9260_BASE_US4;
- id = 5;
break;
- case AT91SAM9260_ID_US5:
+ case 6:
configure_usart5_pins();
start = AT91SAM9260_BASE_US5;
- id = 6;
break;
default:
return NULL;
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index ab9ebaf911..82d17a275e 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -211,22 +211,18 @@ struct device_d * __init at91_register_uart(unsigned id, unsigned pins)
case 0: /* DBGU */
configure_dbgu_pins();
start = AT91_BASE_SYS + AT91_DBGU;
- id = 0;
break;
- case AT91SAM9261_ID_US0:
+ case 1:
configure_usart0_pins(pins);
start = AT91SAM9261_BASE_US0;
- id = 1;
break;
- case AT91SAM9261_ID_US1:
+ case 2:
configure_usart1_pins(pins);
start = AT91SAM9261_BASE_US1;
- id = 2;
break;
- case AT91SAM9261_ID_US2:
+ case 3:
configure_usart2_pins(pins);
start = AT91SAM9261_BASE_US2;
- id = 3;
break;
default:
return NULL;
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 4ad9b8df5a..4500d813f6 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -261,22 +261,18 @@ struct device_d * __init at91_register_uart(unsigned id, unsigned pins)
case 0: /* DBGU */
configure_dbgu_pins();
start = AT91_BASE_SYS + AT91_DBGU;
- id = 0;
break;
- case AT91SAM9263_ID_US0:
+ case 1:
configure_usart0_pins(pins);
start = AT91SAM9263_BASE_US0;
- id = 1;
break;
- case AT91SAM9263_ID_US1:
+ case 2:
configure_usart1_pins(pins);
start = AT91SAM9263_BASE_US1;
- id = 2;
break;
- case AT91SAM9263_ID_US2:
+ case 3:
configure_usart2_pins(pins);
start = AT91SAM9263_BASE_US2;
- id = 3;
break;
default:
return NULL;
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index e68e72d1b9..273cd0eecc 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -190,27 +190,22 @@ struct device_d * __init at91_register_uart(unsigned id, unsigned pins)
case 0: /* DBGU */
configure_dbgu_pins();
start = AT91_BASE_SYS + AT91_DBGU;
- id = 0;
break;
- case AT91SAM9G45_ID_US0:
+ case 1:
configure_usart0_pins(pins);
start = AT91SAM9G45_BASE_US0;
- id = 1;
break;
- case AT91SAM9G45_ID_US1:
+ case 2:
configure_usart1_pins(pins);
start = AT91SAM9G45_BASE_US1;
- id = 2;
break;
- case AT91SAM9G45_ID_US2:
+ case 3:
configure_usart2_pins(pins);
start = AT91SAM9G45_BASE_US2;
- id = 3;
break;
- case AT91SAM9G45_ID_US3:
+ case 4:
configure_usart3_pins(pins);
start = AT91SAM9G45_BASE_US3;
- id = 4;
break;
default:
return NULL;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 00:24:27 +0000