kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43564
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user