summaryrefslogtreecommitdiff
path: root/target/linux/mpc83xx/patches-2.6.36/040-rbppc_nand-2.6.35.patch
diff options
context:
space:
mode:
authoracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-25 17:59:14 +0000
committeracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-25 17:59:14 +0000
commit6ea5dc3cca616142fa452ba04a5f1eeaeef92acf (patch)
tree907bdd48fa08e88a573a4b0780e535a1f669571d /target/linux/mpc83xx/patches-2.6.36/040-rbppc_nand-2.6.35.patch
parentf54f7b638efb1f2fb6cad1c00e25127a84a8b833 (diff)
linux/mpc83xx: add preliminary 2.6.36 kernel support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23633 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mpc83xx/patches-2.6.36/040-rbppc_nand-2.6.35.patch')
-rw-r--r--target/linux/mpc83xx/patches-2.6.36/040-rbppc_nand-2.6.35.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/mpc83xx/patches-2.6.36/040-rbppc_nand-2.6.35.patch b/target/linux/mpc83xx/patches-2.6.36/040-rbppc_nand-2.6.35.patch
new file mode 100644
index 0000000000..83ff0e7acf
--- /dev/null
+++ b/target/linux/mpc83xx/patches-2.6.36/040-rbppc_nand-2.6.35.patch
@@ -0,0 +1,40 @@
+--- 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,
+ },
+ };
+