diff options
| author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-25 17:59:14 +0000 |
|---|---|---|
| committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-25 17:59:14 +0000 |
| commit | 6ea5dc3cca616142fa452ba04a5f1eeaeef92acf (patch) | |
| tree | 907bdd48fa08e88a573a4b0780e535a1f669571d /target/linux/mpc83xx/patches-2.6.36/041-rbppc_cf-2.6.35.patch | |
| parent | f54f7b638efb1f2fb6cad1c00e25127a84a8b833 (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/041-rbppc_cf-2.6.35.patch')
| -rw-r--r-- | target/linux/mpc83xx/patches-2.6.36/041-rbppc_cf-2.6.35.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/target/linux/mpc83xx/patches-2.6.36/041-rbppc_cf-2.6.35.patch b/target/linux/mpc83xx/patches-2.6.36/041-rbppc_cf-2.6.35.patch new file mode 100644 index 0000000000..dd5215d36a --- /dev/null +++ b/target/linux/mpc83xx/patches-2.6.36/041-rbppc_cf-2.6.35.patch @@ -0,0 +1,60 @@ +--- a/drivers/ata/pata_rbppc_cf.c ++++ b/drivers/ata/pata_rbppc_cf.c +@@ -522,7 +522,7 @@ static int rbppc_cf_init_info(struct pla + unsigned ccb_freq_hz; + unsigned lb_div; + +- u32ptr = of_get_property(pdev->node, "lbc_extra_divider", NULL); ++ u32ptr = of_get_property(pdev->dev.of_node, "lbc_extra_divider", NULL); + if (u32ptr && *u32ptr) { + lbc_extra_divider = *u32ptr; + #if DEBUG_UPM +@@ -568,7 +568,7 @@ static int rbppc_cf_init_info(struct pla + printk(KERN_INFO "rbppc_cf_init_info: Using Local-Bus clock %u kHz %u ps\n", + lbc_clk_khz, info->clk_time_ps); + +- u32ptr = of_get_property(pdev->node, "lb-timings", NULL); ++ u32ptr = of_get_property(pdev->dev.of_node, "lb-timings", NULL); + if (u32ptr) { + memcpy(info->lb_timings, u32ptr, LBT_SIZE * sizeof(*u32ptr)); + #if DEBUG_UPM +@@ -608,13 +608,13 @@ static int rbppc_cf_probe(struct platfor + rbinfo = info; + } + +- u32ptr = of_get_property(pdev->node, "interrupt-at-level", NULL); ++ u32ptr = of_get_property(pdev->dev.of_node, "interrupt-at-level", NULL); + if (u32ptr) { + irq_level = *u32ptr; + printk(KERN_INFO "rbppc_cf_probe: IRQ level %u\n", irq_level); + } + +- if (of_address_to_resource(pdev->node, 0, &res)) { ++ if (of_address_to_resource(pdev->dev.of_node, 0, &res)) { + printk(KERN_ERR "rbppc_cf_probe: No reg property found\n"); + goto err_info; + } +@@ -641,7 +641,7 @@ static int rbppc_cf_probe(struct platfor + + err = ata_host_activate( + host, +- irq_of_parse_and_map(pdev->node, 0), ata_sff_interrupt, ++ irq_of_parse_and_map(pdev->dev.of_node, 0), ata_sff_interrupt, + irq_level ? IRQF_TRIGGER_HIGH : IRQF_TRIGGER_LOW, + &rbppc_cf_sht); + if (!err) return 0; +@@ -672,13 +672,12 @@ static struct of_device_id rbppc_cf_ids[ + }; + + static struct of_platform_driver rbppc_cf_driver = { +- .name = "cf", + .probe = rbppc_cf_probe, + .remove = rbppc_cf_remove, +- .match_table = rbppc_cf_ids, + .driver = { + .name = "rbppc-cf", + .owner = THIS_MODULE, ++ .of_match_table = rbppc_cf_ids, + }, + }; + |