Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296176
b: refs/heads/master
c: 205056a
h: refs/heads/master
v: v3
  • Loading branch information
Jean-Christophe PLAGNIOL-VILLARD authored and Nicolas Ferre committed Feb 23, 2012
1 parent 8a7ed82 commit 2a05f96
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 53 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b55149529d265718a989b67468c4f03de0d3af7a
refs/heads/master: 205056a3ea33f5aca7adffa4584eb6572b1d3273
11 changes: 11 additions & 0 deletions trunk/arch/arm/mach-at91/at91sam9260_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -728,8 +728,19 @@ static struct platform_device at91sam9260_rtt_device = {
.num_resources = ARRAY_SIZE(rtt_resources),
};


#if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
static void __init at91_add_device_rtt_rtc(void)
{
at91sam9260_rtt_device.name = "rtc-at91sam9";
}
#else
static void __init at91_add_device_rtt_rtc(void) {}
#endif

static void __init at91_add_device_rtt(void)
{
at91_add_device_rtt_rtc();
platform_device_register(&at91sam9260_rtt_device);
}

Expand Down
10 changes: 10 additions & 0 deletions trunk/arch/arm/mach-at91/at91sam9261_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,18 @@ static struct platform_device at91sam9261_rtt_device = {
.num_resources = ARRAY_SIZE(rtt_resources),
};

#if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
static void __init at91_add_device_rtt_rtc(void)
{
at91sam9261_rtt_device.name = "rtc-at91sam9";
}
#else
static void __init at91_add_device_rtt_rtc(void) {}
#endif

static void __init at91_add_device_rtt(void)
{
at91_add_device_rtt_rtc();
platform_device_register(&at91sam9261_rtt_device);
}

Expand Down
25 changes: 25 additions & 0 deletions trunk/arch/arm/mach-at91/at91sam9263_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -992,8 +992,33 @@ static struct platform_device at91sam9263_rtt1_device = {
.num_resources = ARRAY_SIZE(rtt1_resources),
};

#if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
static void __init at91_add_device_rtt_rtc(void)
{
struct platform_device *pdev;

switch (CONFIG_RTC_DRV_AT91SAM9_RTT) {
case 0:
pdev = &at91sam9263_rtt0_device;
break;
case 1:
pdev = &at91sam9263_rtt1_device;
break;
default:
pr_err("at91sam9263: support only 2 RTT (%d)\n",
CONFIG_RTC_DRV_AT91SAM9_RTT);
return;
}

pdev->name = "rtc-at91sam9";
}
#else
static void __init at91_add_device_rtt_rtc(void) {}
#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);
}
Expand Down
10 changes: 10 additions & 0 deletions trunk/arch/arm/mach-at91/at91sam9g45_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -1204,8 +1204,18 @@ static struct platform_device at91sam9g45_rtt_device = {
.num_resources = ARRAY_SIZE(rtt_resources),
};

#if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
static void __init at91_add_device_rtt_rtc(void)
{
at91sam9g45_rtt_device.name = "rtc-at91sam9";
}
#else
static void __init at91_add_device_rtt_rtc(void) {}
#endif

static void __init at91_add_device_rtt(void)
{
at91_add_device_rtt_rtc();
platform_device_register(&at91sam9g45_rtt_device);
}

Expand Down
10 changes: 10 additions & 0 deletions trunk/arch/arm/mach-at91/at91sam9rl_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -693,8 +693,18 @@ static struct platform_device at91sam9rl_rtt_device = {
.num_resources = ARRAY_SIZE(rtt_resources),
};

#if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
static void __init at91_add_device_rtt_rtc(void)
{
at91sam9rl_rtt_device.name = "rtc-at91sam9";
}
#else
static void __init at91_add_device_rtt_rtc(void) {}
#endif

static void __init at91_add_device_rtt(void)
{
at91_add_device_rtt_rtc();
platform_device_register(&at91sam9rl_rtt_device);
}

Expand Down
61 changes: 9 additions & 52 deletions trunk/drivers/rtc/rtc-at91sam9.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ static const struct rtc_class_ops at91_rtc_ops = {
/*
* Initialize and install RTC driver
*/
static int __init at91_rtc_probe(struct platform_device *pdev)
static int __devinit at91_rtc_probe(struct platform_device *pdev)
{
struct resource *r;
struct sam9_rtc *rtc;
Expand Down Expand Up @@ -360,7 +360,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
/*
* Disable and remove the RTC driver
*/
static int __exit at91_rtc_remove(struct platform_device *pdev)
static int __devexit at91_rtc_remove(struct platform_device *pdev)
{
struct sam9_rtc *rtc = platform_get_drvdata(pdev);
u32 mr = rtt_readl(rtc, MR);
Expand Down Expand Up @@ -433,63 +433,20 @@ static int at91_rtc_resume(struct platform_device *pdev)
#endif

static struct platform_driver at91_rtc_driver = {
.driver.name = "rtc-at91sam9",
.driver.owner = THIS_MODULE,
.remove = __exit_p(at91_rtc_remove),
.probe = at91_rtc_probe,
.remove = __devexit_p(at91_rtc_remove),
.shutdown = at91_rtc_shutdown,
.suspend = at91_rtc_suspend,
.resume = at91_rtc_resume,
.driver = {
.name = "rtc-at91sam9",
.owner = THIS_MODULE,
},
};

/* Chips can have more than one RTT module, and they can be used for more
* than just RTCs. So we can't just register as "the" RTT driver.
*
* A normal approach in such cases is to create a library to allocate and
* free the modules. Here we just use bus_find_device() as like such a
* library, binding directly ... no runtime "library" footprint is needed.
*/
static int __init at91_rtc_match(struct device *dev, void *v)
{
struct platform_device *pdev = to_platform_device(dev);
int ret;

/* continue searching if this isn't the RTT we need */
if (strcmp("at91_rtt", pdev->name) != 0
|| pdev->id != CONFIG_RTC_DRV_AT91SAM9_RTT)
goto fail;

/* else we found it ... but fail unless we can bind to the RTC driver */
if (dev->driver) {
dev_dbg(dev, "busy, can't use as RTC!\n");
goto fail;
}
dev->driver = &at91_rtc_driver.driver;
if (device_attach(dev) == 0) {
dev_dbg(dev, "can't attach RTC!\n");
goto fail;
}
ret = at91_rtc_probe(pdev);
if (ret == 0)
return true;

dev_dbg(dev, "RTC probe err %d!\n", ret);
fail:
return false;
}

static int __init at91_rtc_init(void)
{
int status;
struct device *rtc;

status = platform_driver_register(&at91_rtc_driver);
if (status)
return status;
rtc = bus_find_device(&platform_bus_type, NULL,
NULL, at91_rtc_match);
if (!rtc)
platform_driver_unregister(&at91_rtc_driver);
return rtc ? 0 : -ENODEV;
return platform_driver_register(&at91_rtc_driver);
}
module_init(at91_rtc_init);

Expand Down

0 comments on commit 2a05f96

Please sign in to comment.