From 0a95e857aa89d4a52df301b068202db449abec41 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 21 Oct 2010 18:42:11 +0000 Subject: ar71xx: improve 2.6.36 compatibility. also, instead of adding a forward port patch to the 2.6.36 patches, add a backport patch to 2.6.32 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23574 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../ar71xx/files/drivers/net/ag71xx/ag71xx_main.c | 3 +- target/linux/ar71xx/files/drivers/spi/ap83_spi.c | 9 +-- .../ar71xx/files/drivers/watchdog/ar71xx_wdt.c | 4 +- .../linux/ar71xx/patches-2.6.32/990-backport.patch | 80 ++++++++++++++++++++++ .../ar71xx/patches-2.6.36/209_watchdog_fix.patch | 11 --- 5 files changed, 88 insertions(+), 19 deletions(-) create mode 100644 target/linux/ar71xx/patches-2.6.32/990-backport.patch delete mode 100644 target/linux/ar71xx/patches-2.6.36/209_watchdog_fix.patch diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c index fc838f45b..45dd3e52c 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -685,7 +685,6 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { - struct mii_ioctl_data *data = (struct mii_ioctl_data *) &ifr->ifr_data; struct ag71xx *ag = netdev_priv(dev); int ret; @@ -717,7 +716,7 @@ static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) if (ag->phy_dev == NULL) break; - return phy_mii_ioctl(ag->phy_dev, data, cmd); + return phy_mii_ioctl(ag->phy_dev, ifr, cmd); default: break; diff --git a/target/linux/ar71xx/files/drivers/spi/ap83_spi.c b/target/linux/ar71xx/files/drivers/spi/ap83_spi.c index c93070d50..eada5fe9c 100644 --- a/target/linux/ar71xx/files/drivers/spi/ap83_spi.c +++ b/target/linux/ar71xx/files/drivers/spi/ap83_spi.c @@ -127,33 +127,34 @@ static void ap83_spi_chipselect(struct spi_device *spi, int on) #define EXPAND_BITBANG_TXRX #include +#include "spi_bitbang_txrx.h" static u32 ap83_spi_txrx_mode0(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits) { dev_dbg(&spi->dev, "TXRX0 word=%08x, bits=%u\n", word, bits); - return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits); + return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits); } static u32 ap83_spi_txrx_mode1(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits) { dev_dbg(&spi->dev, "TXRX1 word=%08x, bits=%u\n", word, bits); - return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits); + return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits); } static u32 ap83_spi_txrx_mode2(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits) { dev_dbg(&spi->dev, "TXRX2 word=%08x, bits=%u\n", word, bits); - return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits); + return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits); } static u32 ap83_spi_txrx_mode3(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits) { dev_dbg(&spi->dev, "TXRX3 word=%08x, bits=%u\n", word, bits); - return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits); + return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits); } static int ap83_spi_probe(struct platform_device *pdev) diff --git a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c index b5bc254f8..5f8104bcd 100644 --- a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c +++ b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c @@ -146,7 +146,7 @@ static struct watchdog_info ar71xx_wdt_info = { .identity = "AR71XX watchdog", }; -static int ar71xx_wdt_ioctl(struct inode *inode, struct file *file, +static long ar71xx_wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int t; @@ -197,7 +197,7 @@ static int ar71xx_wdt_ioctl(struct inode *inode, struct file *file, static const struct file_operations ar71xx_wdt_fops = { .owner = THIS_MODULE, .write = ar71xx_wdt_write, - .ioctl = ar71xx_wdt_ioctl, + .unlocked_ioctl = ar71xx_wdt_ioctl, .open = ar71xx_wdt_open, .release = ar71xx_wdt_release, }; diff --git a/target/linux/ar71xx/patches-2.6.32/990-backport.patch b/target/linux/ar71xx/patches-2.6.32/990-backport.patch new file mode 100644 index 000000000..2c1c75c67 --- /dev/null +++ b/target/linux/ar71xx/patches-2.6.32/990-backport.patch @@ -0,0 +1,80 @@ +--- a/drivers/net/ag71xx/ag71xx_main.c ++++ b/drivers/net/ag71xx/ag71xx_main.c +@@ -685,6 +685,7 @@ static netdev_tx_t ag71xx_hard_start_xmi + + static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) + { ++ struct mii_ioctl_data *data = (struct mii_ioctl_data *) &ifr->ifr_data; + struct ag71xx *ag = netdev_priv(dev); + int ret; + +@@ -716,7 +717,7 @@ static int ag71xx_do_ioctl(struct net_de + if (ag->phy_dev == NULL) + break; + +- return phy_mii_ioctl(ag->phy_dev, ifr, cmd); ++ return phy_mii_ioctl(ag->phy_dev, data, cmd); + + default: + break; +--- a/drivers/spi/ap83_spi.c ++++ b/drivers/spi/ap83_spi.c +@@ -127,34 +127,33 @@ static void ap83_spi_chipselect(struct s + + #define EXPAND_BITBANG_TXRX + #include +-#include "spi_bitbang_txrx.h" + + static u32 ap83_spi_txrx_mode0(struct spi_device *spi, + unsigned nsecs, u32 word, u8 bits) + { + dev_dbg(&spi->dev, "TXRX0 word=%08x, bits=%u\n", word, bits); +- return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits); ++ return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits); + } + + static u32 ap83_spi_txrx_mode1(struct spi_device *spi, + unsigned nsecs, u32 word, u8 bits) + { + dev_dbg(&spi->dev, "TXRX1 word=%08x, bits=%u\n", word, bits); +- return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits); ++ return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits); + } + + static u32 ap83_spi_txrx_mode2(struct spi_device *spi, + unsigned nsecs, u32 word, u8 bits) + { + dev_dbg(&spi->dev, "TXRX2 word=%08x, bits=%u\n", word, bits); +- return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits); ++ return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits); + } + + static u32 ap83_spi_txrx_mode3(struct spi_device *spi, + unsigned nsecs, u32 word, u8 bits) + { + dev_dbg(&spi->dev, "TXRX3 word=%08x, bits=%u\n", word, bits); +- return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits); ++ return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits); + } + + static int ap83_spi_probe(struct platform_device *pdev) +--- a/drivers/watchdog/ar71xx_wdt.c ++++ b/drivers/watchdog/ar71xx_wdt.c +@@ -146,7 +146,7 @@ static struct watchdog_info ar71xx_wdt_i + .identity = "AR71XX watchdog", + }; + +-static long ar71xx_wdt_ioctl(struct file *file, ++static int ar71xx_wdt_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) + { + int t; +@@ -197,7 +197,7 @@ static long ar71xx_wdt_ioctl(struct file + static const struct file_operations ar71xx_wdt_fops = { + .owner = THIS_MODULE, + .write = ar71xx_wdt_write, +- .unlocked_ioctl = ar71xx_wdt_ioctl, ++ .ioctl = ar71xx_wdt_ioctl, + .open = ar71xx_wdt_open, + .release = ar71xx_wdt_release, + }; diff --git a/target/linux/ar71xx/patches-2.6.36/209_watchdog_fix.patch b/target/linux/ar71xx/patches-2.6.36/209_watchdog_fix.patch deleted file mode 100644 index f0f37f41e..000000000 --- a/target/linux/ar71xx/patches-2.6.36/209_watchdog_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/watchdog/ar71xx_wdt.c -+++ b/drivers/watchdog/ar71xx_wdt.c -@@ -197,7 +197,7 @@ static int ar71xx_wdt_ioctl(struct inode - static const struct file_operations ar71xx_wdt_fops = { - .owner = THIS_MODULE, - .write = ar71xx_wdt_write, -- .ioctl = ar71xx_wdt_ioctl, -+ .unlocked_ioctl = ar71xx_wdt_ioctl, - .open = ar71xx_wdt_open, - .release = ar71xx_wdt_release, - }; -- cgit v1.2.3