kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43564
This commit is contained in:
@@ -20,7 +20,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
|
||||
--- a/arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
@@ -142,12 +142,14 @@ static struct platform_device fsg_eth[]
|
||||
@@ -142,12 +142,14 @@ static struct platform_device fsg_eth[]
|
||||
.id = IXP4XX_ETH_NPEB,
|
||||
.dev = {
|
||||
.platform_data = fsg_plat_eth,
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: linux-3.14.25/drivers/gpio/Kconfig
|
||||
===================================================================
|
||||
--- linux-3.14.25.orig/drivers/gpio/Kconfig 2014-11-30 15:25:59.554663011 +0100
|
||||
+++ linux-3.14.25/drivers/gpio/Kconfig 2014-11-30 15:26:36.399907220 +0100
|
||||
@@ -722,6 +722,14 @@
|
||||
--- a/drivers/gpio/Kconfig
|
||||
+++ b/drivers/gpio/Kconfig
|
||||
@@ -722,6 +722,14 @@ config GPIO_RDC321X
|
||||
Support for the RDC R321x SoC GPIOs over southbridge
|
||||
PCI configuration space.
|
||||
|
||||
@@ -17,19 +15,15 @@ Index: linux-3.14.25/drivers/gpio/Kconfig
|
||||
comment "SPI GPIO expanders:"
|
||||
|
||||
config GPIO_MAX7301
|
||||
Index: linux-3.14.25/drivers/gpio/Makefile
|
||||
===================================================================
|
||||
--- linux-3.14.25.orig/drivers/gpio/Makefile 2014-11-30 15:25:59.554663011 +0100
|
||||
+++ linux-3.14.25/drivers/gpio/Makefile 2014-11-30 15:26:36.399907220 +0100
|
||||
@@ -99,3 +99,4 @@
|
||||
--- a/drivers/gpio/Makefile
|
||||
+++ b/drivers/gpio/Makefile
|
||||
@@ -99,3 +99,4 @@ obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350
|
||||
obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o
|
||||
obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o
|
||||
obj-$(CONFIG_GPIO_XTENSA) += gpio-xtensa.o
|
||||
+obj-$(CONFIG_GPIO_GW_I2C_PLD) += gw_i2c_pld.o
|
||||
Index: linux-3.14.25/drivers/gpio/gw_i2c_pld.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-3.14.25/drivers/gpio/gw_i2c_pld.c 2014-12-01 07:15:30.030979315 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpio/gw_i2c_pld.c
|
||||
@@ -0,0 +1,374 @@
|
||||
+/*
|
||||
+ * Gateworks I2C PLD GPIO expander
|
||||
@@ -405,10 +399,8 @@ Index: linux-3.14.25/drivers/gpio/gw_i2c_pld.c
|
||||
+
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_AUTHOR("Chris Lang");
|
||||
Index: linux-3.14.25/include/linux/i2c/gw_i2c_pld.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-3.14.25/include/linux/i2c/gw_i2c_pld.h 2014-11-30 15:26:36.403907355 +0100
|
||||
--- /dev/null
|
||||
+++ b/include/linux/i2c/gw_i2c_pld.h
|
||||
@@ -0,0 +1,20 @@
|
||||
+#ifndef __LINUX_GW_I2C_PLD_H
|
||||
+#define __LINUX_GW_I2C_PLD_H
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: linux-3.14.25/arch/arm/mach-ixp4xx/common.c
|
||||
===================================================================
|
||||
--- linux-3.14.25.orig/arch/arm/mach-ixp4xx/common.c 2014-11-21 18:23:44.000000000 +0100
|
||||
+++ linux-3.14.25/arch/arm/mach-ixp4xx/common.c 2014-12-01 07:16:02.172180453 +0100
|
||||
@@ -84,22 +84,7 @@
|
||||
--- a/arch/arm/mach-ixp4xx/common.c
|
||||
+++ b/arch/arm/mach-ixp4xx/common.c
|
||||
@@ -84,22 +84,7 @@ void __init ixp4xx_map_io(void)
|
||||
/*
|
||||
* GPIO-functions
|
||||
*/
|
||||
@@ -26,7 +24,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/common.c
|
||||
{
|
||||
if (direction == IXP4XX_GPIO_IN)
|
||||
*IXP4XX_GPIO_GPOER |= (1 << line);
|
||||
@@ -107,12 +92,12 @@
|
||||
@@ -107,12 +92,12 @@ static void gpio_line_config(u8 line, u3
|
||||
*IXP4XX_GPIO_GPOER &= ~(1 << line);
|
||||
}
|
||||
|
||||
@@ -41,11 +39,9 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/common.c
|
||||
{
|
||||
if (value == IXP4XX_GPIO_HIGH)
|
||||
*IXP4XX_GPIO_GPOUTR |= (1 << line);
|
||||
Index: linux-3.14.25/arch/arm/mach-ixp4xx/include/mach/platform.h
|
||||
===================================================================
|
||||
--- linux-3.14.25.orig/arch/arm/mach-ixp4xx/include/mach/platform.h 2014-11-30 15:26:43.020130937 +0100
|
||||
+++ linux-3.14.25/arch/arm/mach-ixp4xx/include/mach/platform.h 2014-12-01 07:16:22.024919689 +0100
|
||||
@@ -142,5 +142,21 @@
|
||||
--- a/arch/arm/mach-ixp4xx/include/mach/platform.h
|
||||
+++ b/arch/arm/mach-ixp4xx/include/mach/platform.h
|
||||
@@ -131,5 +131,21 @@ struct pci_sys_data;
|
||||
extern int ixp4xx_setup(int nr, struct pci_sys_data *sys);
|
||||
extern struct pci_ops ixp4xx_ops;
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: linux-3.14.25/arch/arm/mach-ixp4xx/Kconfig
|
||||
===================================================================
|
||||
--- linux-3.14.25.orig/arch/arm/mach-ixp4xx/Kconfig 2014-11-30 15:26:41.488079161 +0100
|
||||
+++ linux-3.14.25/arch/arm/mach-ixp4xx/Kconfig 2014-12-01 07:28:47.406514014 +0100
|
||||
@@ -21,6 +21,14 @@
|
||||
--- a/arch/arm/mach-ixp4xx/Kconfig
|
||||
+++ b/arch/arm/mach-ixp4xx/Kconfig
|
||||
@@ -21,6 +21,14 @@ config MACH_AVILA
|
||||
Avila Network Platform. For more information on this platform,
|
||||
see <file:Documentation/arm/IXP4xx>.
|
||||
|
||||
@@ -17,7 +15,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/Kconfig
|
||||
config MACH_LOFT
|
||||
bool "Loft"
|
||||
depends on MACH_AVILA
|
||||
@@ -218,7 +226,7 @@
|
||||
@@ -218,7 +226,7 @@ config CPU_IXP46X
|
||||
|
||||
config CPU_IXP43X
|
||||
bool
|
||||
@@ -26,11 +24,9 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/Kconfig
|
||||
default y
|
||||
|
||||
config MACH_GTWX5715
|
||||
Index: linux-3.14.25/arch/arm/mach-ixp4xx/Makefile
|
||||
===================================================================
|
||||
--- linux-3.14.25.orig/arch/arm/mach-ixp4xx/Makefile 2014-11-30 15:26:41.488079161 +0100
|
||||
+++ linux-3.14.25/arch/arm/mach-ixp4xx/Makefile 2014-12-01 07:28:47.406514014 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
--- a/arch/arm/mach-ixp4xx/Makefile
|
||||
+++ b/arch/arm/mach-ixp4xx/Makefile
|
||||
@@ -7,6 +7,7 @@ obj-pci-n :=
|
||||
|
||||
obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o
|
||||
obj-pci-$(CONFIG_MACH_AVILA) += avila-pci.o
|
||||
@@ -38,7 +34,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/Makefile
|
||||
obj-pci-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o
|
||||
obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o
|
||||
obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o
|
||||
@@ -31,6 +32,7 @@
|
||||
@@ -31,6 +32,7 @@ obj-y += common.o
|
||||
|
||||
obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-setup.o
|
||||
obj-$(CONFIG_MACH_AVILA) += avila-setup.o
|
||||
@@ -46,10 +42,8 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/Makefile
|
||||
obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o
|
||||
obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
|
||||
obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o
|
||||
Index: linux-3.14.25/arch/arm/mach-ixp4xx/cambria-pci.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-3.14.25/arch/arm/mach-ixp4xx/cambria-pci.c 2014-11-30 15:26:41.728087272 +0100
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-ixp4xx/cambria-pci.c
|
||||
@@ -0,0 +1,78 @@
|
||||
+/*
|
||||
+ * arch/arch/mach-ixp4xx/cambria-pci.c
|
||||
@@ -129,10 +123,8 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/cambria-pci.c
|
||||
+}
|
||||
+
|
||||
+subsys_initcall(cambria_pci_init);
|
||||
Index: linux-3.14.25/arch/arm/mach-ixp4xx/cambria-setup.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-3.14.25/arch/arm/mach-ixp4xx/cambria-setup.c 2014-11-30 16:06:45.622389213 +0100
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/mach-ixp4xx/cambria-setup.c
|
||||
@@ -0,0 +1,1003 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-ixp4xx/cambria-setup.c
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-pci.c
|
||||
===================================================================
|
||||
--- linux-3.14.25.orig/arch/arm/mach-ixp4xx/avila-pci.c 2014-11-30 15:25:58.890640602 +0100
|
||||
+++ linux-3.14.25/arch/arm/mach-ixp4xx/avila-pci.c 2014-11-30 15:26:43.548148782 +0100
|
||||
--- a/arch/arm/mach-ixp4xx/avila-pci.c
|
||||
+++ b/arch/arm/mach-ixp4xx/avila-pci.c
|
||||
@@ -27,8 +27,8 @@
|
||||
#include <mach/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
@@ -13,7 +11,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-pci.c
|
||||
#define IRQ_LINES 4
|
||||
|
||||
/* PCI controller GPIO to IRQ pin mappings */
|
||||
@@ -55,10 +55,8 @@
|
||||
@@ -55,10 +55,8 @@ static int __init avila_map_irq(const st
|
||||
IXP4XX_GPIO_IRQ(INTD)
|
||||
};
|
||||
|
||||
@@ -26,10 +24,8 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-pci.c
|
||||
|
||||
return -1;
|
||||
}
|
||||
Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
===================================================================
|
||||
--- linux-3.14.25.orig/arch/arm/mach-ixp4xx/avila-setup.c 2014-11-30 15:25:58.890640602 +0100
|
||||
+++ linux-3.14.25/arch/arm/mach-ixp4xx/avila-setup.c 2014-11-30 16:03:14.803148025 +0100
|
||||
--- a/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
+++ b/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
@@ -14,9 +14,16 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
@@ -73,7 +69,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
static struct flash_platform_data avila_flash_data = {
|
||||
.map_name = "cfi_probe",
|
||||
.width = 2,
|
||||
@@ -105,14 +127,69 @@
|
||||
@@ -105,14 +127,69 @@ static struct platform_device avila_uart
|
||||
.resource = avila_uart_resources
|
||||
};
|
||||
|
||||
@@ -147,7 +143,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
.name = "intrq",
|
||||
.start = IRQ_IXP4XX_GPIO12,
|
||||
.end = IRQ_IXP4XX_GPIO12,
|
||||
@@ -133,21 +210,237 @@
|
||||
@@ -133,21 +210,237 @@ static struct platform_device avila_pata
|
||||
.resource = avila_pata_resources,
|
||||
};
|
||||
|
||||
@@ -392,7 +388,7 @@ Index: linux-3.14.25/arch/arm/mach-ixp4xx/avila-setup.c
|
||||
|
||||
avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1);
|
||||
avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1);
|
||||
@@ -159,8 +452,335 @@
|
||||
@@ -159,8 +452,335 @@ static void __init avila_init(void)
|
||||
avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2;
|
||||
|
||||
platform_device_register(&avila_pata);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
|
||||
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
|
||||
@@ -53,7 +53,7 @@ static int __init ixdp425_map_irq(const
|
||||
@@ -53,7 +53,7 @@ static int __init ixdp425_map_irq(const
|
||||
};
|
||||
|
||||
if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
|
||||
|
||||
Reference in New Issue
Block a user