[PATCH 1/2] ARM: at91: remove at91sam9261/at91sam9g10 legacy board support

[pebolle@tiscali.nl (Paul Bolle)]

On Mon, 2014-12-01 at 17:10 +0100, Nicolas Ferre wrote:
> Le 01/12/2014 12:56, Paul Bolle a ?crit :
> > On Fri, 2014-11-21 at 12:27 +0100, Nicolas Ferre wrote:
> >> Remove legacy support for at91sam9261/at91sam9g10 boards.
> >> This include board files removal plus all legacy code for non DT boards
> >> support.
> >> Use the Device Tree for running this board with newer kernels.
> >>
> >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> >> ---
> > 
> > There's some further cleanup possible after this patch. I noticed that
> > when it landed in today's linux-next (ie, next-20141201) as commit
> > 2e591e7b3ac2 ("ARM: at91: remove at91sam9261/at91sam9g10 legacy board
> > support").
> > 
> >>  arch/arm/configs/at91sam9261_9g10_defconfig |  147 ----
> >>  arch/arm/mach-at91/Kconfig.non_dt           |   34 -
> >>  arch/arm/mach-at91/Makefile                 |    5 -
> >>  arch/arm/mach-at91/at91sam9261.c            |  375 ---------
> >>  arch/arm/mach-at91/at91sam9261_devices.c    | 1098 ---------------------------
> >>  arch/arm/mach-at91/board-sam9261ek.c        |  623 ---------------
> >>  6 files changed, 2282 deletions(-)
> >>  delete mode 100644 arch/arm/configs/at91sam9261_9g10_defconfig
> >>  delete mode 100644 arch/arm/mach-at91/at91sam9261_devices.c
> >>  delete mode 100644 arch/arm/mach-at91/board-sam9261ek.c
> >>
> >> [...]
> >> diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
> >> deleted file mode 100644
> >> index 29baacb5c359..000000000000
> >> --- a/arch/arm/mach-at91/at91sam9261_devices.c
> >> +++ /dev/null
> >> [...]
> >> -/* --------------------------------------------------------------------
> >> - *  RTT
> >> - * -------------------------------------------------------------------- */
> >> -
> >> -static struct resource rtt_resources[] = {
> >> -	{
> >> -		.start	= AT91SAM9261_BASE_RTT,
> >> -		.end	= AT91SAM9261_BASE_RTT + SZ_16 - 1,
> >> -		.flags	= IORESOURCE_MEM,
> >> -	}, {
> >> -		.flags	= IORESOURCE_MEM,
> >> -	}, {
> >> -		.flags  = IORESOURCE_IRQ,
> >> -	}
> >> -};
> >> -
> >> -static struct platform_device at91sam9261_rtt_device = {
> >> -	.name		= "at91_rtt",
> >> -	.id		= 0,
> >> -	.resource	= rtt_resources,
> >> -};
> >> -
> >> -#if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
> >> -static void __init at91_add_device_rtt_rtc(void)
> >> -{
> >> -	at91sam9261_rtt_device.name = "rtc-at91sam9";
> >> -	/*
> >> -	 * The second resource is needed:
> >> -	 * GPBR will serve as the storage for RTC time offset
> >> -	 */
> >> -	at91sam9261_rtt_device.num_resources = 3;
> >> -	rtt_resources[1].start = AT91SAM9261_BASE_GPBR +
> >> -				 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR;
> > 
> > This was the only place where the Kconfig symbol RTC_DRV_AT91SAM9_GPBR
> > was used. That again matches its help text:
> >     This option is only relevant for legacy board support and
> >     won't be used when booting a DT board.
> > 
> >> -	rtt_resources[1].end = rtt_resources[1].start + 3;
> >> -	rtt_resources[2].start = NR_IRQS_LEGACY + AT91_ID_SYS;
> >> -	rtt_resources[2].end = NR_IRQS_LEGACY + AT91_ID_SYS;
> >> -}
> >> -#else
> >> -static void __init at91_add_device_rtt_rtc(void)
> >> -{
> >> -	/* Only one resource is needed: RTT not used as RTC */
> >> -	at91sam9261_rtt_device.num_resources = 1;
> >> -}
> >> -#endif
> >> -
> >> -static void __init at91_add_device_rtt(void)
> >> -{
> >> -	at91_add_device_rtt_rtc();
> >> -	platform_device_register(&at91sam9261_rtt_device);
> >> -}
> > 
> > Is a patch to also remove that symbol from drivers/rtc/Kconfig queued
> > somewhere?
> 
> Yes, we are in the same situation as the at91sam9263. We will certainly
> remove them during the 3.19-rc phase.

This messages is to remind that there's still an entry for
RTC_DRV_AT91SAM9_GPBR in next-20141221 (and v3.19-rc1). So the cleanup
of that entry is still needed.

Thanks,


Paul Bolle