From bff468813f78f81e36ebb2a3f4354de7365e640f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 14 Dec 2006 16:41:33 +0000 Subject: Upgrade to Linux 2.6.19 - Includes large parts of the patch from #1021 by dpalffy - Includes RB532 NAND driver changes by n0-1 SVN-Revision: 5789 --- target/linux/rb532-2.6/patches/120-cf.patch | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) (limited to '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 f12b0a910d..6c61aa7071 100644 --- 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 -@@ -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 , 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 @@ -162,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. @@ -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 -@@ -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 , 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__ + -- cgit v1.2.3