X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f52d66ff00b24111f87c274d3d7085ef2e1d27b1..0ce535a68e77bc9e7da7bcb21c4f0ac08f37ec8d:/target/linux/rb532-2.6/patches/120-cf.patch?ds=sidebyside diff --git a/target/linux/rb532-2.6/patches/120-cf.patch b/target/linux/rb532-2.6/patches/120-cf.patch index 657d8157d..f702753c7 100644 --- a/target/linux/rb532-2.6/patches/120-cf.patch +++ b/target/linux/rb532-2.6/patches/120-cf.patch @@ -1,7 +1,7 @@ diff -urN linux.old/drivers/block/Kconfig linux.dev/drivers/block/Kconfig ---- linux.old/drivers/block/Kconfig 2006-06-08 20:20:52.000000000 +0200 -+++ linux.dev/drivers/block/Kconfig 2006-06-08 22:14:58.000000000 +0200 -@@ -453,4 +453,12 @@ +--- linux.old/drivers/block/Kconfig 2006-10-26 02:43:39.000000000 +0200 ++++ linux.dev/drivers/block/Kconfig 2006-10-26 00:11:14.000000000 +0200 +@@ -456,4 +456,12 @@ This driver provides Support for ATA over Ethernet block devices like the Coraid EtherDrive (R) Storage Blade. @@ -14,10 +14,30 @@ diff -urN linux.old/drivers/block/Kconfig linux.dev/drivers/block/Kconfig + device driver for it. + endmenu +diff -urN linux.old/drivers/block/Makefile linux.dev/drivers/block/Makefile +--- linux.old/drivers/block/Makefile 2006-06-18 03:49:35.000000000 +0200 ++++ linux.dev/drivers/block/Makefile 2006-10-26 02:44:10.000000000 +0200 +@@ -29,4 +29,5 @@ + obj-$(CONFIG_VIODASD) += viodasd.o + obj-$(CONFIG_BLK_DEV_SX8) += sx8.o + obj-$(CONFIG_BLK_DEV_UB) += ub.o ++obj-$(CONFIG_BLK_DEV_CF_MIPS) += rb500/ + 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-06-09 01:58:40.000000000 +0200 -@@ -0,0 +1,474 @@ ++++ linux.dev/drivers/block/rb500/ata.c 2006-10-26 00:11:14.000000000 +0200 +@@ -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 , 2005-6. ++ Cleaned up and adapted to platform_device by Felix Fietkau ++ ++ This work is redistributed under the terms of the GNU General Public License. ++*/ ++ +#include /* printk() */ +#include /* module to be loadable */ +#include @@ -153,7 +173,7 @@ diff -urN linux.old/drivers/block/rb500/ata.c linux.dev/drivers/block/rb500/ata. + 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. @@ -494,8 +514,19 @@ diff -urN linux.old/drivers/block/rb500/ata.c linux.dev/drivers/block/rb500/ata. +/*eof*/ 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-06-09 00:15:23.000000000 +0200 -@@ -0,0 +1,132 @@ ++++ linux.dev/drivers/block/rb500/ata.h 2006-10-26 00:11:14.000000000 +0200 +@@ -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 , 2005-6. ++ Cleaned up and adapted to platform_device by Felix Fietkau ++ ++ This work is redistributed under the terms of the GNU General Public License. ++*/ ++ +#ifndef __CFMIPS_ATA_H__ +#define __CFMIPS_ATA_H__ + @@ -630,8 +661,8 @@ diff -urN linux.old/drivers/block/rb500/ata.h linux.dev/drivers/block/rb500/ata. +#endif 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-06-15 16:29:04.000000000 +0200 -@@ -0,0 +1,340 @@ ++++ linux.dev/drivers/block/rb500/bdev.c 2006-10-26 00:11:14.000000000 +0200 +@@ -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 @@ -767,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"); -+ 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; @@ -974,17 +1004,8 @@ diff -urN linux.old/drivers/block/rb500/bdev.c linux.dev/drivers/block/rb500/bde + diff -urN linux.old/drivers/block/rb500/Makefile linux.dev/drivers/block/rb500/Makefile --- linux.old/drivers/block/rb500/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux.dev/drivers/block/rb500/Makefile 2006-06-08 22:14:58.000000000 +0200 ++++ linux.dev/drivers/block/rb500/Makefile 2006-10-26 00:11:14.000000000 +0200 @@ -0,0 +1,3 @@ +## Makefile for the RB532 CF port + +obj-y += bdev.o ata.o -diff -urN linux.old/drivers/Makefile linux.dev/drivers/Makefile ---- linux.old/drivers/Makefile 2006-06-08 20:20:52.000000000 +0200 -+++ linux.dev/drivers/Makefile 2006-06-08 22:14:58.000000000 +0200 -@@ -73,3 +73,4 @@ - obj-y += firmware/ - obj-$(CONFIG_CRYPTO) += crypto/ - obj-$(CONFIG_SUPERH) += sh/ -+obj-$(CONFIG_BLK_DEV_CF_MIPS) += block/rb500/ -\ No newline at end of file