Commit c9ee9496 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Shawn Guo
Browse files

ARM: imx: deconstruct mxc_rnga initialization 



The rnga platform device is initialized for all imx31 machines
from its own initcall, but is never initialized anywhere else.

This moves the platform device creation into both the imx31
dt and non-dt machine init sequences, which has basically the
exact same effect as before, but makes it more obvious what
is going on, while reducing the amount of code and removing
the last user of cpu_is_mx31().

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 6f98cb22

arch/arm/mach-imx/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ config MXC_USE_EPIT 
	  uses the same clocks as the GPT. Anyway, on some systems the GPT

	  may be in use for other purposes.



config ARCH_HAS_RNGA

	bool



config HAVE_IMX_ANATOP

	bool
@@ -90,7 +87,6 @@ config SOC_IMX27 
config SOC_IMX31

	bool

	select CPU_V6

	select IMX_HAVE_PLATFORM_MXC_RNGA

	select MXC_AVIC

	select SMP_ON_UP if SMP

arch/arm/mach-imx/devices/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -57,10 +57,6 @@ config IMX_HAVE_PLATFORM_MXC_MMC 
config IMX_HAVE_PLATFORM_MXC_NAND

	bool



config IMX_HAVE_PLATFORM_MXC_RNGA

	bool

	select ARCH_HAS_RNGA



config IMX_HAVE_PLATFORM_MXC_RTC

	bool

arch/arm/mach-imx/devices/platform-mxc_rnga.c

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 Pengutronix

 * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>

 *

 * This program is free software; you can redistribute it and/or modify it under

 * the terms of the GNU General Public License version 2 as published by the

 * Free Software Foundation.

 */

#include "../hardware.h"

#include "devices-common.h"



struct imx_mxc_rnga_data {

	resource_size_t iobase;

};



#define imx_mxc_rnga_data_entry_single(soc)				\

	{								\

		.iobase = soc ## _RNGA_BASE_ADDR,			\

	}



#ifdef CONFIG_SOC_IMX31

static const struct imx_mxc_rnga_data imx31_mxc_rnga_data __initconst =

	imx_mxc_rnga_data_entry_single(MX31);

#endif /* ifdef CONFIG_SOC_IMX31 */



static struct platform_device *__init imx_add_mxc_rnga(

		const struct imx_mxc_rnga_data *data)

{

	struct resource res[] = {

		{

			.start = data->iobase,

			.end = data->iobase + SZ_16K - 1,

			.flags = IORESOURCE_MEM,

		},

	};

	return imx_add_platform_device("mxc_rnga", -1,

			res, ARRAY_SIZE(res), NULL, 0);

}



static int __init imxXX_add_mxc_rnga(void)

{

	struct platform_device *ret;



#if defined(CONFIG_SOC_IMX31)

	if (cpu_is_mx31())

		ret = imx_add_mxc_rnga(&imx31_mxc_rnga_data);

	else

#endif /* if defined(CONFIG_SOC_IMX31) */

		ret = ERR_PTR(-ENODEV);



	return PTR_ERR_OR_ZERO(ret);

}

arch_initcall(imxXX_add_mxc_rnga);

arch/arm/mach-imx/imx31-dt.c

+12 −0
Original line number Diff line number Diff line
@@ -28,10 +28,22 @@ static void __init imx31_dt_timer_init(void) 
	mx31_clocks_init_dt();

}



/* FIXME: replace with DT binding */

static const struct resource imx31_rnga_res[] __initconst = {

	DEFINE_RES_MEM(MX31_RNGA_BASE_ADDR, SZ_16K),

};



static void __init imx31_dt_mach_init(void)

{

	platform_device_register_simple("mxc_rnga", -1, imx31_rnga_res,

					ARRAY_SIZE(imx31_rnga_res));

}



DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)")

	.map_io		= mx31_map_io,

	.init_early	= imx31_init_early,

	.init_irq	= mx31_init_irq,

	.init_time	= imx31_dt_timer_init,

	.init_machine	= imx31_dt_mach_init,

	.dt_compat	= imx31_dt_board_compat,

MACHINE_END

arch/arm/mach-imx/mm-imx3.c

+6 −0
Original line number Diff line number Diff line
@@ -167,6 +167,10 @@ static const struct resource imx31_audmux_res[] __initconst = { 
	DEFINE_RES_MEM(MX31_AUDMUX_BASE_ADDR, SZ_16K),

};



static const struct resource imx31_rnga_res[] __initconst = {

	DEFINE_RES_MEM(MX31_RNGA_BASE_ADDR, SZ_16K),

};



void __init imx31_soc_init(void)

{

	int to_version = mx31_revision() >> 4;
@@ -195,6 +199,8 @@ void __init imx31_soc_init(void) 


	platform_device_register_simple("imx31-audmux", 0, imx31_audmux_res,

					ARRAY_SIZE(imx31_audmux_res));

	platform_device_register_simple("mxc_rnga", -1, imx31_rnga_res,

					ARRAY_SIZE(imx31_rnga_res));

}

#endif /* ifdef CONFIG_SOC_IMX31 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE