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

Commit 827de1f1 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: remove at91_dt_initialize and machine init_early() 



Move the ramc initialization to pm.c as it is the only user left.
This allows us to get rid of at91_dt_initialize() that was the only one called
by the init_early() function pointer of struct machine_desc.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: adapt patch to newer series]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent cac01723

arch/arm/mach-at91/at91rm9200.c

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ static const char *at91rm9200_dt_board_compat[] __initconst = { 
DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")

	.init_time      = at91rm9200_dt_timer_init,

	.map_io		= at91_map_io,

	.init_early	= at91_dt_initialize,

	.init_machine	= rm9200_dt_device_init,

	.dt_compat	= at91rm9200_dt_board_compat,

MACHINE_END

arch/arm/mach-at91/at91sam9.c

+0 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ static const char *at91_dt_board_compat[] __initconst = { 
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)")

	/* Maintainer: Atmel */

	.map_io		= at91_map_io,

	.init_early	= at91_dt_initialize,

	.init_machine	= sam9_dt_device_init,

	.dt_compat	= at91_dt_board_compat,

MACHINE_END
@@ -62,7 +61,6 @@ static const char *at91_9g45_board_compat[] __initconst = { 
DT_MACHINE_START(at91sam9g45_dt, "Atmel AT91SAM9G45")

	/* Maintainer: Atmel */

	.map_io		= at91_map_io,

	.init_early	= at91_dt_initialize,

	.init_machine	= sam9g45_dt_device_init,

	.dt_compat	= at91_9g45_board_compat,

MACHINE_END
@@ -84,7 +82,6 @@ static const char *at91_9x5_board_compat[] __initconst = { 
DT_MACHINE_START(at91sam9x5_dt, "Atmel AT91SAM9")

	/* Maintainer: Atmel */

	.map_io		= at91_map_io,

	.init_early	= at91_dt_initialize,

	.init_machine	= sam9x5_dt_device_init,

	.dt_compat	= at91_9x5_board_compat,

MACHINE_END

arch/arm/mach-at91/generic.h

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
extern void __init at91_map_io(void);

extern void __init at91_alt_map_io(void);



 /* Processors */

extern void __init at91_dt_initialize(void);



 /* Timer */

extern void at91rm9200_timer_init(void);

arch/arm/mach-at91/pm.c

+44 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/clk/at91_pmc.h>
@@ -41,6 +42,7 @@ static struct { 
} at91_pm_data;



static void (*at91_pm_standby)(void);

void __iomem *at91_ramc_base[2];



static int at91_pm_valid_state(suspend_state_t state)

{
@@ -224,6 +226,43 @@ void at91_pm_set_standby(void (*at91_standby)(void)) 
	}

}



static struct of_device_id ramc_ids[] = {

	{ .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },

	{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },

	{ .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },

	{ .compatible = "atmel,sama5d3-ddramc", .data = at91_ddr_standby },

	{ /*sentinel*/ }

};



static void at91_dt_ramc(void)

{

	struct device_node *np;

	const struct of_device_id *of_id;

	int idx = 0;

	const void *standby = NULL;



	for_each_matching_node_and_match(np, ramc_ids, &of_id) {

		at91_ramc_base[idx] = of_iomap(np, 0);

		if (!at91_ramc_base[idx])

			panic(pr_fmt("unable to map ramc[%d] cpu registers\n"), idx);



		if (!standby)

			standby = of_id->data;



		idx++;

	}



	if (!idx)

		panic(pr_fmt("unable to find compatible ram controller node in dtb\n"));



	if (!standby) {

		pr_warn("ramc no standby function available\n");

		return;

	}



	at91_pm_set_standby(standby);

}



#ifdef CONFIG_AT91_SLOW_CLOCK

static void __init at91_pm_sram_init(void)

{
@@ -282,6 +321,8 @@ static void __init at91_pm_init(void) 


void __init at91_rm9200_pm_init(void)

{

	at91_dt_ramc();



	/*

	 * AT91RM9200 SDRAM low-power mode cannot be used with self-refresh.

	 */
@@ -295,6 +336,7 @@ void __init at91_rm9200_pm_init(void) 


void __init at91_sam9260_pm_init(void)

{

	at91_dt_ramc();

	at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC;

	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;

	return at91_pm_init();
@@ -302,6 +344,7 @@ void __init at91_sam9260_pm_init(void) 


void __init at91_sam9g45_pm_init(void)

{

	at91_dt_ramc();

	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP;

	at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;

	return at91_pm_init();
@@ -309,6 +352,7 @@ void __init at91_sam9g45_pm_init(void) 


void __init at91_sam9x5_pm_init(void)

{

	at91_dt_ramc();

	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;

	at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;

	return at91_pm_init();

arch/arm/mach-at91/sama5.c

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static const char *sama5_dt_board_compat[] __initconst = { 
DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)")

	/* Maintainer: Atmel */

	.map_io		= at91_map_io,

	.init_early	= at91_dt_initialize,

	.init_machine	= sama5_dt_device_init,

	.dt_compat	= sama5_dt_board_compat,

MACHINE_END
@@ -106,7 +105,6 @@ static const char *sama5_alt_dt_board_compat[] __initconst = { 
DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5 (Device Tree)")

	/* Maintainer: Atmel */

	.map_io		= sama5_alt_map_io,

	.init_early	= at91_dt_initialize,

	.init_machine	= sama5_dt_device_init,

	.dt_compat	= sama5_alt_dt_board_compat,

	.l2c_aux_mask	= ~0UL,