lkml.org 
[lkml]   [2012]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] ARM: at91/rtc-at91sam9: rework resources assignment
    On 21/02/12 01:45, Nicolas Ferre wrote:

    > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    > ---
    > Russell, Ryan,
    >
    > As I do think that these changes need explanation, here is my rework of Jean's
    > patch. I would like to know if the little comment and general rework of
    > resources assignment sound ok...
    >
    > I plan to merge this patch with the one discussed previously:
    > "[PATCH 13/18] ARM: at91/rtc-at91sam9: pass the GPBR to use via ressources"

    Thanks Nicolas,

    Reviewed-by: Ryan Mallon <rmallon@gmail.com>

    > If you agree, I will repost the whole series afterwards.
    >
    >
    > arch/arm/mach-at91/at91sam9260_devices.c | 13 ++++++++++---
    > arch/arm/mach-at91/at91sam9261_devices.c | 13 ++++++++++---
    > arch/arm/mach-at91/at91sam9263_devices.c | 22 ++++++++++++++++------
    > arch/arm/mach-at91/at91sam9g45_devices.c | 13 ++++++++++---
    > arch/arm/mach-at91/at91sam9rl_devices.c | 13 ++++++++++---
    > 5 files changed, 56 insertions(+), 18 deletions(-)
    >
    > diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
    > index f8a88fb..df487ce 100644
    > --- a/arch/arm/mach-at91/at91sam9260_devices.c
    > +++ b/arch/arm/mach-at91/at91sam9260_devices.c
    > @@ -727,7 +727,6 @@ static struct platform_device at91sam9260_rtt_device = {
    > .name = "at91_rtt",
    > .id = 0,
    > .resource = rtt_resources,
    > - .num_resources = 1,
    > };
    >
    >
    > @@ -735,13 +734,21 @@ static struct platform_device at91sam9260_rtt_device = {
    > static void __init at91_add_device_rtt_rtc(void)
    > {
    > at91sam9260_rtt_device.name = "rtc-at91sam9";
    > - at91sam9260_rtt_device.num_resources++;
    > + /*
    > + * The second resource is needed:
    > + * GPBR will serve as the storage for RTC time offset
    > + */
    > + at91sam9260_rtt_device.num_resources = 2;
    > rtt_resources[1].start = AT91SAM9260_BASE_GPBR +
    > 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR;
    > rtt_resources[1].end = rtt_resources[1].start + 3;
    > }
    > #else
    > -static void __init at91_add_device_rtt_rtc(void) {}
    > +static void __init at91_add_device_rtt_rtc(void)
    > +{
    > + /* Only one resource is needed: RTT not used as RTC */
    > + at91sam9260_rtt_device.num_resources = 1;
    > +}
    > #endif
    >
    > static void __init at91_add_device_rtt(void)
    > diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
    > index 32a20ef..3bd10ce 100644
    > --- a/arch/arm/mach-at91/at91sam9261_devices.c
    > +++ b/arch/arm/mach-at91/at91sam9261_devices.c
    > @@ -613,20 +613,27 @@ static struct platform_device at91sam9261_rtt_device = {
    > .name = "at91_rtt",
    > .id = 0,
    > .resource = rtt_resources,
    > - .num_resources = 1,
    > };
    >
    > #if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
    > static void __init at91_add_device_rtt_rtc(void)
    > {
    > at91sam9261_rtt_device.name = "rtc-at91sam9";
    > - at91sam9261_rtt_device.num_resources++;
    > + /*
    > + * The second resource is needed:
    > + * GPBR will serve as the storage for RTC time offset
    > + */
    > + at91sam9261_rtt_device.num_resources = 2;
    > rtt_resources[1].start = AT91SAM9261_BASE_GPBR +
    > 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR;
    > rtt_resources[1].end = rtt_resources[1].start + 3;
    > }
    > #else
    > -static void __init at91_add_device_rtt_rtc(void) {}
    > +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)
    > diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
    > index 28cb074..7792de5 100644
    > --- a/arch/arm/mach-at91/at91sam9263_devices.c
    > +++ b/arch/arm/mach-at91/at91sam9263_devices.c
    > @@ -976,7 +976,6 @@ static struct platform_device at91sam9263_rtt0_device = {
    > .name = "at91_rtt",
    > .id = 0,
    > .resource = rtt0_resources,
    > - .num_resources = 1,
    > };
    >
    > static struct resource rtt1_resources[] = {
    > @@ -993,7 +992,6 @@ static struct platform_device at91sam9263_rtt1_device = {
    > .name = "at91_rtt",
    > .id = 1,
    > .resource = rtt1_resources,
    > - .num_resources = 1,
    > };
    >
    > #if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
    > @@ -1004,26 +1002,38 @@ static void __init at91_add_device_rtt_rtc(void)
    >
    > switch (CONFIG_RTC_DRV_AT91SAM9_RTT) {
    > 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 = 2;
    > + 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 = 2;
    > pdev = &at91sam9263_rtt1_device;
    > r = rtt1_resources;
    > break;
    > default:
    > - pr_err("at91sam9263: support only 2 RTT (%d)\n",
    > + pr_err("at91sam9263: only supports 2 RTT (%d)\n",
    > CONFIG_RTC_DRV_AT91SAM9_RTT);
    > return;
    > }
    >
    > + pdev->name = "rtc-at91sam9";
    > 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++;
    > }
    > #else
    > -static void __init at91_add_device_rtt_rtc(void) {}
    > +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)
    > diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
    > index bb7e2ce..4108295 100644
    > --- a/arch/arm/mach-at91/at91sam9g45_devices.c
    > +++ b/arch/arm/mach-at91/at91sam9g45_devices.c
    > @@ -1203,20 +1203,27 @@ static struct platform_device at91sam9g45_rtt_device = {
    > .name = "at91_rtt",
    > .id = 0,
    > .resource = rtt_resources,
    > - .num_resources = 1,
    > };
    >
    > #if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
    > static void __init at91_add_device_rtt_rtc(void)
    > {
    > at91sam9g45_rtt_device.name = "rtc-at91sam9";
    > - at91sam9g45_rtt_device.num_resources++;
    > + /*
    > + * The second resource is needed:
    > + * GPBR will serve as the storage for RTC time offset
    > + */
    > + at91sam9g45_rtt_device.num_resources = 2;
    > rtt_resources[1].start = AT91SAM9G45_BASE_GPBR +
    > 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR;
    > rtt_resources[1].end = rtt_resources[1].start + 3;
    > }
    > #else
    > -static void __init at91_add_device_rtt_rtc(void) {}
    > +static void __init at91_add_device_rtt_rtc(void)
    > +{
    > + /* Only one resource is needed: RTT not used as RTC */
    > + at91sam9g45_rtt_device.num_resources = 1;
    > +}
    > #endif
    >
    > static void __init at91_add_device_rtt(void)
    > diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
    > index 16fd20b..eda72e8 100644
    > --- a/arch/arm/mach-at91/at91sam9rl_devices.c
    > +++ b/arch/arm/mach-at91/at91sam9rl_devices.c
    > @@ -692,20 +692,27 @@ static struct platform_device at91sam9rl_rtt_device = {
    > .name = "at91_rtt",
    > .id = 0,
    > .resource = rtt_resources,
    > - .num_resources = 1,
    > };
    >
    > #if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
    > static void __init at91_add_device_rtt_rtc(void)
    > {
    > at91sam9rl_rtt_device.name = "rtc-at91sam9";
    > - at91sam9rl_rtt_device.num_resources++;
    > + /*
    > + * The second resource is needed:
    > + * GPBR will serve as the storage for RTC time offset
    > + */
    > + at91sam9rl_rtt_device.num_resources = 2;
    > rtt_resources[1].start = AT91SAM9RL_BASE_GPBR +
    > 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR;
    > rtt_resources[1].end = rtt_resources[1].start + 3;
    > }
    > #else
    > -static void __init at91_add_device_rtt_rtc(void) {}
    > +static void __init at91_add_device_rtt_rtc(void)
    > +{
    > + /* Only one resource is needed: RTT not used as RTC */
    > + at91sam9rl_rtt_device.num_resources = 1;
    > +}
    > #endif
    >
    > static void __init at91_add_device_rtt(void)




    \
     
     \ /
      Last update: 2012-02-20 21:05    [W:0.045 / U:1.132 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site