aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
commit9a495f6bbbcb294b9926f4ec32e5bbb339395d00 (patch)
treec76b5e53fffd1d6238ba09da9d8bb7a6bde9e474 /target/linux/ar7
parent3951f9492f31b59602a9a7c46fbb041be0929be0 (diff)
downloadupstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.gz
upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.bz2
upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.zip
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43564
Diffstat (limited to 'target/linux/ar7')
-rw-r--r--target/linux/ar7/patches-3.14/001-mips-ar7-fix-serial.patch7
-rw-r--r--target/linux/ar7/patches-3.14/120-gpio_chrdev.patch4
-rw-r--r--target/linux/ar7/patches-3.14/160-vlynq_try_remote_first.patch6
-rw-r--r--target/linux/ar7/patches-3.14/300-add-ac49x-platform.patch4
-rw-r--r--target/linux/ar7/patches-3.14/320-ac49x-mtd-partitions.patch2
-rw-r--r--target/linux/ar7/patches-3.14/500-serial_kludge.patch2
-rw-r--r--target/linux/ar7/patches-3.14/920-ar7part.patch4
-rw-r--r--target/linux/ar7/patches-3.14/950-cpmac_titan.patch8
8 files changed, 16 insertions, 21 deletions
diff --git a/target/linux/ar7/patches-3.14/001-mips-ar7-fix-serial.patch b/target/linux/ar7/patches-3.14/001-mips-ar7-fix-serial.patch
index 3b94cebff9..6896352266 100644
--- a/target/linux/ar7/patches-3.14/001-mips-ar7-fix-serial.patch
+++ b/target/linux/ar7/patches-3.14/001-mips-ar7-fix-serial.patch
@@ -11,11 +11,9 @@ Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
arch/mips/ar7/platform.c | 1 +
1 file changed, 1 insertion(+)
-diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
-index 7e2356f..e4f47d3 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
-@@ -581,6 +581,7 @@ static int __init ar7_register_uarts(void)
+@@ -581,6 +581,7 @@ static int __init ar7_register_uarts(voi
uart_port.type = PORT_AR7;
uart_port.uartclk = clk_get_rate(bus_clk) / 2;
uart_port.iotype = UPIO_MEM32;
@@ -23,6 +21,3 @@ index 7e2356f..e4f47d3 100644
uart_port.regshift = 2;
uart_port.line = 0;
---
-1.8.5.3.2.g3dbf181
-
diff --git a/target/linux/ar7/patches-3.14/120-gpio_chrdev.patch b/target/linux/ar7/patches-3.14/120-gpio_chrdev.patch
index 15bc6c3efd..beb0052ca1 100644
--- a/target/linux/ar7/patches-3.14/120-gpio_chrdev.patch
+++ b/target/linux/ar7/patches-3.14/120-gpio_chrdev.patch
@@ -1,6 +1,6 @@
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
-@@ -464,6 +464,15 @@ config MWAVE
+@@ -452,6 +452,15 @@ config MWAVE
To compile this driver as a module, choose M here: the
module will be called mwave.
@@ -18,7 +18,7 @@
depends on SCx200
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
-@@ -43,6 +43,7 @@ obj-$(CONFIG_HW_RANDOM) += hw_random/
+@@ -42,6 +42,7 @@ obj-$(CONFIG_HW_RANDOM) += hw_random/
obj-$(CONFIG_PPDEV) += ppdev.o
obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o
diff --git a/target/linux/ar7/patches-3.14/160-vlynq_try_remote_first.patch b/target/linux/ar7/patches-3.14/160-vlynq_try_remote_first.patch
index 1d1310d82e..841eb2307b 100644
--- a/target/linux/ar7/patches-3.14/160-vlynq_try_remote_first.patch
+++ b/target/linux/ar7/patches-3.14/160-vlynq_try_remote_first.patch
@@ -199,7 +199,7 @@
return 0;
}
-@@ -501,24 +547,16 @@ static int __vlynq_enable_device(struct
+@@ -501,24 +547,16 @@ static int __vlynq_enable_device(struct
return result;
switch (dev->divisor) {
@@ -229,7 +229,7 @@
break;
case vlynq_ldiv1:
case vlynq_ldiv2:
-@@ -528,15 +566,12 @@ static int __vlynq_enable_device(struct
+@@ -528,15 +566,12 @@ static int __vlynq_enable_device(struct
case vlynq_ldiv6:
case vlynq_ldiv7:
case vlynq_ldiv8:
@@ -251,7 +251,7 @@
return 0;
}
break;
-@@ -548,20 +583,17 @@ static int __vlynq_enable_device(struct
+@@ -548,20 +583,17 @@ static int __vlynq_enable_device(struct
case vlynq_rdiv6:
case vlynq_rdiv7:
case vlynq_rdiv8:
diff --git a/target/linux/ar7/patches-3.14/300-add-ac49x-platform.patch b/target/linux/ar7/patches-3.14/300-add-ac49x-platform.patch
index e1b11272df..92bd4f3b8c 100644
--- a/target/linux/ar7/patches-3.14/300-add-ac49x-platform.patch
+++ b/target/linux/ar7/patches-3.14/300-add-ac49x-platform.patch
@@ -37,7 +37,7 @@
#define AR7_IRQ_UART0 15
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -86,7 +86,7 @@ config AR7
+@@ -89,7 +89,7 @@ config AR7
select HAVE_CLK
help
Support for the Texas Instruments AR7 System-on-a-Chip
@@ -46,7 +46,7 @@
config ATH79
bool "Atheros AR71XX/AR724X/AR913X based boards"
-@@ -839,6 +839,7 @@ config NLM_XLP_BOARD
+@@ -796,6 +796,7 @@ config NLM_XLP_BOARD
endchoice
source "arch/mips/alchemy/Kconfig"
diff --git a/target/linux/ar7/patches-3.14/320-ac49x-mtd-partitions.patch b/target/linux/ar7/patches-3.14/320-ac49x-mtd-partitions.patch
index f74ee17c39..e6b08d669a 100644
--- a/target/linux/ar7/patches-3.14/320-ac49x-mtd-partitions.patch
+++ b/target/linux/ar7/patches-3.14/320-ac49x-mtd-partitions.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
-@@ -192,6 +192,11 @@ config MTD_OF_PARTS
+@@ -169,6 +169,11 @@ config MTD_OF_PARTS
the partition map from the children of the flash node,
as described in Documentation/devicetree/booting-without-of.txt.
diff --git a/target/linux/ar7/patches-3.14/500-serial_kludge.patch b/target/linux/ar7/patches-3.14/500-serial_kludge.patch
index e686b765ac..e5d5a914a3 100644
--- a/target/linux/ar7/patches-3.14/500-serial_kludge.patch
+++ b/target/linux/ar7/patches-3.14/500-serial_kludge.patch
@@ -14,7 +14,7 @@
};
/* Uart divisor latch read */
-@@ -2843,7 +2850,11 @@ static void serial8250_console_putchar(s
+@@ -2861,7 +2868,11 @@ static void serial8250_console_putchar(s
struct uart_8250_port *up =
container_of(port, struct uart_8250_port, port);
diff --git a/target/linux/ar7/patches-3.14/920-ar7part.patch b/target/linux/ar7/patches-3.14/920-ar7part.patch
index 9948858d05..84f68d82ab 100644
--- a/target/linux/ar7/patches-3.14/920-ar7part.patch
+++ b/target/linux/ar7/patches-3.14/920-ar7part.patch
@@ -33,7 +33,7 @@
size_t len;
unsigned int pre_size = master->erasesize, post_size = 0;
unsigned int root_offset = ROOT_OFFSET;
-@@ -55,6 +62,16 @@ static int create_mtd_partitions(struct
+@@ -55,6 +62,16 @@ static int create_mtd_partitions(struct
int retries = 10;
struct mtd_partition *ar7_parts;
@@ -50,7 +50,7 @@
ar7_parts = kzalloc(sizeof(*ar7_parts) * AR7_PARTS, GFP_KERNEL);
if (!ar7_parts)
return -ENOMEM;
-@@ -83,34 +100,39 @@ static int create_mtd_partitions(struct
+@@ -83,34 +100,39 @@ static int create_mtd_partitions(struct
pre_size = offset;
diff --git a/target/linux/ar7/patches-3.14/950-cpmac_titan.patch b/target/linux/ar7/patches-3.14/950-cpmac_titan.patch
index bc31222cb8..1d76e9fd78 100644
--- a/target/linux/ar7/patches-3.14/950-cpmac_titan.patch
+++ b/target/linux/ar7/patches-3.14/950-cpmac_titan.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
-@@ -1155,6 +1155,8 @@ static int cpmac_probe(struct platform_d
+@@ -1154,6 +1154,8 @@ static int cpmac_probe(struct platform_d
goto fail;
}
@@ -9,7 +9,7 @@
dev->irq = platform_get_irq_byname(pdev, "irq");
dev->netdev_ops = &cpmac_netdev_ops;
-@@ -1233,7 +1235,7 @@ int cpmac_init(void)
+@@ -1232,7 +1234,7 @@ int cpmac_init(void)
cpmac_mii->reset = cpmac_mdio_reset;
cpmac_mii->irq = mii_irqs;
@@ -18,7 +18,7 @@
if (!cpmac_mii->priv) {
printk(KERN_ERR "Can't ioremap mdio registers\n");
-@@ -1244,10 +1246,16 @@ int cpmac_init(void)
+@@ -1243,10 +1245,16 @@ int cpmac_init(void)
#warning FIXME: unhardcode gpio&reset bits
ar7_gpio_disable(26);
ar7_gpio_disable(27);
@@ -37,7 +37,7 @@
cpmac_mii->reset(cpmac_mii);
for (i = 0; i < 300; i++) {
-@@ -1264,7 +1272,11 @@ int cpmac_init(void)
+@@ -1263,7 +1271,11 @@ int cpmac_init(void)
mask = 0;
}