aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rdc
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-05-24 20:35:46 +0000
committerNicolas Thill <nico@openwrt.org>2010-05-24 20:35:46 +0000
commit46e2eea1efc7037bf730d9885c3991be00c9b451 (patch)
treea0b05252bde69edc60654abd103ce0a2cdea830a /target/linux/rdc
parenta93571825f040d24c12c6071dab32a5d98018091 (diff)
downloadupstream-46e2eea1efc7037bf730d9885c3991be00c9b451.tar.gz
upstream-46e2eea1efc7037bf730d9885c3991be00c9b451.tar.bz2
upstream-46e2eea1efc7037bf730d9885c3991be00c9b451.zip
target/linux: refresh 2.6.32 patches
SVN-Revision: 21566
Diffstat (limited to 'target/linux/rdc')
-rw-r--r--target/linux/rdc/patches-2.6.32/001-rdc321x_mfd_southbridge.patch28
-rw-r--r--target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch22
-rw-r--r--target/linux/rdc/patches-2.6.32/003-rdc321x_watchdog_southbridge.patch20
-rw-r--r--target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch14
-rw-r--r--target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch8
-rw-r--r--target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch36
-rw-r--r--target/linux/rdc/patches-2.6.32/100-rdc_boards.patch1
7 files changed, 52 insertions, 77 deletions
diff --git a/target/linux/rdc/patches-2.6.32/001-rdc321x_mfd_southbridge.patch b/target/linux/rdc/patches-2.6.32/001-rdc321x_mfd_southbridge.patch
index df75563353..8aed071e30 100644
--- a/target/linux/rdc/patches-2.6.32/001-rdc321x_mfd_southbridge.patch
+++ b/target/linux/rdc/patches-2.6.32/001-rdc321x_mfd_southbridge.patch
@@ -11,11 +11,9 @@ Changes from v2:
- removed pci_dev accessors
- use DEFINE_PCI_DEVICE_TABLE
-Index: linux-2.6.32.10/drivers/mfd/Kconfig
-===================================================================
---- linux-2.6.32.10.orig/drivers/mfd/Kconfig 2010-03-15 16:52:04.000000000 +0100
-+++ linux-2.6.32.10/drivers/mfd/Kconfig 2010-05-15 21:48:27.000000000 +0200
-@@ -305,6 +305,15 @@
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -305,6 +305,15 @@ config EZX_PCAP
This enables the PCAP ASIC present on EZX Phones. This is
needed for MMC, TouchScreen, Sound, USB, etc..
@@ -31,20 +29,16 @@ Index: linux-2.6.32.10/drivers/mfd/Kconfig
endmenu
menu "Multimedia Capabilities Port drivers"
-Index: linux-2.6.32.10/drivers/mfd/Makefile
-===================================================================
---- linux-2.6.32.10.orig/drivers/mfd/Makefile 2010-03-15 16:52:04.000000000 +0100
-+++ linux-2.6.32.10/drivers/mfd/Makefile 2010-05-15 21:48:27.000000000 +0200
-@@ -50,3 +50,5 @@
+--- a/drivers/mfd/Makefile
++++ b/drivers/mfd/Makefile
+@@ -50,3 +50,5 @@ obj-$(CONFIG_PCF50633_ADC) += pcf50633-a
obj-$(CONFIG_PCF50633_GPIO) += pcf50633-gpio.o
obj-$(CONFIG_AB3100_CORE) += ab3100-core.o
obj-$(CONFIG_AB3100_OTP) += ab3100-otp.o
+
+obj-$(CONFIG_MFD_RDC321X) += rdc321x-southbridge.o
-Index: linux-2.6.32.10/drivers/mfd/rdc321x-southbridge.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.32.10/drivers/mfd/rdc321x-southbridge.c 2010-05-15 22:53:39.000000000 +0200
+--- /dev/null
++++ b/drivers/mfd/rdc321x-southbridge.c
@@ -0,0 +1,123 @@
+/*
+ * RDC321x MFD southbrige driver
@@ -169,10 +163,8 @@ Index: linux-2.6.32.10/drivers/mfd/rdc321x-southbridge.c
+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("RDC R-321x MFD southbridge driver");
-Index: linux-2.6.32.10/include/linux/mfd/rdc321x.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.32.10/include/linux/mfd/rdc321x.h 2010-05-15 21:48:27.000000000 +0200
+--- /dev/null
++++ b/include/linux/mfd/rdc321x.h
@@ -0,0 +1,26 @@
+#ifndef __RDC321X_MFD_H
+#define __RDC321X_MFD_H
diff --git a/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch b/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch
index c2365b7bf5..42ad6aa64e 100644
--- a/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch
+++ b/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch
@@ -8,11 +8,9 @@ Changes from v2:
- use the pci_dev pointer passed as platform data
- replaced rdc321x_pci_{read,write}
-Index: linux-2.6.32.10/drivers/gpio/Kconfig
-===================================================================
---- linux-2.6.32.10.orig/drivers/gpio/Kconfig 2010-05-15 22:54:31.000000000 +0200
-+++ linux-2.6.32.10/drivers/gpio/Kconfig 2010-05-15 22:54:51.000000000 +0200
-@@ -196,6 +196,14 @@
+--- a/drivers/gpio/Kconfig
++++ b/drivers/gpio/Kconfig
+@@ -196,6 +196,14 @@ config GPIO_LANGWELL
help
Say Y here to support Intel Moorestown platform GPIO.
@@ -27,19 +25,15 @@ Index: linux-2.6.32.10/drivers/gpio/Kconfig
comment "SPI GPIO expanders:"
config GPIO_MAX7301
-Index: linux-2.6.32.10/drivers/gpio/Makefile
-===================================================================
---- linux-2.6.32.10.orig/drivers/gpio/Makefile 2010-05-15 22:54:31.000000000 +0200
-+++ linux-2.6.32.10/drivers/gpio/Makefile 2010-05-15 22:54:51.000000000 +0200
-@@ -19,3 +19,4 @@
+--- a/drivers/gpio/Makefile
++++ b/drivers/gpio/Makefile
+@@ -19,3 +19,4 @@ obj-$(CONFIG_GPIO_XILINX) += xilinx_gpio
obj-$(CONFIG_GPIO_BT8XX) += bt8xxgpio.o
obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o
obj-$(CONFIG_GPIO_WM831X) += wm831x-gpio.o
+obj-$(CONFIG_GPIO_RDC321X) += rdc321x-gpio.o
-Index: linux-2.6.32.10/drivers/gpio/rdc321x-gpio.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.32.10/drivers/gpio/rdc321x-gpio.c 2010-05-15 22:55:10.000000000 +0200
+--- /dev/null
++++ b/drivers/gpio/rdc321x-gpio.c
@@ -0,0 +1,245 @@
+/*
+ * RDC321x GPIO driver
diff --git a/target/linux/rdc/patches-2.6.32/003-rdc321x_watchdog_southbridge.patch b/target/linux/rdc/patches-2.6.32/003-rdc321x_watchdog_southbridge.patch
index dafa7e49a6..9bb14534bc 100644
--- a/target/linux/rdc/patches-2.6.32/003-rdc321x_watchdog_southbridge.patch
+++ b/target/linux/rdc/patches-2.6.32/003-rdc321x_watchdog_southbridge.patch
@@ -10,10 +10,8 @@ Changes from v2:
- replaced rdc321x_pci_{read,write}
- use the pci_dev pointer passed as platform_data
-Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
-===================================================================
---- linux-2.6.32.10.orig/drivers/watchdog/rdc321x_wdt.c 2010-05-15 22:14:28.000000000 +0200
-+++ linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c 2010-05-15 22:15:24.000000000 +0200
+--- a/drivers/watchdog/rdc321x_wdt.c
++++ b/drivers/watchdog/rdc321x_wdt.c
@@ -1,7 +1,7 @@
/*
* RDC321x watchdog driver
@@ -33,7 +31,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
#define RDC_WDT_MASK 0x80000000 /* Mask */
#define RDC_WDT_EN 0x00800000 /* Enable bit */
-@@ -63,6 +62,8 @@
+@@ -63,6 +62,8 @@ static struct {
int default_ticks;
unsigned long inuse;
spinlock_t lock;
@@ -42,7 +40,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
} rdc321x_wdt_device;
/* generic helper functions */
-@@ -70,14 +71,18 @@
+@@ -70,14 +71,18 @@ static struct {
static void rdc321x_wdt_trigger(unsigned long unused)
{
unsigned long flags;
@@ -63,7 +61,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
/* requeue?? */
-@@ -105,10 +110,13 @@
+@@ -105,10 +110,13 @@ static void rdc321x_wdt_start(void)
/* Clear the timer */
spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
@@ -79,7 +77,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
mod_timer(&rdc321x_wdt_device.timer,
-@@ -148,7 +156,7 @@
+@@ -148,7 +156,7 @@ static long rdc321x_wdt_ioctl(struct fil
unsigned long arg)
{
void __user *argp = (void __user *)arg;
@@ -88,7 +86,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
static struct watchdog_info ident = {
.options = WDIOF_CARDRESET,
.identity = "RDC321x WDT",
-@@ -162,9 +170,10 @@
+@@ -162,9 +170,10 @@ static long rdc321x_wdt_ioctl(struct fil
case WDIOC_GETSTATUS:
/* Read the value from the DATA register */
spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
@@ -101,7 +99,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
return -EFAULT;
break;
case WDIOC_GETSUPPORT:
-@@ -219,17 +228,35 @@
+@@ -219,17 +228,35 @@ static struct miscdevice rdc321x_wdt_mis
static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
{
int err;
@@ -139,7 +137,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
init_completion(&rdc321x_wdt_device.stop);
rdc321x_wdt_device.queue = 0;
-@@ -240,7 +267,7 @@
+@@ -240,7 +267,7 @@ static int __devinit rdc321x_wdt_probe(s
rdc321x_wdt_device.default_ticks = ticks;
diff --git a/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch b/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch
index 0b236df4aa..adf59a7bb8 100644
--- a/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch
+++ b/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.9/scripts/Makefile.lib
-===================================================================
---- linux-2.6.32.9.orig/scripts/Makefile.lib 2010-04-13 07:55:06.543296524 +0200
-+++ linux-2.6.32.9/scripts/Makefile.lib 2010-04-13 07:55:06.814268461 +0200
-@@ -228,7 +228,7 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
quiet_cmd_lzma = LZMA $@
cmd_lzma = (cat $(filter-out FORCE,$^) | \
@@ -11,10 +9,8 @@ Index: linux-2.6.32.9/scripts/Makefile.lib
(rm -f $@ ; false)
quiet_cmd_lzo = LZO $@
-Index: linux-2.6.32.9/arch/x86/include/asm/boot.h
-===================================================================
---- linux-2.6.32.9.orig/arch/x86/include/asm/boot.h 2010-02-23 16:38:51.000000000 +0100
-+++ linux-2.6.32.9/arch/x86/include/asm/boot.h 2010-04-13 08:00:14.474369306 +0200
+--- a/arch/x86/include/asm/boot.h
++++ b/arch/x86/include/asm/boot.h
@@ -28,7 +28,7 @@
#error "Invalid value for CONFIG_PHYSICAL_ALIGN"
#endif
diff --git a/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch b/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch
index 41be86aa18..f56c40fec3 100644
--- a/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch
+++ b/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch
@@ -1,8 +1,6 @@
-diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
-index 4122916..eeee379 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
-@@ -400,9 +400,6 @@ static void r6040_init_mac_regs(struct net_device *dev)
+@@ -401,9 +401,6 @@ static void r6040_init_mac_regs(struct n
* we may got called by r6040_tx_timeout which has left
* some unsent tx buffers */
iowrite16(0x01, ioaddr + MTPR);
@@ -12,7 +10,7 @@ index 4122916..eeee379 100644
}
static void r6040_tx_timeout(struct net_device *dev)
-@@ -530,8 +527,6 @@ static int r6040_phy_mode_chk(struct net_device *dev)
+@@ -531,8 +528,6 @@ static int r6040_phy_mode_chk(struct net
phy_dat = 0x0000;
}
@@ -21,7 +19,7 @@ index 4122916..eeee379 100644
return phy_dat;
};
-@@ -813,6 +808,9 @@ static void r6040_timer(unsigned long data)
+@@ -814,6 +809,9 @@ static void r6040_timer(unsigned long da
/* Timer active again */
mod_timer(&lp->timer, round_jiffies(jiffies + HZ));
diff --git a/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch b/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
index 9a9422877a..b3e8c94f0a 100644
--- a/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
+++ b/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.32.12/drivers/net/r6040.c
-===================================================================
---- linux-2.6.32.12.orig/drivers/net/r6040.c 2010-05-20 10:19:41.000000000 +0200
-+++ linux-2.6.32.12/drivers/net/r6040.c 2010-05-20 10:28:48.000000000 +0200
+--- a/drivers/net/r6040.c
++++ b/drivers/net/r6040.c
@@ -45,6 +45,7 @@
#include <linux/io.h>
#include <linux/irq.h>
@@ -10,7 +8,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
#include <asm/processor.h>
-@@ -180,7 +181,6 @@
+@@ -180,7 +181,6 @@ struct r6040_descriptor {
struct r6040_private {
spinlock_t lock; /* driver lock */
@@ -18,7 +16,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
struct pci_dev *pdev;
struct r6040_descriptor *rx_insert_ptr;
struct r6040_descriptor *rx_remove_ptr;
-@@ -190,13 +190,15 @@
+@@ -190,13 +190,15 @@ struct r6040_private {
struct r6040_descriptor *tx_ring;
dma_addr_t rx_ring_dma;
dma_addr_t tx_ring_dma;
@@ -37,7 +35,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
};
static char version[] __devinitdata = KERN_INFO DRV_NAME
-@@ -239,20 +241,29 @@
+@@ -239,20 +241,29 @@ static void r6040_phy_write(void __iomem
}
}
@@ -71,7 +69,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
}
static void r6040_free_txbufs(struct net_device *dev)
-@@ -409,10 +420,9 @@
+@@ -409,10 +420,9 @@ static void r6040_tx_timeout(struct net_
void __iomem *ioaddr = priv->base;
printk(KERN_WARNING "%s: transmit timed out, int enable %4.4x "
@@ -84,7 +82,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
dev->stats.tx_errors++;
-@@ -464,9 +474,6 @@
+@@ -464,9 +474,6 @@ static int r6040_close(struct net_device
struct r6040_private *lp = netdev_priv(dev);
struct pci_dev *pdev = lp->pdev;
@@ -94,7 +92,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
spin_lock_irq(&lp->lock);
napi_disable(&lp->napi);
netif_stop_queue(dev);
-@@ -496,64 +503,14 @@
+@@ -496,64 +503,14 @@ static int r6040_close(struct net_device
return 0;
}
@@ -162,7 +160,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
}
static int r6040_rx(struct net_device *dev, int limit)
-@@ -752,26 +709,6 @@
+@@ -752,26 +709,6 @@ static int r6040_up(struct net_device *d
if (ret)
return ret;
@@ -189,7 +187,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
/* improve performance (by RDC guys) */
r6040_phy_write(ioaddr, 30, 17, (r6040_phy_read(ioaddr, 30, 17) | 0x4000));
r6040_phy_write(ioaddr, 30, 17, ~((~r6040_phy_read(ioaddr, 30, 17)) | 0x2000));
-@@ -784,35 +721,6 @@
+@@ -784,35 +721,6 @@ static int r6040_up(struct net_device *d
return 0;
}
@@ -225,7 +223,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
/* Read/set MAC address routines */
static void r6040_mac_address(struct net_device *dev)
-@@ -874,10 +782,6 @@
+@@ -874,10 +782,6 @@ static int r6040_open(struct net_device
napi_enable(&lp->napi);
netif_start_queue(dev);
@@ -236,7 +234,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
return 0;
}
-@@ -1020,40 +924,22 @@
+@@ -1020,40 +924,22 @@ static void netdev_get_drvinfo(struct ne
static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct r6040_private *rp = netdev_priv(dev);
@@ -280,7 +278,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
};
static const struct net_device_ops r6040_netdev_ops = {
-@@ -1072,6 +958,86 @@
+@@ -1072,6 +958,86 @@ static const struct net_device_ops r6040
#endif
};
@@ -367,7 +365,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
static int __devinit r6040_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
-@@ -1082,6 +1048,7 @@
+@@ -1082,6 +1048,7 @@ static int __devinit r6040_init_one(stru
static int card_idx = -1;
int bar = 0;
u16 *adrp;
@@ -375,7 +373,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
printk("%s\n", version);
-@@ -1169,7 +1136,6 @@
+@@ -1169,7 +1136,6 @@ static int __devinit r6040_init_one(stru
/* Init RDC private data */
lp->mcr0 = 0x1002;
lp->phy_addr = phy_table[card_idx];
@@ -383,7 +381,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
/* The RDC-specific entries in the device structure. */
dev->netdev_ops = &r6040_netdev_ops;
-@@ -1177,28 +1143,61 @@
+@@ -1177,28 +1143,61 @@ static int __devinit r6040_init_one(stru
dev->watchdog_timeo = TX_TIMEOUT;
netif_napi_add(dev, &lp->napi, r6040_poll, 64);
@@ -453,7 +451,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
err_out_unmap:
pci_iounmap(pdev, ioaddr);
err_out_free_res:
-@@ -1212,8 +1211,12 @@
+@@ -1212,8 +1211,12 @@ err_out:
static void __devexit r6040_remove_one(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
diff --git a/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch b/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch
index 9012cb344a..dded04e8d5 100644
--- a/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch
+++ b/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch
@@ -10,7 +10,6 @@
# drivers-y are linked after core-y
drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
drivers-$(CONFIG_PCI) += arch/x86/pci/
-
--- /dev/null
+++ b/arch/x86/mach-rdc321x/Makefile
@@ -0,0 +1,5 @@
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 12:21:31 +0000