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

Commit 6b625891 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Daniel Lezcano
Browse files

ARM: AT91: DT: pm: Select ram controller standby based on DT 



Move non-dt selection to ioremap_registers init which is only called not
non-dt board.

So we can support sam9n12/sam9x5/sama5d3 too.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 2d2c476f

arch/arm/mach-at91/at91rm9200.c

+1 −2
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ static void __init at91rm9200_ioremap_registers(void) 
{

	at91rm9200_ioremap_st(AT91RM9200_BASE_ST);

	at91_ioremap_ramc(0, AT91RM9200_BASE_MC, 256);

	at91_pm_set_standby(at91rm9200_standby);

}



static void __init at91rm9200_initialize(void)
@@ -338,8 +339,6 @@ static void __init at91rm9200_initialize(void) 
	/* Initialize GPIO subsystem */

	at91_gpio_init(at91rm9200_gpio,

		cpu_is_at91rm9200_bga() ? AT91RM9200_BGA : AT91RM9200_PQFP);



	at91_pm_set_standby(at91rm9200_standby);

}

arch/arm/mach-at91/at91sam9260.c

+1 −2
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ static void __init at91sam9260_ioremap_registers(void) 
	at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);

	at91_ioremap_matrix(AT91SAM9260_BASE_MATRIX);

	at91_pm_set_standby(at91sam9_sdram_standby);

}



static void __init at91sam9260_initialize(void)
@@ -352,8 +353,6 @@ static void __init at91sam9260_initialize(void) 


	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9260_gpio, 3);



	at91_pm_set_standby(at91sam9_sdram_standby);

}



/* --------------------------------------------------------------------

arch/arm/mach-at91/at91sam9261.c

+1 −2
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ static void __init at91sam9261_ioremap_registers(void) 
	at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);

	at91_ioremap_matrix(AT91SAM9261_BASE_MATRIX);

	at91_pm_set_standby(at91sam9_sdram_standby);

}



static void __init at91sam9261_initialize(void)
@@ -294,8 +295,6 @@ static void __init at91sam9261_initialize(void) 


	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9261_gpio, 3);



	at91_pm_set_standby(at91sam9_sdram_standby);

}



/* --------------------------------------------------------------------

arch/arm/mach-at91/at91sam9263.c

+1 −2
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ static void __init at91sam9263_ioremap_registers(void) 
	at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);

	at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);

	at91_ioremap_matrix(AT91SAM9263_BASE_MATRIX);

	at91_pm_set_standby(at91sam9_sdram_standby);

}



static void __init at91sam9263_initialize(void)
@@ -331,8 +332,6 @@ static void __init at91sam9263_initialize(void) 


	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9263_gpio, 5);



	at91_pm_set_standby(at91sam9_sdram_standby);

}



/* --------------------------------------------------------------------

arch/arm/mach-at91/at91sam9g45.c

+1 −2
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static void __init at91sam9g45_ioremap_registers(void) 
	at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC);

	at91_ioremap_matrix(AT91SAM9G45_BASE_MATRIX);

	at91_pm_set_standby(at91_ddr_standby);

}



static void __init at91sam9g45_initialize(void)
@@ -380,8 +381,6 @@ static void __init at91sam9g45_initialize(void) 


	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9g45_gpio, 5);



	at91_pm_set_standby(at91_ddr_standby);

}



/* --------------------------------------------------------------------