summaryrefslogtreecommitdiff
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/020-gateworks_i2c_pld.patch8
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/050-disable_dmabounce.patch4
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/120-compex_support.patch2
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/150-lanready_ap1000_support.patch2
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/170-ixdpg425_mac_plat_info.patch2
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch22
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/300-avila_fetch_mac.patch12
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/301-avila_led.patch10
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/302-avila_gpio_device.patch32
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/310-gtwx5717_spi_bus.patch2
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/311-gtwx5717_mac_plat_info.patch2
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/402-ixp4xx_gpiolib.patch4
-rw-r--r--target/linux/ixp4xx/patches-2.6.33/520-tw2662_support.patch14
13 files changed, 42 insertions, 74 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.33/020-gateworks_i2c_pld.patch b/target/linux/ixp4xx/patches-2.6.33/020-gateworks_i2c_pld.patch
index a09a3becec..b51e26dfa4 100644
--- a/target/linux/ixp4xx/patches-2.6.33/020-gateworks_i2c_pld.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/020-gateworks_i2c_pld.patch
@@ -374,9 +374,9 @@
+MODULE_AUTHOR("Chris Lang");
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
-@@ -196,6 +196,14 @@ config GPIO_LANGWELL
- help
- Say Y here to support Intel Moorestown platform GPIO.
+@@ -221,6 +221,14 @@ config GPIO_TIMBERDALE
+ ---help---
+ Add support for the GPIO IP in the timberdale FPGA.
+config GPIO_GW_I2C_PLD
+ tristate "Gateworks I2C PLD GPIO Expander"
@@ -391,7 +391,7 @@
config GPIO_MAX7301
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
-@@ -19,3 +19,4 @@ obj-$(CONFIG_GPIO_XILINX) += xilinx_gpio
+@@ -22,3 +22,4 @@ obj-$(CONFIG_GPIO_CS5535) += cs5535-gpio
obj-$(CONFIG_GPIO_BT8XX) += bt8xxgpio.o
obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o
obj-$(CONFIG_GPIO_WM831X) += wm831x-gpio.o
diff --git a/target/linux/ixp4xx/patches-2.6.33/050-disable_dmabounce.patch b/target/linux/ixp4xx/patches-2.6.33/050-disable_dmabounce.patch
index 34de296b3d..64b3da0e54 100644
--- a/target/linux/ixp4xx/patches-2.6.33/050-disable_dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/050-disable_dmabounce.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -418,7 +418,6 @@ config ARCH_IXP4XX
+@@ -417,7 +417,6 @@ config ARCH_IXP4XX
select GENERIC_GPIO
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
@@ -109,7 +109,7 @@
void __init ixp4xx_pci_preinit(void)
{
-@@ -517,19 +529,35 @@ struct pci_bus * __devinit ixp4xx_scan_b
+@@ -513,19 +525,35 @@ struct pci_bus * __devinit ixp4xx_scan_b
int
pci_set_dma_mask(struct pci_dev *dev, u64 mask)
{
diff --git a/target/linux/ixp4xx/patches-2.6.33/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.33/120-compex_support.patch
index ccac8cc78f..3a26afec6f 100644
--- a/target/linux/ixp4xx/patches-2.6.33/120-compex_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/120-compex_support.patch
@@ -189,7 +189,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+MACHINE_END
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
-@@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = {
+@@ -70,7 +70,8 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void)
{
if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
diff --git a/target/linux/ixp4xx/patches-2.6.33/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.33/150-lanready_ap1000_support.patch
index 378786e278..1dd31e70ee 100644
--- a/target/linux/ixp4xx/patches-2.6.33/150-lanready_ap1000_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/150-lanready_ap1000_support.patch
@@ -154,7 +154,7 @@
+#endif
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
-@@ -67,7 +67,7 @@ int __init ixdp425_pci_init(void)
+@@ -71,7 +71,7 @@ int __init ixdp425_pci_init(void)
{
if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
machine_is_ixdp465() || machine_is_kixrp435() ||
diff --git a/target/linux/ixp4xx/patches-2.6.33/170-ixdpg425_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.33/170-ixdpg425_mac_plat_info.patch
index 772b697aa2..279f4c65fe 100644
--- a/target/linux/ixp4xx/patches-2.6.33/170-ixdpg425_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/170-ixdpg425_mac_plat_info.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
-@@ -73,9 +73,37 @@ static struct platform_device coyote_uar
+@@ -82,9 +82,37 @@ static struct platform_device coyote_uar
.resource = &coyote_uart_resource,
};
diff --git a/target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch
index 41058e2c8c..2ebe3e4e3e 100644
--- a/target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/191-cambria_optional_uart.patch
@@ -106,7 +106,7 @@
unsigned int type; /* If UPF_FIXED_TYPE */
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
-@@ -285,6 +285,7 @@ struct uart_port {
+@@ -288,6 +288,7 @@ struct uart_port {
#define UPIO_TSI (5) /* Tsi108/109 type IO */
#define UPIO_DWAPB (6) /* DesignWare APB UART */
#define UPIO_RM9000 (7) /* RM9000 type IO */
@@ -114,7 +114,7 @@
unsigned int read_status_mask; /* driver specific */
unsigned int ignore_status_mask; /* driver specific */
-@@ -327,6 +328,7 @@ struct uart_port {
+@@ -330,6 +331,7 @@ struct uart_port {
unsigned int mctrl; /* current modem ctrl settings */
unsigned int timeout; /* character-based timeout */
@@ -124,7 +124,7 @@
unsigned int custom_divisor;
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
-@@ -409,6 +409,20 @@
+@@ -409,6 +409,20 @@ static void mem_serial_out(struct uart_p
writeb(value, p->membase + offset);
}
@@ -145,7 +145,7 @@
static void mem32_serial_out(struct uart_port *p, int offset, int value)
{
offset = map_8250_out_reg(p, offset) << p->regshift;
-@@ -502,6 +516,11 @@
+@@ -502,6 +516,11 @@ static void set_io_from_upio(struct uart
p->serial_out = mem32_serial_out;
break;
@@ -157,7 +157,7 @@
#ifdef CONFIG_SERIAL_8250_AU1X00
case UPIO_AU:
p->serial_in = au_serial_in;
-@@ -534,6 +553,7 @@
+@@ -534,6 +553,7 @@ serial_out_sync(struct uart_8250_port *u
switch (p->iotype) {
case UPIO_MEM:
case UPIO_MEM32:
@@ -165,7 +165,7 @@
#ifdef CONFIG_SERIAL_8250_AU1X00
case UPIO_AU:
#endif
-@@ -2450,6 +2470,7 @@
+@@ -2450,6 +2470,7 @@ static int serial8250_request_std_resour
case UPIO_MEM32:
case UPIO_MEM:
case UPIO_DWAPB:
@@ -173,7 +173,7 @@
if (!up->port.mapbase)
break;
-@@ -2487,6 +2508,7 @@
+@@ -2487,6 +2508,7 @@ static void serial8250_release_std_resou
case UPIO_MEM32:
case UPIO_MEM:
case UPIO_DWAPB:
@@ -181,7 +181,7 @@
if (!up->port.mapbase)
break;
-@@ -2964,6 +2986,7 @@
+@@ -2964,6 +2986,7 @@ static int __devinit serial8250_probe(st
port.serial_in = p->serial_in;
port.serial_out = p->serial_out;
port.dev = &dev->dev;
@@ -189,7 +189,7 @@
port.irqflags |= irqflag;
ret = serial8250_register_port(&port);
if (ret < 0) {
-@@ -3113,6 +3136,7 @@
+@@ -3113,6 +3136,7 @@ int serial8250_register_port(struct uart
uart->port.iotype = port->iotype;
uart->port.flags = port->flags | UPF_BOOT_AUTOCONF;
uart->port.mapbase = port->mapbase;
@@ -199,7 +199,7 @@
uart->port.dev = port->dev;
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
-@@ -2161,6 +2161,7 @@ uart_report_port(struct uart_driver *drv
+@@ -2144,6 +2144,7 @@ uart_report_port(struct uart_driver *drv
snprintf(address, sizeof(address),
"I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
break;
@@ -207,7 +207,7 @@
case UPIO_MEM:
case UPIO_MEM32:
case UPIO_AU:
-@@ -2573,6 +2574,7 @@ int uart_match_port(struct uart_port *po
+@@ -2557,6 +2558,7 @@ int uart_match_port(struct uart_port *po
case UPIO_HUB6:
return (port1->iobase == port2->iobase) &&
(port1->hub6 == port2->hub6);
diff --git a/target/linux/ixp4xx/patches-2.6.33/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.33/300-avila_fetch_mac.patch
index d3ccb045c8..329fd95735 100644
--- a/target/linux/ixp4xx/patches-2.6.33/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/300-avila_fetch_mac.patch
@@ -15,11 +15,11 @@
+#include <linux/i2c/at24.h>
+
#include <linux/i2c-gpio.h>
-
#include <asm/types.h>
-@@ -29,6 +35,13 @@
- #include <asm/mach/arch.h>
- #include <asm/mach/flash.h>
+ #include <asm/setup.h>
+@@ -31,6 +37,13 @@
+ #define AVILA_SDA_PIN 7
+ #define AVILA_SCL_PIN 6
+struct avila_board_info {
+ unsigned char *model;
@@ -31,7 +31,7 @@
static struct flash_platform_data avila_flash_data = {
.map_name = "cfi_probe",
.width = 2,
-@@ -132,16 +145,181 @@ static struct platform_device avila_pata
+@@ -134,16 +147,181 @@ static struct platform_device avila_pata
.resource = avila_pata_resources,
};
@@ -213,7 +213,7 @@
avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
avila_flash_resource.end =
IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
-@@ -159,7 +337,28 @@ static void __init avila_init(void)
+@@ -161,7 +339,28 @@ static void __init avila_init(void)
platform_device_register(&avila_pata);
diff --git a/target/linux/ixp4xx/patches-2.6.33/301-avila_led.patch b/target/linux/ixp4xx/patches-2.6.33/301-avila_led.patch
index b5ecef67e5..cc5fadeede 100644
--- a/target/linux/ixp4xx/patches-2.6.33/301-avila_led.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/301-avila_led.patch
@@ -6,9 +6,9 @@
+#include <linux/leds.h>
#include <linux/i2c-gpio.h>
-
#include <asm/types.h>
-@@ -170,6 +171,72 @@ static struct platform_device avila_npec
+ #include <asm/setup.h>
+@@ -172,6 +173,72 @@ static struct platform_device avila_npec
.dev.platform_data = &avila_npec_data,
};
@@ -81,7 +81,7 @@
static struct platform_device *avila_devices[] __initdata = {
&avila_i2c_gpio,
&avila_flash,
-@@ -180,12 +247,16 @@ static void __init avila_gw23xx_setup(vo
+@@ -182,12 +249,16 @@ static void __init avila_gw23xx_setup(vo
{
platform_device_register(&avila_npeb_device);
platform_device_register(&avila_npec_device);
@@ -98,7 +98,7 @@
}
static void __init avila_gw2345_setup(void)
-@@ -196,22 +267,30 @@ static void __init avila_gw2345_setup(vo
+@@ -198,22 +269,30 @@ static void __init avila_gw2345_setup(vo
avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
platform_device_register(&avila_npec_device);
@@ -129,7 +129,7 @@
}
static void __init avila_gw2355_setup(void)
-@@ -222,11 +301,29 @@ static void __init avila_gw2355_setup(vo
+@@ -224,11 +303,29 @@ static void __init avila_gw2355_setup(vo
avila_npec_data.phy = 16;
platform_device_register(&avila_npec_device);
diff --git a/target/linux/ixp4xx/patches-2.6.33/302-avila_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.33/302-avila_gpio_device.patch
index 7e3daaa89e..f941a94bc1 100644
--- a/target/linux/ixp4xx/patches-2.6.33/302-avila_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/302-avila_gpio_device.patch
@@ -1,37 +1,5 @@
--- a/arch/arm/mach-ixp4xx/avila-setup.c
+++ b/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -237,10 +237,28 @@ static struct platform_device avila_latc
- .dev.platform_data = &avila_latch_leds_data,
- };
-
-+static struct resource avila_gpio_resources[] = {
-+ {
-+ .name = "gpio",
-+ /* FIXME: gpio mask should be model specific */
-+ .start = AVILA_GPIO_MASK,
-+ .end = AVILA_GPIO_MASK,
-+ .flags = 0,
-+ },
-+};
-+
-+static struct platform_device avila_gpio = {
-+ .name = "GPIODEV",
-+ .id = -1,
-+ .num_resources = ARRAY_SIZE(avila_gpio_resources),
-+ .resource = avila_gpio_resources,
-+};
-+
- static struct platform_device *avila_devices[] __initdata = {
- &avila_i2c_gpio,
- &avila_flash,
-- &avila_uart
-+ &avila_uart,
-+ &avila_gpio,
- };
-
- static void __init avila_gw23xx_setup(void)
---- a/arch/arm/mach-ixp4xx/avila-setup.c
-+++ b/arch/arm/mach-ixp4xx/avila-setup.c
@@ -38,6 +38,13 @@
#define AVILA_SDA_PIN 7
#define AVILA_SCL_PIN 6
diff --git a/target/linux/ixp4xx/patches-2.6.33/310-gtwx5717_spi_bus.patch b/target/linux/ixp4xx/patches-2.6.33/310-gtwx5717_spi_bus.patch
index d778c88d25..164e03e771 100644
--- a/target/linux/ixp4xx/patches-2.6.33/310-gtwx5717_spi_bus.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/310-gtwx5717_spi_bus.patch
@@ -8,7 +8,7 @@
#include <asm/types.h>
#include <asm/setup.h>
#include <asm/memory.h>
-@@ -147,9 +148,41 @@
+@@ -147,9 +148,41 @@ static struct platform_device gtwx5715_f
.resource = &gtwx5715_flash_resource,
};
diff --git a/target/linux/ixp4xx/patches-2.6.33/311-gtwx5717_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.33/311-gtwx5717_mac_plat_info.patch
index 29f329017e..8ce79e4d07 100644
--- a/target/linux/ixp4xx/patches-2.6.33/311-gtwx5717_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/311-gtwx5717_mac_plat_info.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-@@ -154,10 +154,37 @@ static struct platform_device gtwx5715_s
+@@ -179,10 +179,37 @@ static struct platform_device gtwx5715_s
},
};
diff --git a/target/linux/ixp4xx/patches-2.6.33/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.33/402-ixp4xx_gpiolib.patch
index b3f1336f52..0d5a25378b 100644
--- a/target/linux/ixp4xx/patches-2.6.33/402-ixp4xx_gpiolib.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/402-ixp4xx_gpiolib.patch
@@ -50,7 +50,7 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -418,6 +418,7 @@ config ARCH_IXP4XX
+@@ -417,6 +417,7 @@ config ARCH_IXP4XX
select GENERIC_GPIO
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
@@ -122,4 +122,4 @@
+#define gpio_cansleep __gpio_cansleep
extern int gpio_to_irq(int gpio);
- extern int irq_to_gpio(int gpio);
+ extern int irq_to_gpio(unsigned int irq);
diff --git a/target/linux/ixp4xx/patches-2.6.33/520-tw2662_support.patch b/target/linux/ixp4xx/patches-2.6.33/520-tw2662_support.patch
index b26016ca59..cc796c504b 100644
--- a/target/linux/ixp4xx/patches-2.6.33/520-tw2662_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.33/520-tw2662_support.patch
@@ -1,6 +1,6 @@
---- a/arch/arm/mach-ixp4xx/Kconfig
+--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -180,6 +180,15 @@
+@@ -180,6 +180,15 @@ config ARCH_PRPMC1100
PrPCM1100 Processor Mezanine Module. For more information on
this platform, see <file:Documentation/arm/IXP4xx>.
@@ -18,7 +18,7 @@
select PCI
--- a/arch/arm/mach-ixp4xx/Makefile
+++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ obj-pci-$(CONFIG_MACH_SIDEWINDER) += sid
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o
@@ -26,7 +26,7 @@
obj-pci-$(CONFIG_MACH_TW5334) += tw5334-pci.o
obj-pci-$(CONFIG_MACH_MI424WR) += mi424wr-pci.o
obj-pci-$(CONFIG_MACH_USR8200) += usr8200-pci.o
-@@ -48,6 +49,7 @@
+@@ -48,6 +49,7 @@ obj-$(CONFIG_MACH_SIDEWINDER) += sidewin
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
@@ -36,7 +36,7 @@
obj-$(CONFIG_MACH_USR8200) += usr8200-setup.o
--- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ static __inline__ void __arch_decomp_set
if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
machine_is_gateway7001() || machine_is_wg302v2() ||
machine_is_pronghorn() || machine_is_pronghorn_metro() || machine_is_wrt300nv2() ||
@@ -45,7 +45,7 @@
uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
else
uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
---- a/arch/arm/mach-ixp4xx/tw2662-pci.c
+--- /dev/null
+++ b/arch/arm/mach-ixp4xx/tw2662-pci.c
@@ -0,0 +1,68 @@
+/*
@@ -116,7 +116,7 @@
+}
+
+subsys_initcall(tw2662_pci_init);
---- a/arch/arm/mach-ixp4xx/tw2662-setup.c
+--- /dev/null
+++ b/arch/arm/mach-ixp4xx/tw2662-setup.c
@@ -0,0 +1,208 @@
+/*
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-26 16:00:27 +0000