Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c77852d authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: nomadik: register AMBA devices dynamically 



This makes AMBA devices on the Nomadik main CPU die register
dynamically, and refactor the registration of the RNG to use
this.

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 056c78d3

arch/arm/mach-nomadik/board-nhk8815.c

+2 −15
Original line number Diff line number Diff line
@@ -185,17 +185,6 @@ static void __init nhk8815_onenand_init(void) 
#endif

}



static AMBA_APB_DEVICE(uart0, "uart0", 0, NOMADIK_UART0_BASE,

	{ IRQ_UART0 }, NULL);



static AMBA_APB_DEVICE(uart1, "uart1", 0, NOMADIK_UART1_BASE,

	{ IRQ_UART1 }, NULL);



static struct amba_device *amba_devs[] __initdata = {

	&uart0_device,

	&uart1_device,

};



static struct resource nhk8815_eth_resources[] = {

	{

		.name = "smc91x-regs",
@@ -255,15 +244,13 @@ static struct sys_timer nomadik_timer = { 


static void __init nhk8815_platform_init(void)

{

	int i;



	cpu8815_platform_init();

	nhk8815_onenand_init();

	platform_add_devices(nhk8815_platform_devices,

			     ARRAY_SIZE(nhk8815_platform_devices));



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++)

		amba_device_register(amba_devs[i], &iomem_resource);

	amba_apb_device_add(NULL, "uart0", NOMADIK_UART0_BASE, SZ_4K, IRQ_UART0, 0, NULL, 0);

	amba_apb_device_add(NULL, "uart1", NOMADIK_UART1_BASE, SZ_4K, IRQ_UART1, 0, NULL, 0);

}



MACHINE_START(NOMADIK, "NHK8815")

arch/arm/mach-nomadik/cpu-8815.c

+4 −9
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#include <linux/amba/bus.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/slab.h>

#include <linux/irq.h>

#include <linux/dma-mapping.h>



#include <plat/gpio-nomadik.h>

#include <mach/hardware.h>
@@ -35,12 +38,6 @@ 
#include "clock.h"

#include "cpu-8815.h"



static AMBA_APB_DEVICE(cpu8815_amba_rng, "rng", 0, NOMADIK_RNG_BASE, { }, NULL);



static struct amba_device *amba_devs[] __initdata = {

	&cpu8815_amba_rng_device

};



/* The 8815 has 4 GPIO blocks, let's register them immediately */

static resource_size_t __initdata cpu8815_gpio_base[] = {

	NOMADIK_GPIO0_BASE,
@@ -88,15 +85,13 @@ void cpu8815_add_gpios(resource_size_t *base, int num, int irq, 


static int __init cpu8815_init(void)

{

	int i;

	struct nmk_gpio_platform_data pdata = {

		/* No custom data yet */

	};



	cpu8815_add_gpios(cpu8815_gpio_base, ARRAY_SIZE(cpu8815_gpio_base),

			  IRQ_GPIO0, &pdata);

	for (i = 0; i < ARRAY_SIZE(amba_devs); i++)

		amba_device_register(amba_devs[i], &iomem_resource);

	amba_apb_device_add(NULL, "rng", NOMADIK_RNG_BASE, SZ_4K, 0, 0, NULL, 0);

	return 0;

}

arch_initcall(cpu8815_init);