lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: amba: nomadik: use common amba device initializers

Browse Source 
Acked-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2011-12-18 15:28:51 +00:00
parent 6db2a457dd
commit 53d68af1c2
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/mach-nomadik/board-nhk8815.c
View File

@@ -185,20 +185,11 @@ static void __init nhk8815_onenand_init(void)
#endif #endif
} }
#define __MEM_4K_RESOURCE(x) \ static AMBA_APB_DEVICE(uart0, "uart0", 0, NOMADIK_UART0_BASE,
.res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM} { IRQ_UART0 }, NULL);
static struct amba_device uart0_device = { static AMBA_APB_DEVICE(uart1, "uart1", 0, NOMADIK_UART1_BASE,
.dev = { .init_name = "uart0" }, { IRQ_UART1 }, NULL);
__MEM_4K_RESOURCE(NOMADIK_UART0_BASE),
.irq = {IRQ_UART0},
};
static struct amba_device uart1_device = {
.dev = { .init_name = "uart1" },
__MEM_4K_RESOURCE(NOMADIK_UART1_BASE),
.irq = {IRQ_UART1},
};
static struct amba_device *amba_devs[] __initdata = { static struct amba_device *amba_devs[] __initdata = {
&uart0_device, &uart0_device,

9
arch/arm/mach-nomadik/cpu-8815.c
View File

@@ -97,12 +97,7 @@ static struct platform_device cpu8815_platform_gpio[] = {
GPIO_DEVICE(3), GPIO_DEVICE(3),
}; };
static struct amba_device cpu8815_amba_rng = { static AMBA_APB_DEVICE(cpu8815_amba_rng, "rng", 0, NOMADIK_RNG_BASE, { }, NULL);
.dev = {
.init_name = "rng",
},
__MEM_4K_RESOURCE(NOMADIK_RNG_BASE),
};
static struct platform_device *platform_devs[] __initdata = { static struct platform_device *platform_devs[] __initdata = {
cpu8815_platform_gpio + 0, cpu8815_platform_gpio + 0,
@@ -112,7 +107,7 @@ static struct platform_device *platform_devs[] __initdata = {
}; };
static struct amba_device *amba_devs[] __initdata = { static struct amba_device *amba_devs[] __initdata = {
&cpu8815_amba_rng &cpu8815_amba_rng_device
}; };
static int __init cpu8815_init(void) static int __init cpu8815_init(void)