aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2016-08-14 23:45:40 +0300
committerJohn Crispin <john@phrozen.org>2016-08-15 15:32:37 +0200
commitfa5eab6ec5c78160f939d23b24a6fd9a45861ca9 (patch)
tree926faaf618656cb23657e34cd439448c4a07bfb7
parent12cdf2bfc211f139c04aa4242ce1f8ffea6344d2 (diff)
downloadupstream-fa5eab6ec5c78160f939d23b24a6fd9a45861ca9.tar.gz
upstream-fa5eab6ec5c78160f939d23b24a6fd9a45861ca9.tar.bz2
upstream-fa5eab6ec5c78160f939d23b24a6fd9a45861ca9.zip
au1000: rename patches directory to patches-3.18
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
-rw-r--r--target/linux/au1000/patches-3.18/002-openwrt_rootfs.patch (renamed from target/linux/au1000/patches/002-openwrt_rootfs.patch)10
-rw-r--r--target/linux/au1000/patches-3.18/003-au1000_eth_ioctl.patch (renamed from target/linux/au1000/patches/003-au1000_eth_ioctl.patch)13
-rw-r--r--target/linux/au1000/patches-3.18/004-watchdog_low_init.patch12
-rw-r--r--target/linux/au1000/patches-3.18/006-codec.patch (renamed from target/linux/au1000/patches/006-codec.patch)14
-rw-r--r--target/linux/au1000/patches/004-watchdog_low_init.patch12
5 files changed, 30 insertions, 31 deletions
diff --git a/target/linux/au1000/patches/002-openwrt_rootfs.patch b/target/linux/au1000/patches-3.18/002-openwrt_rootfs.patch
index 1de8236547..3fd2d8480b 100644
--- a/target/linux/au1000/patches/002-openwrt_rootfs.patch
+++ b/target/linux/au1000/patches-3.18/002-openwrt_rootfs.patch
@@ -1,11 +1,11 @@
--- a/arch/mips/alchemy/board-mtx1.c
+++ b/arch/mips/alchemy/board-mtx1.c
@@ -169,7 +169,7 @@ static struct platform_device mtx1_gpio_
-
+
static struct mtd_partition mtx1_mtd_partitions[] = {
- {
+ {
- .name = "filesystem",
+ .name = "rootfs",
- .size = 0x01C00000,
- .offset = 0,
- },
+ .size = 0x01C00000,
+ .offset = 0,
+ },
diff --git a/target/linux/au1000/patches/003-au1000_eth_ioctl.patch b/target/linux/au1000/patches-3.18/003-au1000_eth_ioctl.patch
index 58927f590d..590d8c217d 100644
--- a/target/linux/au1000/patches/003-au1000_eth_ioctl.patch
+++ b/target/linux/au1000/patches-3.18/003-au1000_eth_ioctl.patch
@@ -1,17 +1,16 @@
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -1113,10 +1113,14 @@ static void au1000_multicast_list(struct
- writel(reg, &aup->mac->control);
+ writel(reg, &aup->mac->control);
}
-
+
+#define AU1000_KNOWN_PHY_IOCTLS (SIOCGMIIPHY & 0xfff0)
static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{
- struct au1000_private *aup = netdev_priv(dev);
-
+ struct au1000_private *aup = netdev_priv(dev);
+
+ if((cmd & AU1000_KNOWN_PHY_IOCTLS) != AU1000_KNOWN_PHY_IOCTLS)
+ return -EINVAL;
+
- if (!netif_running(dev))
- return -EINVAL;
-
+ if (!netif_running(dev))
+ return -EINVAL;
diff --git a/target/linux/au1000/patches-3.18/004-watchdog_low_init.patch b/target/linux/au1000/patches-3.18/004-watchdog_low_init.patch
new file mode 100644
index 0000000000..b1d2af51f3
--- /dev/null
+++ b/target/linux/au1000/patches-3.18/004-watchdog_low_init.patch
@@ -0,0 +1,12 @@
+--- a/arch/mips/alchemy/board-mtx1.c
++++ b/arch/mips/alchemy/board-mtx1.c
+@@ -98,6 +98,9 @@ void __init board_setup(void)
+ alchemy_gpio_direction_output(211, 1); /* green on */
+ alchemy_gpio_direction_output(212, 0); /* red off */
+
++ /* Set watchdog pin low */
++ alchemy_gpio_direction_output(215, 0);
++
+ pm_power_off = mtx1_power_off;
+ _machine_halt = mtx1_power_off;
+ _machine_restart = mtx1_reset;
diff --git a/target/linux/au1000/patches/006-codec.patch b/target/linux/au1000/patches-3.18/006-codec.patch
index d80cf56ac9..45537c63a8 100644
--- a/target/linux/au1000/patches/006-codec.patch
+++ b/target/linux/au1000/patches-3.18/006-codec.patch
@@ -1,17 +1,17 @@
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -712,6 +712,7 @@ static struct platform_device db1300_lcd
-
+
/**********************************************************************/
-
+
+#ifdef CONFIG_TOUCHSCREEN_WM97XX
static void db1300_wm97xx_irqen(struct wm97xx *wm, int enable)
{
- if (enable)
+ if (enable)
@@ -744,6 +745,15 @@ static int db1300_wm97xx_probe(struct pl
- return wm97xx_register_mach_ops(wm, &db1300_wm97xx_ops);
+ return wm97xx_register_mach_ops(wm, &db1300_wm97xx_ops);
}
-
+
+#else
+
+static int db1300_wm97xx_probe(struct platform_device *pdev)
@@ -22,5 +22,5 @@
+#endif
+
static struct platform_driver db1300_wm97xx_driver = {
- .driver.name = "wm97xx-touch",
- .driver.owner = THIS_MODULE,
+ .driver.name = "wm97xx-touch",
+ .driver.owner = THIS_MODULE,
diff --git a/target/linux/au1000/patches/004-watchdog_low_init.patch b/target/linux/au1000/patches/004-watchdog_low_init.patch
deleted file mode 100644
index 09110408e5..0000000000
--- a/target/linux/au1000/patches/004-watchdog_low_init.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/arch/mips/alchemy/board-mtx1.c
-+++ b/arch/mips/alchemy/board-mtx1.c
-@@ -98,6 +98,9 @@ void __init board_setup(void)
- alchemy_gpio_direction_output(211, 1); /* green on */
- alchemy_gpio_direction_output(212, 0); /* red off */
-
-+ /* Set watchdog pin low */
-+ alchemy_gpio_direction_output(215, 0);
-+
- pm_power_off = mtx1_power_off;
- _machine_halt = mtx1_power_off;
- _machine_restart = mtx1_reset;