From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Paul Bolle <pebolle@tiscali.nl>,
Boris BREZILLON <boris.brezillon@free-electrons.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Valentin Rothberg <valentinrothberg@gmail.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
Ludovic Desroches <ludovic.desroches@atmel.com>
Subject: Re: [PATCH 1/4] ARM: at91: remove at91sam9263 legacy board support
Date: Mon, 1 Dec 2014 17:09:05 +0100 [thread overview]
Message-ID: <547C92A1.8000902@atmel.com> (raw)
In-Reply-To: <1417434775.30245.29.camel@x220>
Le 01/12/2014 12:52, Paul Bolle a écrit :
> On Wed, 2014-11-19 at 11:31 +0100, Nicolas Ferre wrote:
>> Remove legacy support for at91sam9rl 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
> 4403ac46edcd ("ARM: at91: remove at91sam9263 legacy board support").
>
>> arch/arm/configs/at91sam9263_defconfig | 151 ---
>> arch/arm/mach-at91/Kconfig.non_dt | 21 -
>> arch/arm/mach-at91/Makefile | 4 -
>> arch/arm/mach-at91/at91sam9263.c | 399 --------
>> arch/arm/mach-at91/at91sam9263_devices.c | 1538 ------------------------------
>> arch/arm/mach-at91/board-sam9263ek.c | 493 ----------
>> 6 files changed, 2606 deletions(-)
>> delete mode 100644 arch/arm/configs/at91sam9263_defconfig
>> delete mode 100644 arch/arm/mach-at91/at91sam9263_devices.c
>> delete mode 100644 arch/arm/mach-at91/board-sam9263ek.c
>>
>> [...]
>> diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
>> deleted file mode 100644
>> index cef0e2f57068..000000000000
>> --- a/arch/arm/mach-at91/at91sam9263_devices.c
>> +++ /dev/null
>> [...]
>> -/* --------------------------------------------------------------------
>> - * RTT
>> - * -------------------------------------------------------------------- */
>> -
>> -static struct resource rtt0_resources[] = {
>> - {
>> - .start = AT91SAM9263_BASE_RTT0,
>> - .end = AT91SAM9263_BASE_RTT0 + SZ_16 - 1,
>> - .flags = IORESOURCE_MEM,
>> - }, {
>> - .flags = IORESOURCE_MEM,
>> - }, {
>> - .flags = IORESOURCE_IRQ,
>> - }
>> -};
>> -
>> -static struct platform_device at91sam9263_rtt0_device = {
>> - .name = "at91_rtt",
>> - .id = 0,
>> - .resource = rtt0_resources,
>> -};
>> -
>> -static struct resource rtt1_resources[] = {
>> - {
>> - .start = AT91SAM9263_BASE_RTT1,
>> - .end = AT91SAM9263_BASE_RTT1 + SZ_16 - 1,
>> - .flags = IORESOURCE_MEM,
>> - }, {
>> - .flags = IORESOURCE_MEM,
>> - }, {
>> - .flags = IORESOURCE_IRQ,
>> - }
>> -};
>> -
>> -static struct platform_device at91sam9263_rtt1_device = {
>> - .name = "at91_rtt",
>> - .id = 1,
>> - .resource = rtt1_resources,
>> -};
>> -
>> -#if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
>> -static void __init at91_add_device_rtt_rtc(void)
>> -{
>> - struct platform_device *pdev;
>> - struct resource *r;
>> -
>> - switch (CONFIG_RTC_DRV_AT91SAM9_RTT) {
>
> This and...
>
>> - case 0:
>> - /*
>> - * The second resource is needed only for the chosen RTT:
>> - * GPBR will serve as the storage for RTC time offset
>> - */
>> - at91sam9263_rtt0_device.num_resources = 3;
>> - at91sam9263_rtt1_device.num_resources = 1;
>> - pdev = &at91sam9263_rtt0_device;
>> - r = rtt0_resources;
>> - break;
>> - case 1:
>> - at91sam9263_rtt0_device.num_resources = 1;
>> - at91sam9263_rtt1_device.num_resources = 3;
>> - pdev = &at91sam9263_rtt1_device;
>> - r = rtt1_resources;
>> - break;
>> - default:
>> - pr_err("at91sam9263: only supports 2 RTT (%d)\n",
>> - CONFIG_RTC_DRV_AT91SAM9_RTT);
>
> this are the only places were the Kconfig symbol RTC_DRV_AT91SAM9_RTT
> was used. It is useless now. That matches its help text, that reads:
> This option is only relevant for legacy board support and
> won't be used when booting a DT board.
>
>> - return;
>> - }
>> -
>> - pdev->name = "rtc-at91sam9";
>> - r[1].start = AT91SAM9263_BASE_GPBR + 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR;
>> - r[1].end = r[1].start + 3;
>> - r[2].start = NR_IRQS_LEGACY + AT91_ID_SYS;
>> - r[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 */
>> - at91sam9263_rtt0_device.num_resources = 1;
>> - at91sam9263_rtt1_device.num_resources = 1;
>> -}
>> -#endif
>> -
>> -static void __init at91_add_device_rtt(void)
>> -{
>> - at91_add_device_rtt_rtc();
>> - platform_device_register(&at91sam9263_rtt0_device);
>> - platform_device_register(&at91sam9263_rtt1_device);
>> -}
>
> Is a patch to remove that symbol from drivers/rtc/Kconfig queued
> somewhere?
Hi Paul,
In fact these config options are flagged as being useless for !DT. As
the modifications of this Kconfig (in a "drivers" branch) and the
removal of !DT boards (in a "cleaup" branch) will happen in 3.19, I was
planning to come back to these 2 options by removing them later in order
to avoid to solve a merge conflict.
https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/drivers/rtc/Kconfig?id=3969eb48ad7f3f3bef61f5474b7214e601fd2d75
As you can see in the commit above, they have been properly tagged by Boris.
So, I suggest to get rid of them during 3.19-rc phase.
Thanks, bye.
--
Nicolas Ferre
next prev parent reply other threads:[~2014-12-01 16:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-19 10:31 [PATCH 0/4] ARM: at91: remove !DT support for at91sam9260/9g20 and at91sam9263 Nicolas Ferre
2014-11-19 10:31 ` [PATCH 1/4] ARM: at91: remove at91sam9263 legacy board support Nicolas Ferre
2014-11-19 10:38 ` Nicolas Ferre
2014-12-01 11:52 ` Paul Bolle
2014-12-01 16:09 ` Nicolas Ferre [this message]
2014-12-22 9:28 ` Paul Bolle
2014-12-22 9:45 ` Alexandre Belloni
2015-01-05 11:16 ` Nicolas Ferre
2014-11-19 10:31 ` [PATCH 2/4] ARM: at91: remove at91sam9260/at91sam9g20 legacy boards files Nicolas Ferre
2014-11-19 10:31 ` [PATCH 3/4] ARM: at91: remove at91sam9260/at91sam9g20 legacy board support Nicolas Ferre
2014-12-01 11:55 ` Paul Bolle
2014-12-01 16:09 ` Arnd Bergmann
2014-11-19 10:31 ` [PATCH 4/4] ARM: at91/Kconfig: remove unused config options Nicolas Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=547C92A1.8000902@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=boris.brezillon@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@atmel.com \
--cc=pebolle@tiscali.nl \
--cc=plagnioj@jcrosoft.com \
--cc=valentinrothberg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).