fix up remaining parts for the brcm47xx-2.6 port (tested on wgt634u), nuke the old...

[openwrt.git] / target / linux / rb532-2.6 / patches / 120-cf.patch

diff --git a/target/linux/rb532-2.6/patches/120-cf.patch b/target/linux/rb532-2.6/patches/120-cf.patch
index f12b0a9..f702753 100644 (file)
--- a/target/linux/rb532-2.6/patches/120-cf.patch
+++ b/target/linux/rb532-2.6/patches/120-cf.patch
@@ -26,7 +26,18 @@ diff -urN linux.old/drivers/block/Makefile linux.dev/drivers/block/Makefile
 diff -urN linux.old/drivers/block/rb500/ata.c linux.dev/drivers/block/rb500/ata.c
 --- linux.old/drivers/block/rb500/ata.c        1970-01-01 01:00:00.000000000 +0100
 +++ linux.dev/drivers/block/rb500/ata.c        2006-10-26 00:11:14.000000000 +0200
 diff -urN linux.old/drivers/block/rb500/ata.c linux.dev/drivers/block/rb500/ata.c
 --- linux.old/drivers/block/rb500/ata.c        1970-01-01 01:00:00.000000000 +0100
 +++ linux.dev/drivers/block/rb500/ata.c        2006-10-26 00:11:14.000000000 +0200

-@@ -0,0 +1,474 @@
+@@ -0,0 +1,485 @@
++/* CF-mips driver
++   This is a block driver for the direct (mmaped) interface to the CF-slot,
++   found in Routerboard.com's RB532 board
++   See SDK provided from routerboard.com.
++   
++   Module adapted By P.Christeas <p_christeas@yahoo.com>, 2005-6.
++   Cleaned up and adapted to platform_device by Felix Fietkau <nbd@openwrt.org>
++
++   This work is redistributed under the terms of the GNU General Public License.
++*/
++

 +#include <linux/kernel.h>     /* printk() */
 +#include <linux/module.h>     /* module to be loadable */
 +#include <linux/delay.h>
 +#include <linux/kernel.h>     /* printk() */
 +#include <linux/module.h>     /* module to be loadable */
 +#include <linux/delay.h>


@@ -162,7 +173,7 @@ diff -urN linux.old/drivers/block/rb500/ata.c linux.dev/drivers/block/rb500/ata.
 +      return CF_TRANS_FAILED;
 +}
 +
 +      return CF_TRANS_FAILED;
 +}
 +

-+static irqreturn_t cf_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
++static irqreturn_t cf_irq_handler(int irq, void *dev_id)

 +{
 +      /* While tasklet has not disabled irq, irq will be retried all the time
 +       * because of ILEVEL matching GPIO pin status => deadlock.
 +{
 +      /* While tasklet has not disabled irq, irq will be retried all the time
 +       * because of ILEVEL matching GPIO pin status => deadlock.


@@ -504,7 +515,18 @@ diff -urN linux.old/drivers/block/rb500/ata.c linux.dev/drivers/block/rb500/ata.
 diff -urN linux.old/drivers/block/rb500/ata.h linux.dev/drivers/block/rb500/ata.h
 --- linux.old/drivers/block/rb500/ata.h        1970-01-01 01:00:00.000000000 +0100
 +++ linux.dev/drivers/block/rb500/ata.h        2006-10-26 00:11:14.000000000 +0200
 diff -urN linux.old/drivers/block/rb500/ata.h linux.dev/drivers/block/rb500/ata.h
 --- linux.old/drivers/block/rb500/ata.h        1970-01-01 01:00:00.000000000 +0100
 +++ linux.dev/drivers/block/rb500/ata.h        2006-10-26 00:11:14.000000000 +0200

-@@ -0,0 +1,132 @@
+@@ -0,0 +1,143 @@
++/* CF-mips driver
++   This is a block driver for the direct (mmaped) interface to the CF-slot,
++   found in Routerboard.com's RB532 board
++   See SDK provided from routerboard.com.
++   
++   Module adapted By P.Christeas <p_christeas@yahoo.com>, 2005-6.
++   Cleaned up and adapted to platform_device by Felix Fietkau <nbd@openwrt.org>
++
++   This work is redistributed under the terms of the GNU General Public License.
++*/
++

 +#ifndef __CFMIPS_ATA_H__
 +#define __CFMIPS_ATA_H__
 +
 +#ifndef __CFMIPS_ATA_H__
 +#define __CFMIPS_ATA_H__
 +


@@ -640,7 +662,7 @@ diff -urN linux.old/drivers/block/rb500/ata.h linux.dev/drivers/block/rb500/ata.
 diff -urN linux.old/drivers/block/rb500/bdev.c linux.dev/drivers/block/rb500/bdev.c
 --- linux.old/drivers/block/rb500/bdev.c       1970-01-01 01:00:00.000000000 +0100
 +++ linux.dev/drivers/block/rb500/bdev.c       2006-10-26 00:11:14.000000000 +0200
 diff -urN linux.old/drivers/block/rb500/bdev.c linux.dev/drivers/block/rb500/bdev.c
 --- linux.old/drivers/block/rb500/bdev.c       1970-01-01 01:00:00.000000000 +0100
 +++ linux.dev/drivers/block/rb500/bdev.c       2006-10-26 00:11:14.000000000 +0200

-@@ -0,0 +1,340 @@
+@@ -0,0 +1,339 @@

 +/* CF-mips driver
 +   This is a block driver for the direct (mmaped) interface to the CF-slot,
 +   found in Routerboard.com's RB532 board
 +/* CF-mips driver
 +   This is a block driver for the direct (mmaped) interface to the CF-slot,
 +   found in Routerboard.com's RB532 board


@@ -776,7 +798,6 @@ diff -urN linux.old/drivers/block/rb500/bdev.c linux.dev/drivers/block/rb500/bde
 +      cf_gendisk->queue=dev->queue;
 +      BUG_ON(cf_gendisk->minors != CF_MAX_PART);
 +      strcpy(cf_gendisk->disk_name,"cfa");
 +      cf_gendisk->queue=dev->queue;
 +      BUG_ON(cf_gendisk->minors != CF_MAX_PART);
 +      strcpy(cf_gendisk->disk_name,"cfa");

-+      strcpy(cf_gendisk->devfs_name,"cf/card0");

 +      cf_gendisk->fops = &cf_bdops;
 +      cf_gendisk->flags = 0 ; /* is not yet GENHD_FL_REMOVABLE */
 +      cf_gendisk->private_data=dev;
 +      cf_gendisk->fops = &cf_bdops;
 +      cf_gendisk->flags = 0 ; /* is not yet GENHD_FL_REMOVABLE */
 +      cf_gendisk->private_data=dev;