1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 14:09:22 +02:00
openwrt-xburst/target/linux/mpc83xx/patches-2.6.36/040-rbppc_nand-2.6.35.patch
acoul 6ea5dc3cca linux/mpc83xx: add preliminary 2.6.36 kernel support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23633 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-25 17:59:14 +00:00

41 lines
1.4 KiB
Diff

--- a/drivers/mtd/nand/rbppc_nand.c
+++ b/drivers/mtd/nand/rbppc_nand.c
@@ -130,10 +130,10 @@ static int rbppc_nand_probe(struct platf
info = kmalloc(sizeof(*info), GFP_KERNEL);
- rdy = of_get_property(pdev->node, "rdy", NULL);
- nce = of_get_property(pdev->node, "nce", NULL);
- cle = of_get_property(pdev->node, "cle", NULL);
- ale = of_get_property(pdev->node, "ale", NULL);
+ rdy = of_get_property(pdev->dev.of_node, "rdy", NULL);
+ nce = of_get_property(pdev->dev.of_node, "nce", NULL);
+ cle = of_get_property(pdev->dev.of_node, "cle", NULL);
+ ale = of_get_property(pdev->dev.of_node, "ale", NULL);
if (!rdy || !nce || !cle || !ale) {
printk(KERN_ERR "rbppc_nand_probe: GPIO properties are missing\n");
@@ -180,7 +180,7 @@ static int rbppc_nand_probe(struct platf
of_node_put(nnand);
info->localbus = ioremap_nocache(res.start, res.end - res.start + 1);
- if (of_address_to_resource(pdev->node, 0, &res)) {
+ if (of_address_to_resource(pdev->dev.of_node, 0, &res)) {
printk("rbppc_nand_probe: No reg property found\n");
goto err;
}
@@ -222,12 +222,11 @@ static struct of_device_id rbppc_nand_id
};
static struct of_platform_driver rbppc_nand_driver = {
- .name = "nand",
.probe = rbppc_nand_probe,
- .match_table = rbppc_nand_ids,
.driver = {
.name = "rbppc-nand",
.owner = THIS_MODULE,
+ .of_match_table = rbppc_nand_ids,
},
};