Commit 205056a3 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre

ARM: at91/rtc-at91sam9: each SoC can select the RTT device to use

For the RTT as RTC driver rtc-at91sam9, the platform_device structure
is filled during SoC initialization. This will allow to convert this
RTC driver as a standard platform driver.
Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent b5514952
...@@ -728,8 +728,19 @@ static struct platform_device at91sam9260_rtt_device = { ...@@ -728,8 +728,19 @@ static struct platform_device at91sam9260_rtt_device = {
.num_resources = ARRAY_SIZE(rtt_resources), .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) static void __init at91_add_device_rtt(void)
{ {
at91_add_device_rtt_rtc();
platform_device_register(&at91sam9260_rtt_device); platform_device_register(&at91sam9260_rtt_device);
} }
......
...@@ -614,8 +614,18 @@ static struct platform_device at91sam9261_rtt_device = { ...@@ -614,8 +614,18 @@ static struct platform_device at91sam9261_rtt_device = {
.num_resources = ARRAY_SIZE(rtt_resources), .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) static void __init at91_add_device_rtt(void)
{ {
at91_add_device_rtt_rtc();
platform_device_register(&at91sam9261_rtt_device); platform_device_register(&at91sam9261_rtt_device);
} }
......
...@@ -992,8 +992,33 @@ static struct platform_device at91sam9263_rtt1_device = { ...@@ -992,8 +992,33 @@ static struct platform_device at91sam9263_rtt1_device = {
.num_resources = ARRAY_SIZE(rtt1_resources), .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) static void __init at91_add_device_rtt(void)
{ {
at91_add_device_rtt_rtc();
platform_device_register(&at91sam9263_rtt0_device); platform_device_register(&at91sam9263_rtt0_device);
platform_device_register(&at91sam9263_rtt1_device); platform_device_register(&at91sam9263_rtt1_device);
} }
......
...@@ -1204,8 +1204,18 @@ static struct platform_device at91sam9g45_rtt_device = { ...@@ -1204,8 +1204,18 @@ static struct platform_device at91sam9g45_rtt_device = {
.num_resources = ARRAY_SIZE(rtt_resources), .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) static void __init at91_add_device_rtt(void)
{ {
at91_add_device_rtt_rtc();
platform_device_register(&at91sam9g45_rtt_device); platform_device_register(&at91sam9g45_rtt_device);
} }
......
...@@ -693,8 +693,18 @@ static struct platform_device at91sam9rl_rtt_device = { ...@@ -693,8 +693,18 @@ static struct platform_device at91sam9rl_rtt_device = {
.num_resources = ARRAY_SIZE(rtt_resources), .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) static void __init at91_add_device_rtt(void)
{ {
at91_add_device_rtt_rtc();
platform_device_register(&at91sam9rl_rtt_device); platform_device_register(&at91sam9rl_rtt_device);
} }
......
...@@ -287,7 +287,7 @@ static const struct rtc_class_ops at91_rtc_ops = { ...@@ -287,7 +287,7 @@ static const struct rtc_class_ops at91_rtc_ops = {
/* /*
* Initialize and install RTC driver * 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 resource *r;
struct sam9_rtc *rtc; struct sam9_rtc *rtc;
...@@ -360,7 +360,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev) ...@@ -360,7 +360,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
/* /*
* Disable and remove the RTC driver * 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); struct sam9_rtc *rtc = platform_get_drvdata(pdev);
u32 mr = rtt_readl(rtc, MR); u32 mr = rtt_readl(rtc, MR);
...@@ -433,63 +433,20 @@ static int at91_rtc_resume(struct platform_device *pdev) ...@@ -433,63 +433,20 @@ static int at91_rtc_resume(struct platform_device *pdev)
#endif #endif
static struct platform_driver at91_rtc_driver = { static struct platform_driver at91_rtc_driver = {
.driver.name = "rtc-at91sam9", .probe = at91_rtc_probe,
.driver.owner = THIS_MODULE, .remove = __devexit_p(at91_rtc_remove),
.remove = __exit_p(at91_rtc_remove),
.shutdown = at91_rtc_shutdown, .shutdown = at91_rtc_shutdown,
.suspend = at91_rtc_suspend, .suspend = at91_rtc_suspend,
.resume = at91_rtc_resume, .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) static int __init at91_rtc_init(void)
{ {
int status; return platform_driver_register(&at91_rtc_driver);
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;
} }
module_init(at91_rtc_init); module_init(at91_rtc_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment