au1000: rename patches directory to patches-3.18

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
Stijn Tintel 2016-08-14 23:45:40 +03:00 committed by John Crispin
parent 12cdf2bfc2
commit fa5eab6ec5
5 changed files with 30 additions and 31 deletions

View file

@ -1,11 +1,11 @@
--- a/arch/mips/alchemy/board-mtx1.c --- a/arch/mips/alchemy/board-mtx1.c
+++ b/arch/mips/alchemy/board-mtx1.c +++ b/arch/mips/alchemy/board-mtx1.c
@@ -169,7 +169,7 @@ static struct platform_device mtx1_gpio_ @@ -169,7 +169,7 @@ static struct platform_device mtx1_gpio_
static struct mtd_partition mtx1_mtd_partitions[] = { static struct mtd_partition mtx1_mtd_partitions[] = {
{ {
- .name = "filesystem", - .name = "filesystem",
+ .name = "rootfs", + .name = "rootfs",
.size = 0x01C00000, .size = 0x01C00000,
.offset = 0, .offset = 0,
}, },

View file

@ -1,17 +1,16 @@
--- a/drivers/net/ethernet/amd/au1000_eth.c --- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/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 @@ -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) +#define AU1000_KNOWN_PHY_IOCTLS (SIOCGMIIPHY & 0xfff0)
static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 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) + if((cmd & AU1000_KNOWN_PHY_IOCTLS) != AU1000_KNOWN_PHY_IOCTLS)
+ return -EINVAL; + return -EINVAL;
+ +
if (!netif_running(dev)) if (!netif_running(dev))
return -EINVAL; return -EINVAL;

View file

@ -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;

View file

@ -1,17 +1,17 @@
--- a/arch/mips/alchemy/devboards/db1300.c --- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c +++ b/arch/mips/alchemy/devboards/db1300.c
@@ -712,6 +712,7 @@ static struct platform_device db1300_lcd @@ -712,6 +712,7 @@ static struct platform_device db1300_lcd
/**********************************************************************/ /**********************************************************************/
+#ifdef CONFIG_TOUCHSCREEN_WM97XX +#ifdef CONFIG_TOUCHSCREEN_WM97XX
static void db1300_wm97xx_irqen(struct wm97xx *wm, int enable) 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 @@ -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 +#else
+ +
+static int db1300_wm97xx_probe(struct platform_device *pdev) +static int db1300_wm97xx_probe(struct platform_device *pdev)
@ -22,5 +22,5 @@
+#endif +#endif
+ +
static struct platform_driver db1300_wm97xx_driver = { static struct platform_driver db1300_wm97xx_driver = {
.driver.name = "wm97xx-touch", .driver.name = "wm97xx-touch",
.driver.owner = THIS_MODULE, .driver.owner = THIS_MODULE,

View file

@ -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;