Commit 7735f038 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: at91rm9200 use SoC detection infrastructure 



Use the soc detection infrastructure for at91rm9200 initialization.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent ea4abe7f

arch/arm/mach-at91/at91rm9200.c

+15 −14
Original line number Diff line number Diff line
@@ -8,25 +8,22 @@ 
 * Licensed under GPLv2 or later.

 */



#include <linux/types.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/gpio.h>

#include <linux/clk-provider.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/clk-provider.h>



#include <asm/setup.h>

#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/irq.h>

#include <asm/system_misc.h>



#include <mach/at91_st.h>



#include "generic.h"

#include "soc.h"



static const struct at91_soc rm9200_socs[] = {

	AT91_SOC(AT91RM9200_CIDR_MATCH, 0, "at91rm9200 BGA", "at91rm9200"),

	{ /* sentinel */ },

};



static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd)

{
@@ -45,15 +42,20 @@ static void __init at91rm9200_dt_timer_init(void) 


static void __init at91rm9200_dt_device_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	struct soc_device *soc;

	struct device *soc_dev = NULL;



	soc = at91_soc_init(rm9200_socs);

	if (soc != NULL)

		soc_dev = soc_device_to_device(soc);



	of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev);



	arm_pm_idle = at91rm9200_idle;

	arm_pm_restart = at91rm9200_restart;

	at91rm9200_pm_init();

}







static const char *at91rm9200_dt_board_compat[] __initconst = {

	"atmel,at91rm9200",

	NULL
@@ -61,7 +63,6 @@ static const char *at91rm9200_dt_board_compat[] __initconst = { 


DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200")

	.init_time      = at91rm9200_dt_timer_init,

	.map_io		= at91_map_io,

	.init_machine	= at91rm9200_dt_device_init,

	.dt_compat	= at91rm9200_dt_board_compat,

MACHINE_END

arch/arm/mach-at91/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -32,4 +32,6 @@ struct at91_soc { 
struct soc_device * __init

at91_soc_init(const struct at91_soc *socs);



#define AT91RM9200_CIDR_MATCH		0x09290780



#endif /* __AT91_SOC_H */