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

Commit bf02280e authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

ARM: at91: fix PM initialization for newer SoCs 



Newer SoCs: at91sam9x5, at91sam9n12, sama5d3 and sama5d4 embed a DDR controller
and have a different PMC status register layout than the at91sam9g45. Create
another at91_sam9x5_pm_init() function to match this compatibility.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 42dfd1e1

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

+20 −0
Original line number Original line Diff line number Diff line
@@ -61,3 +61,23 @@ DT_MACHINE_START(at91sam9g45_dt, "Atmel AT91SAM9G45") 
	.init_machine	= sam9g45_dt_device_init,

	.init_machine	= sam9g45_dt_device_init,

	.dt_compat	= at91_9g45_board_compat,

	.dt_compat	= at91_9g45_board_compat,

MACHINE_END

MACHINE_END



static void __init sam9x5_dt_device_init(void)

{

	at91_sam9x5_pm_init();

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char *at91_9x5_board_compat[] __initconst = {

	"atmel,at91sam9x5",

	"atmel,at91sam9n12",

	NULL

};



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/board-dt-sama5.c

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




static void __init sama5_dt_device_init(void)

static void __init sama5_dt_device_init(void)

{

{

	at91_sam9260_pm_init();

	at91_sam9x5_pm_init();

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

}

arch/arm/mach-at91/generic.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -36,10 +36,12 @@ extern void at91_ioremap_matrix(u32 base_addr); 
extern void __init at91_rm9200_pm_init(void);

extern void __init at91_rm9200_pm_init(void);

extern void __init at91_sam9260_pm_init(void);

extern void __init at91_sam9260_pm_init(void);

extern void __init at91_sam9g45_pm_init(void);

extern void __init at91_sam9g45_pm_init(void);

extern void __init at91_sam9x5_pm_init(void);

#else

#else

void __init at91_rm9200_pm_init(void) { }

void __init at91_rm9200_pm_init(void) { }

void __init at91_sam9260_pm_init(void) { }

void __init at91_sam9260_pm_init(void) { }

void __init at91_sam9g45_pm_init(void) { }

void __init at91_sam9g45_pm_init(void) { }

void __init at91_sam9x5_pm_init(void) { }

#endif

#endif





#endif /* _AT91_GENERIC_H */
 
#endif /* _AT91_GENERIC_H */

arch/arm/mach-at91/pm.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -306,3 +306,10 @@ void __init at91_sam9g45_pm_init(void) 
	at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;

	at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;

	return at91_pm_init();

	return at91_pm_init();

}

}



void __init at91_sam9x5_pm_init(void)

{

	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;

	at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;

	return at91_pm_init();

}