diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-08-10 16:57:24 -0400 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-09-27 09:46:37 -0400 |
| commit | 5162de08d116fe7bbb912b17d84169983bfa16a8 (patch) | |
| tree | 406d776cca714de1bdb819ef1009867fd6bb4de7 /arch/arm/mach-mx3 | |
| parent | 35bab0589b9a71533b37280eefa430c21dc102fe (diff) | |
ARM: imx: change the way imx-uarts are registered
For mx1_defconfig this yields:
add/remove: 1/0 grow/shrink: 1/4 up/down: 49/-108 (-59)
function old new delta
imx1_imx_uart_data - 48 +48
kernel_config_data 7277 7278 +1
imx_add_imx_uart_1irq 132 128 -4
imx_add_imx_uart_3irq 164 156 -8
scb9328_init 96 64 -32
mx1ads_init 220 156 -64
for mx21_defconfig this yields:
add/remove: 1/0 grow/shrink: 0/3 up/down: 64/-52 (12)
function old new delta
imx21_imx_uart_data - 64 +64
imx_add_imx_uart_3irq 160 156 -4
imx_add_imx_uart_1irq 140 136 -4
mx21ads_board_init 220 176 -44
for a random mx25 config this yields:
add/remove: 1/0 grow/shrink: 0/5 up/down: 80/-56 (24)
function old new delta
imx25_imx_uart_data - 80 +80
imx_add_imx_uart_3irq 160 156 -4
imx_add_imx_uart_1irq 140 136 -4
mx25pdk_init 288 272 -16
eukrea_mbimxsd_baseboard_init 272 256 -16
eukrea_cpuimx25_init 252 236 -16
for mx27_defconfig this yields:
add/remove: 1/0 grow/shrink: 0/10 up/down: 96/-280 (-184)
function old new delta
imx27_imx_uart_data - 96 +96
imx_add_imx_uart_3irq 160 156 -4
imx_add_imx_uart_1irq 140 136 -4
pca100_init 560 544 -16
mx27pdk_init 112 96 -16
mx27lite_init 92 76 -16
eukrea_cpuimx27_init 332 316 -16
pcm038_init 388 348 -40
mxt_td60_board_init 320 280 -40
eukrea_mbimx27_baseboard_init 476 436 -40
mx27ads_board_init 368 280 -88
and finally for mx3_defconfig:
add/remove: 2/0 grow/shrink: 0/9 up/down: 128/-344 (-216)
function old new delta
imx31_imx_uart_data - 80 +80
imx35_imx_uart_data - 48 +48
imx_add_imx_uart_1irq 132 128 -4
imx_add_imx_uart_3irq 164 152 -12
mx31moboard_devboard_init 360 344 -16
mx31lite_db_init 176 160 -16
mx31moboard_smartbot_init 384 360 -24
kzm_board_init 232 208 -24
armadillo5x0_init 392 364 -28
mx31lilly_db_init 248 208 -40
mxc_board_init 3760 3580 -180
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
| -rw-r--r-- | arch/arm/mach-mx3/devices-imx31.h | 18 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/devices-imx35.h | 12 |
2 files changed, 14 insertions, 16 deletions
diff --git a/arch/arm/mach-mx3/devices-imx31.h b/arch/arm/mach-mx3/devices-imx31.h index 7b4d022a59fa..a8c5f1bfce3b 100644 --- a/arch/arm/mach-mx3/devices-imx31.h +++ b/arch/arm/mach-mx3/devices-imx31.h | |||
| @@ -16,16 +16,14 @@ | |||
| 16 | #define imx31_add_imx_i2c2(pdata) \ | 16 | #define imx31_add_imx_i2c2(pdata) \ |
| 17 | imx_add_imx_i2c(2, MX31_I2C3_BASE_ADDR, SZ_4K, MX31_INT_I2C3, pdata) | 17 | imx_add_imx_i2c(2, MX31_I2C3_BASE_ADDR, SZ_4K, MX31_INT_I2C3, pdata) |
| 18 | 18 | ||
| 19 | #define imx31_add_imx_uart0(pdata) \ | 19 | extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[] __initconst; |
| 20 | imx_add_imx_uart_1irq(0, MX31_UART1_BASE_ADDR, SZ_16K, MX31_INT_UART1, pdata) | 20 | #define imx31_add_imx_uart(id, pdata) \ |
| 21 | #define imx31_add_imx_uart1(pdata) \ | 21 | imx_add_imx_uart_1irq(&imx31_imx_uart_data[id], pdata) |
| 22 | imx_add_imx_uart_1irq(1, MX31_UART2_BASE_ADDR, SZ_16K, MX31_INT_UART2, pdata) | 22 | #define imx31_add_imx_uart0(pdata) imx31_add_imx_uart(0, pdata) |
| 23 | #define imx31_add_imx_uart2(pdata) \ | 23 | #define imx31_add_imx_uart1(pdata) imx31_add_imx_uart(1, pdata) |
| 24 | imx_add_imx_uart_1irq(2, MX31_UART3_BASE_ADDR, SZ_16K, MX31_INT_UART3, pdata) | 24 | #define imx31_add_imx_uart2(pdata) imx31_add_imx_uart(2, pdata) |
| 25 | #define imx31_add_imx_uart3(pdata) \ | 25 | #define imx31_add_imx_uart3(pdata) imx31_add_imx_uart(3, pdata) |
| 26 | imx_add_imx_uart_1irq(3, MX31_UART4_BASE_ADDR, SZ_16K, MX31_INT_UART4, pdata) | 26 | #define imx31_add_imx_uart4(pdata) imx31_add_imx_uart(4, pdata) |
| 27 | #define imx31_add_imx_uart4(pdata) \ | ||
| 28 | imx_add_imx_uart_1irq(4, MX31_UART5_BASE_ADDR, SZ_16K, MX31_INT_UART5, pdata) | ||
| 29 | 27 | ||
| 30 | #define imx31_add_mxc_nand(pdata) \ | 28 | #define imx31_add_mxc_nand(pdata) \ |
| 31 | imx_add_mxc_nand_v1(MX31_NFC_BASE_ADDR, MX31_INT_NANDFC, pdata) | 29 | imx_add_mxc_nand_v1(MX31_NFC_BASE_ADDR, MX31_INT_NANDFC, pdata) |
diff --git a/arch/arm/mach-mx3/devices-imx35.h b/arch/arm/mach-mx3/devices-imx35.h index af0bc1f86237..6a76b4d72e49 100644 --- a/arch/arm/mach-mx3/devices-imx35.h +++ b/arch/arm/mach-mx3/devices-imx35.h | |||
| @@ -21,12 +21,12 @@ | |||
| 21 | #define imx35_add_imx_i2c2(pdata) \ | 21 | #define imx35_add_imx_i2c2(pdata) \ |
| 22 | imx_add_imx_i2c(2, MX35_I2C3_BASE_ADDR, SZ_4K, MX35_INT_I2C3, pdata) | 22 | imx_add_imx_i2c(2, MX35_I2C3_BASE_ADDR, SZ_4K, MX35_INT_I2C3, pdata) |
| 23 | 23 | ||
| 24 | #define imx35_add_imx_uart0(pdata) \ | 24 | extern const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst; |
| 25 | imx_add_imx_uart_1irq(0, MX35_UART1_BASE_ADDR, SZ_16K, MX35_INT_UART1, pdata) | 25 | #define imx35_add_imx_uart(id, pdata) \ |
| 26 | #define imx35_add_imx_uart1(pdata) \ | 26 | imx_add_imx_uart_1irq(&imx35_imx_uart_data[id], pdata) |
| 27 | imx_add_imx_uart_1irq(1, MX35_UART2_BASE_ADDR, SZ_16K, MX35_INT_UART2, pdata) | 27 | #define imx35_add_imx_uart0(pdata) imx35_add_imx_uart(0, pdata) |
| 28 | #define imx35_add_imx_uart2(pdata) \ | 28 | #define imx35_add_imx_uart1(pdata) imx35_add_imx_uart(1, pdata) |
| 29 | imx_add_imx_uart_1irq(2, MX35_UART3_BASE_ADDR, SZ_16K, MX35_INT_UART3, pdata) | 29 | #define imx35_add_imx_uart2(pdata) imx35_add_imx_uart(2, pdata) |
| 30 | 30 | ||
| 31 | #define imx35_add_mxc_nand(pdata) \ | 31 | #define imx35_add_mxc_nand(pdata) \ |
| 32 | imx_add_mxc_nand_v21(MX35_NFC_BASE_ADDR, MX35_INT_NANDFC, pdata) | 32 | imx_add_mxc_nand_v21(MX35_NFC_BASE_ADDR, MX35_INT_NANDFC, pdata) |