summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.34/005-ar71xx_mac_driver.patch4
-rw-r--r--target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch4
-rw-r--r--target/linux/ar71xx/patches-2.6.34/007-ar91xx_flash_driver.patch6
-rw-r--r--target/linux/ar71xx/patches-2.6.34/102-mtd_m25p80_add_myloader_parser.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.34/104-mtd_m25p80_add_redboot_parser.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.34/109-mtd-wrt160nl-trx-parser.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.34/120-dsa-trailer-tag-validation-fix.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.34/202-spi_vsc7385_driver.patch4
-rw-r--r--target/linux/ar71xx/patches-2.6.34/203-pb44_spi_controller.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.34/205-wndr3700-usb-led-driver.patch10
-rw-r--r--target/linux/ar71xx/patches-2.6.34/206-nxp-74hc153-gpio-chip-driver.patch4
-rw-r--r--target/linux/ar71xx/patches-2.6.34/207-rb750-led-driver.patch8
-rw-r--r--target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch2
16 files changed, 29 insertions, 29 deletions
diff --git a/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch
index 5073652dd..33be31383 100644
--- a/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch
+++ b/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -166,6 +166,13 @@ ifeq (,$(findstring march=octeon, $(cfla
+@@ -168,6 +168,13 @@ ifeq (,$(findstring march=octeon, $(cfla
cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
endif
diff --git a/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch
index 238a79c9b..2d7ffa014 100644
--- a/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch
+++ b/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch
@@ -44,7 +44,7 @@
#error "missing bus glue for ehci-hcd"
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
-@@ -1085,6 +1085,11 @@ MODULE_LICENSE ("GPL");
+@@ -1090,6 +1090,11 @@ MODULE_LICENSE ("GPL");
#define TMIO_OHCI_DRIVER ohci_hcd_tmio_driver
#endif
diff --git a/target/linux/ar71xx/patches-2.6.34/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.34/005-ar71xx_mac_driver.patch
index 3721a9b86..08d9154d9 100644
--- a/target/linux/ar71xx/patches-2.6.34/005-ar71xx_mac_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.34/005-ar71xx_mac_driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
-@@ -2128,6 +2128,8 @@ config ACENIC_OMIT_TIGON_I
+@@ -2161,6 +2161,8 @@ config ACENIC_OMIT_TIGON_I
The safe and default value for this is N.
@@ -11,7 +11,7 @@
depends on PCI
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
-@@ -106,6 +106,7 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac/
+@@ -109,6 +109,7 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac/
# end link order section
#
diff --git a/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch b/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch
index d71a11b86..53492c7b7 100644
--- a/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.34/006-ar71xx_wdt_driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -840,6 +840,13 @@ config TXX9_WDT
+@@ -857,6 +857,13 @@ config TXX9_WDT
help
Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
@@ -16,7 +16,7 @@
# POWERPC Architecture
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
-@@ -112,6 +112,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
+@@ -113,6 +113,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
diff --git a/target/linux/ar71xx/patches-2.6.34/007-ar91xx_flash_driver.patch b/target/linux/ar71xx/patches-2.6.34/007-ar91xx_flash_driver.patch
index 5dbdd293c..817f2ccb9 100644
--- a/target/linux/ar71xx/patches-2.6.34/007-ar91xx_flash_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.34/007-ar91xx_flash_driver.patch
@@ -1,8 +1,8 @@
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
-@@ -257,6 +257,13 @@ config MTD_ALCHEMY
+@@ -251,6 +251,13 @@ config MTD_NETtel
help
- Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
+ Support for flash chips on NETtel/SecureEdge/SnapGear boards.
+config MTD_AR91XX_FLASH
+ tristate "Atheros AR91xx parallel flash support"
@@ -16,7 +16,7 @@
depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
-@@ -40,6 +40,7 @@
+@@ -40,6 +40,7 @@ obj-$(CONFIG_MTD_SCx200_DOCFLASH)+= scx2
obj-$(CONFIG_MTD_DBOX2) += dbox2-flash.o
obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
obj-$(CONFIG_MTD_PCI) += pci.o
diff --git a/target/linux/ar71xx/patches-2.6.34/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.34/102-mtd_m25p80_add_myloader_parser.patch
index 45f743e06..2add60727 100644
--- a/target/linux/ar71xx/patches-2.6.34/102-mtd_m25p80_add_myloader_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.34/102-mtd_m25p80_add_myloader_parser.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -922,6 +922,16 @@ static int __devinit m25p_probe(struct s
+@@ -923,6 +923,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
diff --git a/target/linux/ar71xx/patches-2.6.34/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.34/104-mtd_m25p80_add_redboot_parser.patch
index 43fe987df..190101d64 100644
--- a/target/linux/ar71xx/patches-2.6.34/104-mtd_m25p80_add_redboot_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.34/104-mtd_m25p80_add_redboot_parser.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -932,6 +932,15 @@ static int __devinit m25p_probe(struct s
+@@ -933,6 +933,15 @@ static int __devinit m25p_probe(struct s
}
#endif
diff --git a/target/linux/ar71xx/patches-2.6.34/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.34/109-mtd-wrt160nl-trx-parser.patch
index 037795b33..f226484d0 100644
--- a/target/linux/ar71xx/patches-2.6.34/109-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-2.6.34/109-mtd-wrt160nl-trx-parser.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -941,6 +941,16 @@ static int __devinit m25p_probe(struct s
+@@ -942,6 +942,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
#endif
diff --git a/target/linux/ar71xx/patches-2.6.34/120-dsa-trailer-tag-validation-fix.patch b/target/linux/ar71xx/patches-2.6.34/120-dsa-trailer-tag-validation-fix.patch
index b58aeedc3..3e3902bac 100644
--- a/target/linux/ar71xx/patches-2.6.34/120-dsa-trailer-tag-validation-fix.patch
+++ b/target/linux/ar71xx/patches-2.6.34/120-dsa-trailer-tag-validation-fix.patch
@@ -1,6 +1,6 @@
--- a/net/dsa/tag_trailer.c
+++ b/net/dsa/tag_trailer.c
-@@ -86,7 +86,7 @@ static int trailer_rcv(struct sk_buff *s
+@@ -87,7 +87,7 @@ static int trailer_rcv(struct sk_buff *s
trailer = skb_tail_pointer(skb) - 4;
if (trailer[0] != 0x80 || (trailer[1] & 0xf8) != 0x00 ||
diff --git a/target/linux/ar71xx/patches-2.6.34/202-spi_vsc7385_driver.patch b/target/linux/ar71xx/patches-2.6.34/202-spi_vsc7385_driver.patch
index 487785a94..b0bb15fce 100644
--- a/target/linux/ar71xx/patches-2.6.34/202-spi_vsc7385_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.34/202-spi_vsc7385_driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
-@@ -365,6 +365,11 @@ config SPI_TLE62X0
+@@ -386,6 +386,11 @@ config SPI_TLE62X0
sysfs interface, with each line presented as a kind of GPIO
exposing both switch control and diagnostic feedback.
@@ -14,7 +14,7 @@
#
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
-@@ -54,6 +54,7 @@ spi_s3c24xx_hw-$(CONFIG_SPI_S3C24XX_FIQ)
+@@ -57,6 +57,7 @@ spi_s3c24xx_hw-$(CONFIG_SPI_S3C24XX_FIQ)
# SPI protocol drivers (device/link on bus)
obj-$(CONFIG_SPI_SPIDEV) += spidev.o
diff --git a/target/linux/ar71xx/patches-2.6.34/203-pb44_spi_controller.patch b/target/linux/ar71xx/patches-2.6.34/203-pb44_spi_controller.patch
index 2a6edeb18..9ac8d5b56 100644
--- a/target/linux/ar71xx/patches-2.6.34/203-pb44_spi_controller.patch
+++ b/target/linux/ar71xx/patches-2.6.34/203-pb44_spi_controller.patch
@@ -17,7 +17,7 @@
depends on (ARCH_AT91 || AVR32)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_SPI_GPIO) += spi_gpio.o
+@@ -27,6 +27,7 @@ obj-$(CONFIG_SPI_GPIO) += spi_gpio.o
obj-$(CONFIG_SPI_GPIO_OLD) += spi_gpio_old.o
obj-$(CONFIG_SPI_IMX) += spi_imx.o
obj-$(CONFIG_SPI_LM70_LLP) += spi_lm70llp.o
diff --git a/target/linux/ar71xx/patches-2.6.34/205-wndr3700-usb-led-driver.patch b/target/linux/ar71xx/patches-2.6.34/205-wndr3700-usb-led-driver.patch
index d2fbc9c76..b289a85d4 100644
--- a/target/linux/ar71xx/patches-2.6.34/205-wndr3700-usb-led-driver.patch
+++ b/target/linux/ar71xx/patches-2.6.34/205-wndr3700-usb-led-driver.patch
@@ -1,8 +1,8 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
-@@ -269,6 +269,13 @@ config LEDS_ADP5520
- To compile this driver as a module, choose M here: the module will
- be called leds-adp5520.
+@@ -294,6 +294,13 @@ config LEDS_TRIGGERS
+
+ if LEDS_TRIGGERS
+config LEDS_WNDR3700_USB
+ tristate "NETGEAR WNDR3700 USB LED driver"
@@ -13,10 +13,10 @@
+
comment "LED Triggers"
- config LEDS_TRIGGERS
+ config LEDS_TRIGGER_TIMER
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_LEDS_DA903X) += leds-da903
+@@ -30,6 +30,7 @@ obj-$(CONFIG_LEDS_DA903X) += leds-da903
obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
obj-$(CONFIG_LEDS_PWM) += leds-pwm.o
diff --git a/target/linux/ar71xx/patches-2.6.34/206-nxp-74hc153-gpio-chip-driver.patch b/target/linux/ar71xx/patches-2.6.34/206-nxp-74hc153-gpio-chip-driver.patch
index 575f7bbd8..cf1d02a9e 100644
--- a/target/linux/ar71xx/patches-2.6.34/206-nxp-74hc153-gpio-chip-driver.patch
+++ b/target/linux/ar71xx/patches-2.6.34/206-nxp-74hc153-gpio-chip-driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
-@@ -255,4 +255,12 @@ config GPIO_UCB1400
+@@ -310,4 +310,12 @@ config GPIO_UCB1400
To compile this driver as a module, choose M here: the
module will be called ucb1400_gpio.
@@ -15,7 +15,7 @@
endif
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_GPIO_MAX7301) += max7301.o
+@@ -13,6 +13,7 @@ obj-$(CONFIG_GPIO_MAX7301) += max7301.o
obj-$(CONFIG_GPIO_MAX732X) += max732x.o
obj-$(CONFIG_GPIO_MC33880) += mc33880.o
obj-$(CONFIG_GPIO_MCP23S08) += mcp23s08.o
diff --git a/target/linux/ar71xx/patches-2.6.34/207-rb750-led-driver.patch b/target/linux/ar71xx/patches-2.6.34/207-rb750-led-driver.patch
index 500604fe2..b114dcc1e 100644
--- a/target/linux/ar71xx/patches-2.6.34/207-rb750-led-driver.patch
+++ b/target/linux/ar71xx/patches-2.6.34/207-rb750-led-driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
-@@ -276,6 +276,10 @@ config LEDS_WNDR3700_USB
+@@ -301,6 +301,10 @@ config LEDS_WNDR3700_USB
This option enables support for the USB LED found on the
NETGEAR WNDR3700 board.
@@ -10,13 +10,13 @@
+
comment "LED Triggers"
- config LEDS_TRIGGERS
+ config LEDS_TRIGGER_TIMER
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_LEDS_REGULATOR) += leds-re
- obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o
+@@ -36,6 +36,7 @@ obj-$(CONFIG_LEDS_INTEL_SS4200) += leds
obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o
obj-$(CONFIG_LEDS_ADP5520) += leds-adp5520.o
+ obj-$(CONFIG_LEDS_DELL_NETBOOKS) += dell-led.o
+obj-$(CONFIG_LEDS_RB750) += leds-rb750.o
# LED SPI Drivers
diff --git a/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch
index 0d8f132dd..48d0de83a 100644
--- a/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch
+++ b/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -188,6 +188,7 @@ endif
+@@ -190,6 +190,7 @@ endif
#
libs-$(CONFIG_ARC) += arch/mips/fw/arc/
libs-$(CONFIG_CFE) += arch/mips/fw/cfe/
diff --git a/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch
index c10f4efb1..595a40b2a 100644
--- a/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch
+++ b/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch
@@ -8,7 +8,7 @@
extern void check_wait(void);
extern asmlinkage void r4k_wait(void);
-@@ -1501,6 +1502,8 @@
+@@ -1501,6 +1502,8 @@ void __cpuinit per_cpu_trap_init(void)
if (cpu_has_mips_r2) {
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;