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

Commit 99d63fa1 authored by Maxime Ripard's avatar Maxime Ripard Committed by Nicolas Ferre
Browse files

ARM: at91: Remove reset code from the machine code 



Now that the transition is over and that we probe our reset driver in every
case, we can remove the legacy code from the machine directory.

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 e76265c6

arch/arm/mach-at91/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -33,14 +33,6 @@ config OLD_IRQ_AT91 
	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ



config AT91_SAM9_ALT_RESET

	bool

	default !ARCH_AT91X40



config AT91_SAM9G45_RESET

	bool

	default !ARCH_AT91X40



config AT91_SAM9_TIME

	bool

arch/arm/mach-at91/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ obj- := 


obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o

obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o

obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o

obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o

obj-$(CONFIG_AT91_SAM9_TIME)	+= at91sam926x_time.o

obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o

arch/arm/mach-at91/at91sam9260.c

+0 −1
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ static void __init at91sam9260_ioremap_registers(void) 
static void __init at91sam9260_initialize(void)

{

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;



	at91_sysirq_mask_rtt(AT91SAM9260_BASE_RTT);

arch/arm/mach-at91/at91sam9261.c

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ static void __init at91sam9261_ioremap_registers(void) 
static void __init at91sam9261_initialize(void)

{

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;



	at91_sysirq_mask_rtt(AT91SAM9261_BASE_RTT);

arch/arm/mach-at91/at91sam9263.c

+0 −1
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ static void __init at91sam9263_ioremap_registers(void) 
static void __init at91sam9263_initialize(void)

{

	arm_pm_idle = at91sam9_idle;

	arm_pm_restart = at91sam9_alt_restart;



	at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT0);

	at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT1);