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

Commit fed3d35b authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: mx3: dynamically allocate mxc_rnga devices 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 6a697e3d

arch/arm/mach-mx3/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ config ARCH_MX35 


config SOC_IMX31

	bool

	select ARCH_HAS_RNGA

	select IMX_HAVE_PLATFORM_MXC_RNGA

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MX31

arch/arm/mach-mx3/devices.c

+0 −18
Original line number Diff line number Diff line
@@ -29,23 +29,6 @@ 


#include "devices.h"



#ifdef CONFIG_ARCH_MX31

static struct resource rnga_resources[] = {

	{

		.start = MX3x_RNGA_BASE_ADDR,

		.end = MX3x_RNGA_BASE_ADDR + 0x28,

		.flags = IORESOURCE_MEM,

	},

};



struct platform_device mxc_rnga_device = {

	.name = "mxc_rnga",

	.id = -1,

	.num_resources = 1,

	.resource = rnga_resources,

};

#endif /* CONFIG_ARCH_MX31 */



/* i.MX31 Image Processing Unit */



/* The resource order is important! */
@@ -262,7 +245,6 @@ static int __init mx3_devices_init(void) 
	if (cpu_is_mx31()) {

		imx_wdt_resources[0].start = MX31_WDOG_BASE_ADDR;

		imx_wdt_resources[0].end = MX31_WDOG_BASE_ADDR + 0x3fff;

		mxc_register_device(&mxc_rnga_device, NULL);

	}

#endif

#if defined(CONFIG_ARCH_MX35)

arch/arm/mach-mx3/devices.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ extern struct platform_device mxc_otg_udc_device; 
extern struct platform_device mxc_otg_host;

extern struct platform_device mxc_usbh1;

extern struct platform_device mxc_usbh2;

extern struct platform_device mxc_rnga_device;

extern struct platform_device imx_wdt_device0;

extern struct platform_device imx_rtc_device0;

extern struct platform_device imx_kpp_device;

arch/arm/plat-mxc/devices/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ config IMX_HAVE_PLATFORM_MXC_NAND 
config IMX_HAVE_PLATFORM_MXC_PWM

	bool



config IMX_HAVE_PLATFORM_MXC_RNGA

	bool

	select ARCH_HAS_RNGA



config IMX_HAVE_PLATFORM_MXC_W1

	bool

arch/arm/plat-mxc/devices/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI) += platform-mxc-ehci.o 
obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_MMC) += platform-mxc-mmc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_PWM) += platform-mxc_pwm.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_RNGA) += platform-mxc_rnga.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_W1) += platform-mxc_w1.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) +=  platform-spi_imx.o