diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-01-01 12:06:31 +0800 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-04-24 18:27:30 +0800 |
commit | f44268517f7ed2c4960027a1dbbd8c0d64502db2 (patch) | |
tree | b6a6a4eddb77714a0899e0ed92dbd02db057cd8c | |
parent | 1d79f322f7a3bff9b6b9bde4ce7f391f0316063a (diff) | |
download | barebox-f44268517f7ed2c4960027a1dbbd8c0d64502db2.tar.gz barebox-f44268517f7ed2c4960027a1dbbd8c0d64502db2.tar.xz |
at91: at91_register_uart use number instead of IDs
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r-- | arch/arm/mach-at91/at91rm9200_devices.c | 13 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 19 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 13 |
5 files changed, 20 insertions, 45 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index c380c7d8cf..7e721e5ccf 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 23da8c1bbf..17dbd1a1e4 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 d4f7b5effb..8a63d2a4eb 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 12d6a24a24..b28e9e26f3 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 25a8d80c24..ca96f58a7f 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; |