diff options
Diffstat (limited to 'arch/arm/mach-clps711x/devices.c')
| -rw-r--r-- | arch/arm/mach-clps711x/devices.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c index 9eeff5c52f..c7a2fbdc8d 100644 --- a/arch/arm/mach-clps711x/devices.c +++ b/arch/arm/mach-clps711x/devices.c @@ -51,26 +51,24 @@ void clps711x_setup_memcfg(int bank, u32 val) } static struct resource uart0_resources[] = { - DEFINE_RES_MEM(UBRLCR1, SZ_4), - DEFINE_RES_MEM(UARTDR1, SZ_4), + DEFINE_RES_MEM(UARTDR1, SZ_128), }; static struct resource uart1_resources[] = { - DEFINE_RES_MEM(UBRLCR2, SZ_4), - DEFINE_RES_MEM(UARTDR2, SZ_4), + DEFINE_RES_MEM(UARTDR2, SZ_128), }; void clps711x_add_uart(unsigned int id) { switch (id) { case 0: - clk_add_alias(NULL, "clps711x_serial0", "uart", NULL); - add_generic_device_res("clps711x_serial", 0, uart0_resources, + clk_add_alias(NULL, "clps711x-uart0", "uart", NULL); + add_generic_device_res("clps711x-uart", 0, uart0_resources, ARRAY_SIZE(uart0_resources), NULL); break; case 1: - clk_add_alias(NULL, "clps711x_serial1", "uart", NULL); - add_generic_device_res("clps711x_serial", 1, uart1_resources, + clk_add_alias(NULL, "clps711x-uart1", "uart", NULL); + add_generic_device_res("clps711x-uart", 1, uart1_resources, ARRAY_SIZE(uart1_resources), NULL); break; } @@ -121,13 +119,13 @@ coredevice_initcall(clps711x_gpio_init); static __init int clps711x_syscon_init(void) { /* SYSCON1, SYSFLG1 */ - add_generic_device("clps711x-syscon", 1, NULL, SYSCON1, SZ_128, + add_generic_device("syscon", 1, NULL, SYSCON1, SZ_128, IORESOURCE_MEM, NULL); /* SYSCON2, SYSFLG2 */ - add_generic_device("clps711x-syscon", 2, NULL, SYSCON2, SZ_128, + add_generic_device("syscon", 2, NULL, SYSCON2, SZ_128, IORESOURCE_MEM, NULL); /* SYSCON3 */ - add_generic_device("clps711x-syscon", 3, NULL, SYSCON3, SZ_64, + add_generic_device("syscon", 3, NULL, SYSCON3, SZ_64, IORESOURCE_MEM, NULL); return 0; |