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

Commit 4db0ba22 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: pm: prepare for multiplatform 



Split at91_pm_init() in three variants that are called by the respective SoCs
.init_machine. This allows to remove the of_machine_is_compatible() calls and
move at91_pm_init() out of arch_initcall() which is required for multiplatform.

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

arch/arm/mach-at91/board-dt-rm9200.c

+11 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/gpio.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/clk-provider.h>



#include <asm/setup.h>
@@ -30,6 +31,15 @@ static void __init at91rm9200_dt_timer_init(void) 
	at91rm9200_timer_init();

}



static void __init rm9200_dt_device_init(void)

{

	at91_rm9200_pm_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}







static const char *at91rm9200_dt_board_compat[] __initdata = {

	"atmel,at91rm9200",

	NULL
@@ -39,5 +49,6 @@ 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/board-dt-sam9.c

+27 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/gpio.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/clk-provider.h>



#include <asm/setup.h>
@@ -23,6 +24,12 @@ 


#include "generic.h"



static void __init sam9_dt_device_init(void)

{

	at91_sam9260_pm_init();

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char *at91_dt_board_compat[] __initdata = {

	"atmel,at91sam9",

	NULL
@@ -32,5 +39,25 @@ 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



static void __init sam9g45_dt_device_init(void)

{

	at91_sam9g45_pm_init();

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char *at91_9g45_board_compat[] __initconst = {

	"atmel,at91sam9g45",

	NULL

};



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

arch/arm/mach-at91/board-dt-sama5.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


static void __init sama5_dt_device_init(void)

{

	at91_sam9260_pm_init();

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

arch/arm/mach-at91/generic.h

+12 −0
Original line number Diff line number Diff line
@@ -31,4 +31,16 @@ extern void at91sam9_idle(void); 


/* Matrix */

extern void at91_ioremap_matrix(u32 base_addr);





#ifdef CONFIG_PM

extern void __init at91_rm9200_pm_init(void);

extern void __init at91_sam9260_pm_init(void);

extern void __init at91_sam9g45_pm_init(void);

#else

void __init at91_rm9200_pm_init(void) { }

void __init at91_sam9260_pm_init(void) { }

void __init at91_sam9g45_pm_init(void) { }

#endif



#endif /* _AT91_GENERIC_H */

arch/arm/mach-at91/pm.c

+27 −21
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static void __init at91_pm_sram_init(void) 
#endif





static int __init at91_pm_init(void)

static void __init at91_pm_init(void)

{

#ifdef CONFIG_AT91_SLOW_CLOCK

	at91_pm_sram_init();
@@ -274,29 +274,35 @@ static int __init at91_pm_init(void) 


	pr_info("AT91: Power Management%s\n", (slow_clock ? " (with slow clock mode)" : ""));



	at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC;

	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;

	if (at91_cpuidle_device.dev.platform_data)

		platform_device_register(&at91_cpuidle_device);



	if (of_machine_is_compatible("atmel,at91rm9200")) {

	suspend_set_ops(&at91_pm_ops);

}



void __init at91_rm9200_pm_init(void)

{

	/*

		 * AT91RM9200 SDRAM low-power mode cannot be used with

		 * self-refresh.

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

	 */

	at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0);



		at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP |

					    AT91RM9200_PMC_UDP;

	at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP;

	at91_pm_data.memctrl = AT91_MEMCTRL_MC;

	} else if (of_machine_is_compatible("atmel,at91sam9g45")) {

		at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP;

		at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;

	}



	if (at91_cpuidle_device.dev.platform_data)

		platform_device_register(&at91_cpuidle_device);

	at91_pm_init();

}



	suspend_set_ops(&at91_pm_ops);

void __init at91_sam9260_pm_init(void)

{

	at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC;

	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;

	return at91_pm_init();

}



	return 0;

void __init at91_sam9g45_pm_init(void)

{

	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP;

	at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;

	return at91_pm_init();

}
 
arch_initcall(at91_pm_init);