[PATCH 13/18] ARM: at91/rtc-at91sam9: pass the GPBR to use via ressources
From: Ryan Mallon <hidden>
Date: 2012-02-20 00:43:52
Also in:
lkml
On 18/02/12 04:50, Nicolas Ferre wrote:
quoted hunk ↗ jump to hunk
From: Jean-Christophe PLAGNIOL-VILLARD <redacted> The GPBR registers are used for storing RTC values. The GPBR registers to use are now provided using standard resource entry. The array is filled in SoC specific code. rtc-at91sam9 RTT as RTC driver is modified to retrieve this information. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <redacted> Acked-by: Nicolas Ferre <redacted> --- arch/arm/mach-at91/at91sam9260_devices.c | 10 +++++++- arch/arm/mach-at91/at91sam9261_devices.c | 8 ++++++- arch/arm/mach-at91/at91sam9263_devices.c | 16 +++++++++++-- arch/arm/mach-at91/at91sam9g45_devices.c | 8 ++++++- arch/arm/mach-at91/at91sam9rl_devices.c | 8 ++++++- arch/arm/mach-at91/include/mach/at91sam9260.h | 5 +-- arch/arm/mach-at91/include/mach/at91sam9261.h | 5 +-- arch/arm/mach-at91/include/mach/at91sam9263.h | 5 +-- arch/arm/mach-at91/include/mach/at91sam9g45.h | 5 +-- arch/arm/mach-at91/include/mach/at91sam9rl.h | 2 +- drivers/rtc/rtc-at91sam9.c | 29 +++++++++++++++++++++--- 11 files changed, 76 insertions(+), 25 deletions(-)diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 2071017..ae2b648 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c@@ -718,14 +718,16 @@ static struct resource rtt_resources[] = { .start = AT91SAM9260_BASE_RTT, .end = AT91SAM9260_BASE_RTT + SZ_16 - 1, .flags = IORESOURCE_MEM, - } + }, { + .flags = IORESOURCE_MEM, + }, }; static struct platform_device at91sam9260_rtt_device = { .name = "at91_rtt", .id = 0, .resource = rtt_resources, - .num_resources = ARRAY_SIZE(rtt_resources), + .num_resources = 1,
Why this change? The device has two resources, and the rtc driver request both of them, so why are you saying there is only one resource here. It either needs to be changed back to use ARRAY_SIZE, or needs a comment explaining what magic is in use. <snip>
#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) {
case 0:
pdev = &at91sam9263_rtt0_device;
+ r = rtt0_resources;
break;
case 1:
pdev = &at91sam9263_rtt1_device;
+ r = rtt1_resources;
break;
default:
pr_err("at91sam9263: support only 2 RTT (%d)\n",
- CONFIG_RTC_DRV_AT91SAM9_RTT);
+ CONFIG_RTC_DRV_AT91SAM9_RTT);
return;
}+ r[1].start = AT91SAM9263_BASE_GPBR + 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR; + r[1].end = r[1].start + 3; pdev->name = "rtc-at91sam9"; + pdev->num_resources++;
Okay, makes a little more sense now. I really think it needs a comment explaining how the resources are being managed, since it is a bit non-obvious. Also, can only one of the RTT's can be used as an RTC at a time? ~Ryan