summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-mpc5121.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-06-02 14:06:09 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-06-02 14:06:09 -0600
commit295bdd9c52e57daf995fe80eff8c53938443fa2f (patch)
tree42b3d5bfc666cadca64190f5290581b4f892e9df /drivers/rtc/rtc-mpc5121.c
parentb4a75c91b8a6cb80ba7772f69613025ddf75ebc2 (diff)
downloadblackbird-op-linux-295bdd9c52e57daf995fe80eff8c53938443fa2f.tar.gz
blackbird-op-linux-295bdd9c52e57daf995fe80eff8c53938443fa2f.zip
of/rtc: rtc-mpc5121.c: Fix build failures
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Grant Likely <grant.likely@secretlab.ca> CC: Paul Gortmaker <p_gortmaker@yahoo.com> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Wolfgang Denk <wd@denx.de> CC: Tejun Heo <tj@kernel.org> CC: Anatolij Gustschin <agust@denx.de> CC: rtc-linux@googlegroups.com CC: devicetree-discuss@lists.ozlabs.org
Diffstat (limited to 'drivers/rtc/rtc-mpc5121.c')
-rw-r--r--drivers/rtc/rtc-mpc5121.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
index f0dbf9cb8f9c..db5d8c416d26 100644
--- a/drivers/rtc/rtc-mpc5121.c
+++ b/drivers/rtc/rtc-mpc5121.c
@@ -279,7 +279,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op,
if (!rtc)
return -ENOMEM;
- rtc->regs = of_iomap(op->node, 0);
+ rtc->regs = of_iomap(op->dev.of_node, 0);
if (!rtc->regs) {
dev_err(&op->dev, "%s: couldn't map io space\n", __func__);
err = -ENOSYS;
@@ -290,7 +290,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op,
dev_set_drvdata(&op->dev, rtc);
- rtc->irq = irq_of_parse_and_map(op->node, 1);
+ rtc->irq = irq_of_parse_and_map(op->dev.of_node, 1);
err = request_irq(rtc->irq, mpc5121_rtc_handler, IRQF_DISABLED,
"mpc5121-rtc", &op->dev);
if (err) {
@@ -299,7 +299,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op,
goto out_dispose;
}
- rtc->irq_periodic = irq_of_parse_and_map(op->node, 0);
+ rtc->irq_periodic = irq_of_parse_and_map(op->dev.of_node, 0);
err = request_irq(rtc->irq_periodic, mpc5121_rtc_handler_upd,
IRQF_DISABLED, "mpc5121-rtc_upd", &op->dev);
if (err) {
@@ -365,9 +365,11 @@ static struct of_device_id mpc5121_rtc_match[] __devinitdata = {
};
static struct of_platform_driver mpc5121_rtc_driver = {
- .owner = THIS_MODULE,
- .name = "mpc5121-rtc",
- .match_table = mpc5121_rtc_match,
+ .driver = {
+ .name = "mpc5121-rtc",
+ .owner = THIS_MODULE,
+ .of_match_table = mpc5121_rtc_match,
+ },
.probe = mpc5121_rtc_probe,
.remove = __devexit_p(mpc5121_rtc_remove),
};
OpenPOWER on IntegriCloud