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

Commit 4b0a683c authored by Maxime Ripard's avatar Maxime Ripard Committed by Nicolas Ferre
Browse files

ARM: at91: Remove the old-style reset probing 



Now that the reset code is a driver of its own, just let the usual DT probing
mecanism do its job, and remove the code entirely in this case.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 8d248f0d

arch/arm/mach-at91/setup.c

+0 −29
Original line number Diff line number Diff line
@@ -355,34 +355,6 @@ void __init at91_ioremap_matrix(u32 base_addr) 
}



#if defined(CONFIG_OF) && !defined(CONFIG_ARCH_AT91X40)

static struct of_device_id rstc_ids[] = {

	{ .compatible = "atmel,at91sam9260-rstc", .data = at91sam9_alt_restart },

	{ .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart },

	{ /*sentinel*/ }

};



static void at91_dt_rstc(void)

{

	struct device_node *np;

	const struct of_device_id *of_id;



	np = of_find_matching_node(NULL, rstc_ids);

	if (!np)

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



	at91_rstc_base = of_iomap(np, 0);

	if (!at91_rstc_base)

		panic(pr_fmt("unable to map rstc cpu registers\n"));



	of_id = of_match_node(rstc_ids, np);

	if (!of_id)

		panic(pr_fmt("rtsc no restart function available\n"));



	arm_pm_restart = of_id->data;



	of_node_put(np);

}



static struct of_device_id ramc_ids[] = {

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

	{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },
@@ -509,7 +481,6 @@ void __init at91rm9200_dt_initialize(void) 


void __init at91_dt_initialize(void)

{

	at91_dt_rstc();

	at91_dt_ramc();

	at91_dt_shdwc();