From fce3ebbff8fddeb9fa6dba77e53878f85cff998a Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 11 Dec 2009 15:56:38 +0000 Subject: [PATCH] ar71xx: nuke 2.6.28 support SVN-Revision: 18750 --- target/linux/ar71xx/config-2.6.28 | 216 ------------------ .../patches-2.6.28/001-ar71xx_core.patch | 50 ---- .../patches-2.6.28/002-ar71xx_pci.patch | 10 - .../patches-2.6.28/003-ar71xx_usb_host.patch | 58 ----- .../004-ar71xx_spi_controller.patch | 26 --- .../005-ar71xx_mac_driver.patch | 21 -- .../006-ar71xx_wdt_driver.patch | 26 --- .../007-ar91xx_flash_driver.patch | 26 --- ...-mtd_m25p80_add_pm25lv_flash_support.patch | 13 -- .../101-ksz8041_phy_driver.patch | 24 -- .../102-mtd_m25p80_add_myloader_parser.patch | 22 -- .../103-mtd_m25p80_add_en25pxx_support.patch | 13 -- .../104-mtd_m25p80_add_redboot_parser.patch | 12 - .../105-mtd_m25p80_add_mx25lxxx_support.patch | 14 -- .../106-mtd_m25p80_add_xxxs33b_support.patch | 14 -- .../107-mtd-SST39VF6401B-support.patch | 29 --- ...x_cfi_cmdset_0002_erase_status_check.patch | 20 -- .../109-mtd-wrt160nl-trx-parser.patch | 37 --- ...usb-ehci-add-war-for-synopsys-hc-bug.patch | 22 -- .../140-redboot_partition_scan.patch | 54 ----- .../200-rb4xx_nand_driver.patch | 21 -- .../201-ap83_spi_controller.patch | 27 --- .../202-spi_vsc7385_driver.patch | 24 -- .../203-pb44_spi_controller.patch | 27 --- .../204-rtl8366-smi-driver.patch | 21 -- .../patches-2.6.28/300-mips_fw_myloader.patch | 22 -- .../901-get_c0_compare_irq_function.patch | 29 --- .../902-mips_clocksource_init_war.patch | 56 ----- 28 files changed, 934 deletions(-) delete mode 100644 target/linux/ar71xx/config-2.6.28 delete mode 100644 target/linux/ar71xx/patches-2.6.28/001-ar71xx_core.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/002-ar71xx_pci.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/003-ar71xx_usb_host.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/004-ar71xx_spi_controller.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/005-ar71xx_mac_driver.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/006-ar71xx_wdt_driver.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/007-ar91xx_flash_driver.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/100-mtd_m25p80_add_pm25lv_flash_support.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/102-mtd_m25p80_add_myloader_parser.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25pxx_support.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/104-mtd_m25p80_add_redboot_parser.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/106-mtd_m25p80_add_xxxs33b_support.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/107-mtd-SST39VF6401B-support.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/109-mtd-wrt160nl-trx-parser.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/110-usb-ehci-add-war-for-synopsys-hc-bug.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/140-redboot_partition_scan.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/200-rb4xx_nand_driver.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/201-ap83_spi_controller.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/202-spi_vsc7385_driver.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/203-pb44_spi_controller.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/204-rtl8366-smi-driver.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/300-mips_fw_myloader.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/901-get_c0_compare_irq_function.patch delete mode 100644 target/linux/ar71xx/patches-2.6.28/902-mips_clocksource_init_war.patch diff --git a/target/linux/ar71xx/config-2.6.28 b/target/linux/ar71xx/config-2.6.28 deleted file mode 100644 index 7f84bab54a..0000000000 --- a/target/linux/ar71xx/config-2.6.28 +++ /dev/null @@ -1,216 +0,0 @@ -CONFIG_32BIT=y -# CONFIG_64BIT is not set -# CONFIG_8139TOO is not set -CONFIG_AG71XX=y -CONFIG_AG71XX_AR8216_SUPPORT=y -# CONFIG_AG71XX_DEBUG is not set -CONFIG_AR71XX_MACH_AP81=y -CONFIG_AR71XX_MACH_AP83=y -CONFIG_AR71XX_MACH_AW_NR580=y -CONFIG_AR71XX_MACH_DIR_825_B1=y -CONFIG_AR71XX_MACH_GENERIC=y -CONFIG_AR71XX_MACH_MZK_W04NU=y -CONFIG_AR71XX_MACH_MZK_W300NH=y -CONFIG_AR71XX_MACH_PB42=y -CONFIG_AR71XX_MACH_PB44=y -CONFIG_AR71XX_MACH_RB_4XX=y -CONFIG_AR71XX_MACH_TEW_632BRP=y -CONFIG_AR71XX_MACH_TL_WR1043ND=y -CONFIG_AR71XX_MACH_TL_WR741ND=y -CONFIG_AR71XX_MACH_TL_WR941ND=y -CONFIG_AR71XX_MACH_UBNT=y -CONFIG_AR71XX_MACH_WNDR3700=y -CONFIG_AR71XX_MACH_WNR2000=y -CONFIG_AR71XX_MACH_WP543=y -CONFIG_AR71XX_MACH_WRT160NL=y -CONFIG_AR71XX_MACH_WRT400N=y -CONFIG_AR71XX_WDT=y -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y -# CONFIG_ARCH_SUPPORTS_MSI is not set -CONFIG_ARCH_SUPPORTS_OPROFILE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ATHEROS_AR71XX=y -# CONFIG_BCM47XX is not set -CONFIG_BITREVERSE=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CEVT_R4K=y -CONFIG_CLASSIC_RCU=y -CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200" -CONFIG_CPU_BIG_ENDIAN=y -CONFIG_CPU_HAS_LLSC=y -CONFIG_CPU_HAS_PREFETCH=y -CONFIG_CPU_HAS_SYNC=y -# CONFIG_CPU_LITTLE_ENDIAN is not set -# CONFIG_CPU_LOONGSON2 is not set -CONFIG_CPU_MIPS32=y -# CONFIG_CPU_MIPS32_R1 is not set -CONFIG_CPU_MIPS32_R2=y -# CONFIG_CPU_MIPS64_R1 is not set -# CONFIG_CPU_MIPS64_R2 is not set -CONFIG_CPU_MIPSR2=y -# CONFIG_CPU_NEVADA is not set -# CONFIG_CPU_R10000 is not set -# CONFIG_CPU_R3000 is not set -# CONFIG_CPU_R4300 is not set -# CONFIG_CPU_R4X00 is not set -# CONFIG_CPU_R5000 is not set -# CONFIG_CPU_R5432 is not set -# CONFIG_CPU_R5500 is not set -# CONFIG_CPU_R6000 is not set -# CONFIG_CPU_R8000 is not set -# CONFIG_CPU_RM7000 is not set -# CONFIG_CPU_RM9000 is not set -# CONFIG_CPU_SB1 is not set -CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y -CONFIG_CPU_SUPPORTS_HIGHMEM=y -# CONFIG_CPU_TX39XX is not set -# CONFIG_CPU_TX49XX is not set -# CONFIG_CPU_VR41XX is not set -CONFIG_CSRC_R4K=y -CONFIG_DEVPORT=y -# CONFIG_DM9000 is not set -CONFIG_DMA_NEED_PCI_MAP_STATE=y -CONFIG_DMA_NONCOHERENT=y -CONFIG_EARLY_PRINTK=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_GPIO=y -# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set -CONFIG_GPIOLIB=y -CONFIG_GPIO_PCF857X=y -CONFIG_GPIO_SYSFS=y -CONFIG_HARDWARE_WATCHPOINTS=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -CONFIG_HAVE_IDE=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HW_HAS_PCI=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_GPIO=y -CONFIG_ICPLUS_PHY=y -# CONFIG_IDE is not set -CONFIG_IMAGE_CMDLINE_HACK=y -CONFIG_INITRAMFS_ROOT_GID=0 -CONFIG_INITRAMFS_ROOT_UID=0 -CONFIG_INITRAMFS_SOURCE="../../root" -CONFIG_IRQ_CPU=y -# CONFIG_ISDN is not set -# CONFIG_LEDS_GPIO is not set -# CONFIG_LEMOTE_FULONG is not set -# CONFIG_M25PXX_USE_FAST_READ is not set -# CONFIG_MACH_ALCHEMY is not set -# CONFIG_MACH_DECSTATION is not set -# CONFIG_MACH_EMMA is not set -# CONFIG_MACH_JAZZ is not set -# CONFIG_MACH_TX39XX is not set -# CONFIG_MACH_TX49XX is not set -# CONFIG_MACH_VR41XX is not set -CONFIG_MICREL_PHY=y -# CONFIG_MIKROTIK_RB532 is not set -CONFIG_MIPS=y -# CONFIG_MIPS_COBALT is not set -CONFIG_MIPS_L1_CACHE_SHIFT=5 -CONFIG_MIPS_MACHINE=y -# CONFIG_MIPS_MALTA is not set -CONFIG_MIPS_MT_DISABLED=y -# CONFIG_MIPS_MT_SMP is not set -# CONFIG_MIPS_MT_SMTC is not set -# CONFIG_MIPS_SIM is not set -CONFIG_MTD_AR91XX_FLASH=y -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_CFI_INTELEXT is not set -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_MYLOADER_PARTS=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_RB4XX=y -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 -CONFIG_MTD_REDBOOT_PARTS=y -CONFIG_MTD_WRT160NL_PARTS=y -CONFIG_MYLOADER=y -CONFIG_NET_DSA=y -CONFIG_NET_DSA_MV88E6060=y -# CONFIG_NET_DSA_MV88E6123_61_65 is not set -# CONFIG_NET_DSA_MV88E6131 is not set -# CONFIG_NET_DSA_MV88E6XXX is not set -# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set -# CONFIG_NET_DSA_TAG_DSA is not set -# CONFIG_NET_DSA_TAG_EDSA is not set -CONFIG_NET_DSA_TAG_TRAILER=y -# CONFIG_NO_IOPORT is not set -# CONFIG_NXP_STB220 is not set -# CONFIG_NXP_STB225 is not set -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_PCI_DISABLE_COMMON_QUIRKS=y -CONFIG_PCI_DOMAINS=y -CONFIG_PHYLIB=y -# CONFIG_PMC_MSP is not set -# CONFIG_PMC_YOSEMITE is not set -# CONFIG_PNX8550_JBS is not set -# CONFIG_PNX8550_STB810 is not set -# CONFIG_PROBE_INITRD_HEADER is not set -# CONFIG_R6040 is not set -CONFIG_RTL8306_PHY=y -CONFIG_RTL8366_SMI=y -CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -# CONFIG_SCSI_DMA is not set -# CONFIG_SERIAL_8250_EXTENDED is not set -CONFIG_SERIAL_8250_NR_UARTS=1 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 -# CONFIG_SGI_IP22 is not set -# CONFIG_SGI_IP27 is not set -# CONFIG_SGI_IP28 is not set -# CONFIG_SGI_IP32 is not set -# CONFIG_SIBYTE_BIGSUR is not set -# CONFIG_SIBYTE_CARMEL is not set -# CONFIG_SIBYTE_CRHINE is not set -# CONFIG_SIBYTE_CRHONE is not set -# CONFIG_SIBYTE_LITTLESUR is not set -# CONFIG_SIBYTE_RHONE is not set -# CONFIG_SIBYTE_SENTOSA is not set -# CONFIG_SIBYTE_SWARM is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -CONFIG_SPI=y -CONFIG_SPI_AP83=y -CONFIG_SPI_AR71XX=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_GPIO=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_PB44=y -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_VSC7385 is not set -CONFIG_SWCONFIG=y -CONFIG_SYS_HAS_CPU_MIPS32_R1=y -CONFIG_SYS_HAS_CPU_MIPS32_R2=y -CONFIG_SYS_HAS_EARLY_PRINTK=y -CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y -CONFIG_SYS_SUPPORTS_ARBIT_HZ=y -CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y -# CONFIG_TC35815 is not set -CONFIG_TRAD_SIGNALS=y -CONFIG_USB_SUPPORT=y -# CONFIG_VGASTATE is not set -# CONFIG_VIA_RHINE is not set -CONFIG_YAFFS_9BYTE_TAGS=y -CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y -CONFIG_YAFFS_AUTO_YAFFS2=y -# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set -# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y -CONFIG_YAFFS_YAFFS1=y -CONFIG_YAFFS_YAFFS2=y -CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ar71xx/patches-2.6.28/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.28/001-ar71xx_core.patch deleted file mode 100644 index 30004aaf66..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/001-ar71xx_core.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -593,6 +593,13 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/ - core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/ - core-$(CONFIG_TOSHIBA_RBTX4939) += arch/mips/txx9/rbtx4939/ - -+# -+# Atheros AR71xx -+# -+core-$(CONFIG_ATHEROS_AR71XX) += arch/mips/ar71xx/ -+cflags-$(CONFIG_ATHEROS_AR71XX) += -I$(srctree)/arch/mips/include/asm/mach-ar71xx -+load-$(CONFIG_ATHEROS_AR71XX) += 0xffffffff80060000 -+ - # temporary until string.h is fixed - cflags-y += -ffreestanding - ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -22,6 +22,23 @@ choice - config MACH_ALCHEMY - bool "Alchemy processor based machines" - -+config ATHEROS_AR71XX -+ bool "Atheros AR71xx based boards" -+ select CEVT_R4K -+ select CSRC_R4K -+ select DMA_NONCOHERENT -+ select HW_HAS_PCI -+ select IRQ_CPU -+ select ARCH_REQUIRE_GPIOLIB -+ select SYS_HAS_CPU_MIPS32_R1 -+ select SYS_HAS_CPU_MIPS32_R2 -+ select SYS_SUPPORTS_32BIT_KERNEL -+ select SYS_SUPPORTS_BIG_ENDIAN -+ select SYS_HAS_EARLY_PRINTK -+ select MIPS_MACHINE -+ help -+ Support for Atheros AR71xx based boards. -+ - config BASLER_EXCITE - bool "Basler eXcite smart camera" - select CEVT_R4K -@@ -598,6 +615,7 @@ config WR_PPMC - endchoice - - source "arch/mips/alchemy/Kconfig" -+source "arch/mips/ar71xx/Kconfig" - source "arch/mips/basler/excite/Kconfig" - source "arch/mips/emma/Kconfig" - source "arch/mips/jazz/Kconfig" diff --git a/target/linux/ar71xx/patches-2.6.28/002-ar71xx_pci.patch b/target/linux/ar71xx/patches-2.6.28/002-ar71xx_pci.patch deleted file mode 100644 index 737c21f10b..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/002-ar71xx_pci.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/mips/pci/Makefile -+++ b/arch/mips/pci/Makefile -@@ -16,6 +16,7 @@ obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o - obj-$(CONFIG_NEC_MARKEINS) += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o - obj-$(CONFIG_PCI_TX4927) += ops-tx4927.o - obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o -+obj-$(CONFIG_ATHEROS_AR71XX) += pci-ar71xx.o pci-ar724x.o - - # - # These are still pretty much in the old state, watch, go blind. diff --git a/target/linux/ar71xx/patches-2.6.28/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.28/003-ar71xx_usb_host.patch deleted file mode 100644 index 53f811bc99..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/003-ar71xx_usb_host.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/drivers/usb/host/Kconfig -+++ b/drivers/usb/host/Kconfig -@@ -81,6 +81,13 @@ config USB_EHCI_BIG_ENDIAN_DESC - depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX) - default y - -+config USB_EHCI_AR71XX -+ bool "USB EHCI support for AR71xx" -+ depends on USB_EHCI_HCD && ATHEROS_AR71XX -+ default y -+ help -+ Support for Atheros AR71xx built-in EHCI controller -+ - config USB_EHCI_FSL - bool "Support for Freescale on-chip EHCI USB controller" - depends on USB_EHCI_HCD && FSL_SOC -@@ -140,6 +147,13 @@ config USB_OHCI_HCD - To compile this driver as a module, choose M here: the - module will be called ohci-hcd. - -+config USB_OHCI_AR71XX -+ bool "USB OHCI support for Atheros AR71xx" -+ depends on USB_OHCI_HCD && ATHEROS_AR71XX -+ default y -+ help -+ Support for Atheros AR71xx built-in OHCI controller -+ - config USB_OHCI_HCD_PPC_SOC - bool "OHCI support for on-chip PPC USB controller" - depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx) ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -1036,6 +1036,11 @@ MODULE_LICENSE ("GPL"); - #define PLATFORM_DRIVER ixp4xx_ehci_driver - #endif - -+#ifdef CONFIG_USB_EHCI_AR71XX -+#include "ehci-ar71xx.c" -+#define PLATFORM_DRIVER ehci_ar71xx_driver -+#endif -+ - #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ - !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) - #error "missing bus glue for ehci-hcd" ---- a/drivers/usb/host/ohci-hcd.c -+++ b/drivers/usb/host/ohci-hcd.c -@@ -1080,6 +1080,11 @@ MODULE_LICENSE ("GPL"); - #define TMIO_OHCI_DRIVER ohci_hcd_tmio_driver - #endif - -+#ifdef CONFIG_USB_OHCI_AR71XX -+#include "ohci-ar71xx.c" -+#define PLATFORM_DRIVER ohci_hcd_ar71xx_driver -+#endif -+ - #if !defined(PCI_DRIVER) && \ - !defined(PLATFORM_DRIVER) && \ - !defined(OF_PLATFORM_DRIVER) && \ diff --git a/target/linux/ar71xx/patches-2.6.28/004-ar71xx_spi_controller.patch b/target/linux/ar71xx/patches-2.6.28/004-ar71xx_spi_controller.patch deleted file mode 100644 index 9c196e077e..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/004-ar71xx_spi_controller.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/drivers/spi/Kconfig -+++ b/drivers/spi/Kconfig -@@ -53,6 +53,13 @@ if SPI_MASTER - - comment "SPI Master Controller Drivers" - -+config SPI_AR71XX -+ tristate "Atheros AR71xx SPI Controller" -+ depends on SPI_MASTER && ATHEROS_AR71XX -+ select SPI_BITBANG -+ help -+ This is the SPI contoller driver for Atheros AR71xx. -+ - config SPI_ATMEL - tristate "Atmel SPI Controller" - depends on (ARCH_AT91 || AVR32) ---- a/drivers/spi/Makefile -+++ b/drivers/spi/Makefile -@@ -11,6 +11,7 @@ endif - obj-$(CONFIG_SPI_MASTER) += spi.o - - # SPI master controller drivers (bus) -+obj-$(CONFIG_SPI_AR71XX) += ar71xx_spi.o - obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o - obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o - obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o diff --git a/target/linux/ar71xx/patches-2.6.28/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.28/005-ar71xx_mac_driver.patch deleted file mode 100644 index ed7c67ca5f..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/005-ar71xx_mac_driver.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/drivers/net/Kconfig -+++ b/drivers/net/Kconfig -@@ -2039,6 +2039,8 @@ config ACENIC_OMIT_TIGON_I - - The safe and default value for this is N. - -+source drivers/net/ag71xx/Kconfig -+ - config DL2K - tristate "DL2000/TC902x-based Gigabit Ethernet support" - depends on PCI ---- a/drivers/net/Makefile -+++ b/drivers/net/Makefile -@@ -93,6 +93,7 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o - obj-$(CONFIG_MII) += mii.o - obj-$(CONFIG_PHYLIB) += phy/ - -+obj-$(CONFIG_AG71XX) += ag71xx/ - obj-$(CONFIG_SUNDANCE) += sundance.o - obj-$(CONFIG_HAMACHI) += hamachi.o - obj-$(CONFIG_NET) += Space.o loopback.o diff --git a/target/linux/ar71xx/patches-2.6.28/006-ar71xx_wdt_driver.patch b/target/linux/ar71xx/patches-2.6.28/006-ar71xx_wdt_driver.patch deleted file mode 100644 index bf0ffcd601..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/006-ar71xx_wdt_driver.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -747,6 +747,13 @@ config TXX9_WDT - help - Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. - -+config AR71XX_WDT -+ tristate "Atheros AR71xx Watchdog Timer" -+ depends on ATHEROS_AR71XX -+ help -+ Hardware driver for the built-in watchdog timer on the Atheros -+ AR71xx SoCs. -+ - # PARISC Architecture - - # POWERPC Architecture ---- a/drivers/watchdog/Makefile -+++ b/drivers/watchdog/Makefile -@@ -106,6 +106,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o - obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o - obj-$(CONFIG_AR7_WDT) += ar7_wdt.o - obj-$(CONFIG_TXX9_WDT) += txx9wdt.o -+obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o - - # PARISC Architecture - diff --git a/target/linux/ar71xx/patches-2.6.28/007-ar91xx_flash_driver.patch b/target/linux/ar71xx/patches-2.6.28/007-ar91xx_flash_driver.patch deleted file mode 100644 index 3219ff3824..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/007-ar91xx_flash_driver.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/drivers/mtd/maps/Kconfig -+++ b/drivers/mtd/maps/Kconfig -@@ -257,6 +257,13 @@ config MTD_ALCHEMY - help - Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards - -+config MTD_AR91XX_FLASH -+ tristate "Atheros AR91xx parallel flash support" -+ depends on ATHEROS_AR71XX -+ select MTD_COMPLEX_MAPPINGS -+ help -+ Parallel flash driver for the Atheros AR91xx based boards. -+ - config MTD_DILNETPC - tristate "CFI Flash device mapped on DIL/Net PC" - depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT ---- a/drivers/mtd/maps/Makefile -+++ b/drivers/mtd/maps/Makefile -@@ -42,6 +42,7 @@ obj-$(CONFIG_MTD_DBOX2) += dbox2-flash. - obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o - obj-$(CONFIG_MTD_PCI) += pci.o - obj-$(CONFIG_MTD_ALCHEMY) += alchemy-flash.o -+obj-$(CONFIG_MTD_AR91XX_FLASH) += ar91xx_flash.o - obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o - obj-$(CONFIG_MTD_EDB7312) += edb7312.o - obj-$(CONFIG_MTD_IMPA7) += impa7.o diff --git a/target/linux/ar71xx/patches-2.6.28/100-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/ar71xx/patches-2.6.28/100-mtd_m25p80_add_pm25lv_flash_support.patch deleted file mode 100644 index f7975f2ff4..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/100-mtd_m25p80_add_pm25lv_flash_support.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -503,6 +503,10 @@ static struct flash_info __devinitdata m - { "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, }, - { "at26df321", 0x1f4701, 0, 64 * 1024, 64, SECT_4K, }, - -+ /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ -+ { "pm25lv512", 0, 32 * 1024, 2, SECT_4K }, -+ { "pm25lv010", 0, 32 * 1024, 4, SECT_4K }, -+ - /* Spansion -- single (large) sector size only, at least - * for the chips listed here (without boot sectors). - */ diff --git a/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch deleted file mode 100644 index 239875edd6..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/drivers/net/phy/Kconfig -+++ b/drivers/net/phy/Kconfig -@@ -85,6 +85,11 @@ config RTL8306_PHY - tristate "Driver for Realtek RTL8306S switches" - select SWCONFIG - -+config MICREL_PHY -+ tristate "Drivers for Micrel/Kendin PHYs" -+ ---help--- -+ Currently has a driver for the KSZ8041 -+ - config FIXED_PHY - bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" - depends on PHYLIB=y ---- a/drivers/net/phy/Makefile -+++ b/drivers/net/phy/Makefile -@@ -17,6 +17,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o - obj-$(CONFIG_IP175C_PHY) += ip175c.o - obj-$(CONFIG_RTL8306_PHY) += rtl8306.o - obj-$(CONFIG_REALTEK_PHY) += realtek.o -+obj-$(CONFIG_MICREL_PHY) += micrel.o - obj-$(CONFIG_FIXED_PHY) += fixed.o - obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o - obj-$(CONFIG_MDIO_OF_GPIO) += mdio-ofgpio.o diff --git a/target/linux/ar71xx/patches-2.6.28/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.28/102-mtd_m25p80_add_myloader_parser.patch deleted file mode 100644 index 65e9154d27..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/102-mtd_m25p80_add_myloader_parser.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -711,12 +711,17 @@ static int __devinit m25p_probe(struct s - struct mtd_partition *parts = NULL; - int nr_parts = 0; - -+ static const char *part_probes[] = { - #ifdef CONFIG_MTD_CMDLINE_PARTS -- static const char *part_probes[] = { "cmdlinepart", NULL, }; -+ "cmdlinepart", -+#endif -+#ifdef CONFIG_MTD_MYLOADER_PARTS -+ "MyLoader", -+#endif -+ NULL, }; - - nr_parts = parse_mtd_partitions(&flash->mtd, - part_probes, &parts, 0); --#endif - - if (nr_parts <= 0 && data && data->parts) { - parts = data->parts; diff --git a/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25pxx_support.patch b/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25pxx_support.patch deleted file mode 100644 index 673ab041c4..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25pxx_support.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -503,6 +503,10 @@ static struct flash_info __devinitdata m - { "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, }, - { "at26df321", 0x1f4701, 0, 64 * 1024, 64, SECT_4K, }, - -+ /* EON -- en25pxx */ -+ { "en25p32", 0x1c2016, 0, 64 * 1024, 64, }, -+ { "en25p64", 0x1c2017, 0, 64 * 1024, 128, }, -+ - /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ - { "pm25lv512", 0, 32 * 1024, 2, SECT_4K }, - { "pm25lv010", 0, 32 * 1024, 4, SECT_4K }, diff --git a/target/linux/ar71xx/patches-2.6.28/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.28/104-mtd_m25p80_add_redboot_parser.patch deleted file mode 100644 index 462ae68791..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/104-mtd_m25p80_add_redboot_parser.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -722,6 +722,9 @@ static int __devinit m25p_probe(struct s - #ifdef CONFIG_MTD_MYLOADER_PARTS - "MyLoader", - #endif -+#ifdef CONFIG_MTD_REDBOOT_PARTS -+ "RedBoot", -+#endif - NULL, }; - - nr_parts = parse_mtd_partitions(&flash->mtd, diff --git a/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch b/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch deleted file mode 100644 index d4b8ee93e8..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/105-mtd_m25p80_add_mx25lxxx_support.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -507,6 +507,11 @@ static struct flash_info __devinitdata m - { "en25p32", 0x1c2016, 0, 64 * 1024, 64, }, - { "en25p64", 0x1c2017, 0, 64 * 1024, 128, }, - -+ /* Macronix -- mx25lxxx */ -+ { "mx25l32", 0xc22016, 0, 64 * 1024, 64, }, -+ { "mx25l64", 0xc22017, 0, 64 * 1024, 128, }, -+ { "mx25l128", 0xc22018, 0, 64 * 1024, 256, }, -+ - /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ - { "pm25lv512", 0, 32 * 1024, 2, SECT_4K }, - { "pm25lv010", 0, 32 * 1024, 4, SECT_4K }, diff --git a/target/linux/ar71xx/patches-2.6.28/106-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/ar71xx/patches-2.6.28/106-mtd_m25p80_add_xxxs33b_support.patch deleted file mode 100644 index e4e01637d6..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/106-mtd_m25p80_add_xxxs33b_support.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -512,6 +512,11 @@ static struct flash_info __devinitdata m - { "mx25l64", 0xc22017, 0, 64 * 1024, 128, }, - { "mx25l128", 0xc22018, 0, 64 * 1024, 256, }, - -+ /* Numonyx -- xxxs33b */ -+ { "160s33b", 0x898911, 0, 64 * 1024, 64, }, -+ { "320s33b", 0x898912, 0, 64 * 1024, 128, }, -+ { "640s33b", 0x898913, 0, 64 * 1024, 256, }, -+ - /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ - { "pm25lv512", 0, 32 * 1024, 2, SECT_4K }, - { "pm25lv010", 0, 32 * 1024, 4, SECT_4K }, diff --git a/target/linux/ar71xx/patches-2.6.28/107-mtd-SST39VF6401B-support.patch b/target/linux/ar71xx/patches-2.6.28/107-mtd-SST39VF6401B-support.patch deleted file mode 100644 index a89e8e77d0..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/107-mtd-SST39VF6401B-support.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/drivers/mtd/chips/jedec_probe.c -+++ b/drivers/mtd/chips/jedec_probe.c -@@ -159,6 +159,7 @@ - #define SST39LF800 0x2781 - #define SST39LF160 0x2782 - #define SST39VF1601 0x234b -+#define SST39VF6401B 0x236d - #define SST39LF512 0x00D4 - #define SST39LF010 0x00D5 - #define SST39LF020 0x00D6 -@@ -1502,6 +1503,18 @@ static const struct amd_flash_info jedec - ERASEINFO(0x10000,64), - } - }, { -+ .mfr_id = MANUFACTURER_SST, -+ .dev_id = SST39VF6401B, -+ .name = "SST 39VF6401B", -+ .devtypes = CFI_DEVICETYPE_X16, -+ .uaddr = MTD_UADDR_0xAAAA_0x5555, -+ .dev_size = SIZE_8MiB, -+ .cmd_set = P_ID_AMD_STD, -+ .nr_regions = 1, -+ .regions = { -+ ERASEINFO(0x10000,128) -+ } -+ }, { - .mfr_id = MANUFACTURER_ST, - .dev_id = M29F800AB, - .name = "ST M29F800AB", diff --git a/target/linux/ar71xx/patches-2.6.28/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch b/target/linux/ar71xx/patches-2.6.28/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch deleted file mode 100644 index c17f274598..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/drivers/mtd/chips/cfi_cmdset_0002.c -+++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1558,7 +1558,7 @@ static int __xipram do_erase_chip(struct - chip->erase_suspended = 0; - } - -- if (chip_ready(map, adr)) -+ if (chip_good(map, adr, map_word_ff(map))) - break; - - if (time_after(jiffies, timeo)) { -@@ -1646,7 +1646,7 @@ static int __xipram do_erase_oneblock(st - chip->erase_suspended = 0; - } - -- if (chip_ready(map, adr)) { -+ if (chip_good(map, adr, map_word_ff(map))) { - xip_enable(map, chip, adr); - break; - } diff --git a/target/linux/ar71xx/patches-2.6.28/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.28/109-mtd-wrt160nl-trx-parser.patch deleted file mode 100644 index f67ce20f3b..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/109-mtd-wrt160nl-trx-parser.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -735,6 +735,9 @@ static int __devinit m25p_probe(struct s - #ifdef CONFIG_MTD_REDBOOT_PARTS - "RedBoot", - #endif -+#ifdef CONFIG_MTD_WRT160NL_PARTS -+ "wrt160nl", -+#endif - NULL, }; - - nr_parts = parse_mtd_partitions(&flash->mtd, ---- a/drivers/mtd/Kconfig -+++ b/drivers/mtd/Kconfig -@@ -172,6 +172,12 @@ config MTD_AR7_PARTS - ---help--- - TI AR7 partitioning support - -+config MTD_WRT160NL_PARTS -+ tristate "Linksys WRT160NL partitioning support" -+ depends on MTD_PARTITIONS && AR71XX_MACH_WRT160NL -+ ---help--- -+ Linksys WRT160NL partitioning support -+ - config MTD_MYLOADER_PARTS - tristate "MyLoader partition parsing" - depends on MTD_PARTITIONS && (ADM5120 || ATHEROS || ATHEROS_AR71XX) ---- a/drivers/mtd/Makefile -+++ b/drivers/mtd/Makefile -@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo - obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o - obj-$(CONFIG_MTD_AFS_PARTS) += afs.o - obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o -+obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o - obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o - obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o - diff --git a/target/linux/ar71xx/patches-2.6.28/110-usb-ehci-add-war-for-synopsys-hc-bug.patch b/target/linux/ar71xx/patches-2.6.28/110-usb-ehci-add-war-for-synopsys-hc-bug.patch deleted file mode 100644 index 8d203e8a49..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/110-usb-ehci-add-war-for-synopsys-hc-bug.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/drivers/usb/host/ehci-q.c -+++ b/drivers/usb/host/ehci-q.c -@@ -1082,6 +1082,9 @@ static void end_unlink_async (struct ehc - ehci->reclaim = NULL; - start_unlink_async (ehci, next); - } -+ -+ if (ehci->has_synopsys_hc_bug) -+ writel((u32)ehci->async->qh_dma, &ehci->regs->async_next); - } - - /* makes sure the async qh will become idle */ ---- a/drivers/usb/host/ehci.h -+++ b/drivers/usb/host/ehci.h -@@ -124,6 +124,7 @@ struct ehci_hcd { /* one per controlle - unsigned has_fsl_port_bug:1; /* FreeScale */ - unsigned big_endian_mmio:1; - unsigned big_endian_desc:1; -+ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */ - - u8 sbrn; /* packed release number */ - diff --git a/target/linux/ar71xx/patches-2.6.28/140-redboot_partition_scan.patch b/target/linux/ar71xx/patches-2.6.28/140-redboot_partition_scan.patch deleted file mode 100644 index 289d4eb990..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/140-redboot_partition_scan.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/drivers/mtd/redboot.c -+++ b/drivers/mtd/redboot.c -@@ -60,31 +60,32 @@ static int parse_redboot_partitions(stru - static char nullstring[] = "unallocated"; - #endif - -+ buf = vmalloc(master->erasesize); -+ if (!buf) -+ return -ENOMEM; -+ -+ restart: - if ( directory < 0 ) { - offset = master->size + directory * master->erasesize; -- while (master->block_isbad && -+ while (master->block_isbad && - master->block_isbad(master, offset)) { - if (!offset) { - nogood: - printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n"); -+ vfree(buf); - return -EIO; - } - offset -= master->erasesize; - } - } else { - offset = directory * master->erasesize; -- while (master->block_isbad && -+ while (master->block_isbad && - master->block_isbad(master, offset)) { - offset += master->erasesize; - if (offset == master->size) - goto nogood; - } - } -- buf = vmalloc(master->erasesize); -- -- if (!buf) -- return -ENOMEM; -- - printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", - master->name, offset); - -@@ -156,6 +157,11 @@ static int parse_redboot_partitions(stru - } - if (i == numslots) { - /* Didn't find it */ -+ if (offset + master->erasesize < master->size) { -+ /* not at the end of the flash yet, maybe next block :) */ -+ directory++; -+ goto restart; -+ } - printk(KERN_NOTICE "No RedBoot partition table detected in %s\n", - master->name); - ret = 0; diff --git a/target/linux/ar71xx/patches-2.6.28/200-rb4xx_nand_driver.patch b/target/linux/ar71xx/patches-2.6.28/200-rb4xx_nand_driver.patch deleted file mode 100644 index 9e4477d88b..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/200-rb4xx_nand_driver.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/drivers/mtd/nand/Kconfig -+++ b/drivers/mtd/nand/Kconfig -@@ -420,4 +420,8 @@ config MTD_NAND_SH_FLCTL - Several Renesas SuperH CPU has FLCTL. This option enables support - for NAND Flash using FLCTL. This driver support SH7723. - -+config MTD_NAND_RB4XX -+ tristate "NAND flash driver for RouterBoard 4xx series" -+ depends on MTD_NAND && ATHEROS_AR71XX -+ - endif # MTD_NAND ---- a/drivers/mtd/nand/Makefile -+++ b/drivers/mtd/nand/Makefile -@@ -29,6 +29,7 @@ obj-$(CONFIG_MTD_NAND_BASLER_EXCITE) += - obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o - obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o - obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o -+obj-$(CONFIG_MTD_NAND_RB4XX) += rb4xx_nand.o - obj-$(CONFIG_MTD_ALAUDA) += alauda.o - obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o - obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o diff --git a/target/linux/ar71xx/patches-2.6.28/201-ap83_spi_controller.patch b/target/linux/ar71xx/patches-2.6.28/201-ap83_spi_controller.patch deleted file mode 100644 index a8e889a7bd..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/201-ap83_spi_controller.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/drivers/spi/Makefile -+++ b/drivers/spi/Makefile -@@ -11,6 +11,7 @@ endif - obj-$(CONFIG_SPI_MASTER) += spi.o - - # SPI master controller drivers (bus) -+obj-$(CONFIG_SPI_AP83) += ap83_spi.o - obj-$(CONFIG_SPI_AR71XX) += ar71xx_spi.o - obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o - obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o ---- a/drivers/spi/Kconfig -+++ b/drivers/spi/Kconfig -@@ -53,6 +53,14 @@ if SPI_MASTER - - comment "SPI Master Controller Drivers" - -+config SPI_AP83 -+ tristate "Atheros AP83 specific SPI Controller" -+ depends on SPI_MASTER && AR71XX_MACH_AP83 -+ select SPI_BITBANG -+ help -+ This is a specific SPI controller driver for the Atheros AP83 -+ reference board. -+ - config SPI_AR71XX - tristate "Atheros AR71xx SPI Controller" - depends on SPI_MASTER && ATHEROS_AR71XX diff --git a/target/linux/ar71xx/patches-2.6.28/202-spi_vsc7385_driver.patch b/target/linux/ar71xx/patches-2.6.28/202-spi_vsc7385_driver.patch deleted file mode 100644 index 26f6156dab..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/202-spi_vsc7385_driver.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/drivers/spi/Kconfig -+++ b/drivers/spi/Kconfig -@@ -283,6 +283,11 @@ config SPI_TLE62X0 - sysfs interface, with each line presented as a kind of GPIO - exposing both switch control and diagnostic feedback. - -+config SPI_VSC7385 -+ tristate "Vitesse VSC7385 ethernet switch driver" -+ help -+ SPI driver for the Vitesse VSC7385 ethernet switch. -+ - # - # Add new SPI protocol masters in alphabetical order above this line - # ---- a/drivers/spi/Makefile -+++ b/drivers/spi/Makefile -@@ -38,6 +38,7 @@ obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci. - # SPI protocol drivers (device/link on bus) - obj-$(CONFIG_SPI_AT25) += at25.o - obj-$(CONFIG_SPI_SPIDEV) += spidev.o -+obj-$(CONFIG_SPI_VSC7385) += spi_vsc7385.o - obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o - # ... add above this line ... - diff --git a/target/linux/ar71xx/patches-2.6.28/203-pb44_spi_controller.patch b/target/linux/ar71xx/patches-2.6.28/203-pb44_spi_controller.patch deleted file mode 100644 index e48710ca91..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/203-pb44_spi_controller.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/drivers/spi/Kconfig -+++ b/drivers/spi/Kconfig -@@ -68,6 +68,14 @@ config SPI_AR71XX - help - This is the SPI contoller driver for Atheros AR71xx. - -+config SPI_PB44 -+ tristate "Atheros PB44 board specific SPI controller" -+ depends on SPI_MASTER && AR71XX_MACH_PB44 -+ select SPI_BITBANG -+ help -+ This is a specific SPI controller driver for the Atheros PB44 -+ reference board. -+ - config SPI_ATMEL - tristate "Atmel SPI Controller" - depends on (ARCH_AT91 || AVR32) ---- a/drivers/spi/Makefile -+++ b/drivers/spi/Makefile -@@ -22,6 +22,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 -+obj-$(CONFIG_SPI_PB44) += pb44_spi.o - obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o - obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.o - obj-$(CONFIG_SPI_OMAP24XX) += omap2_mcspi.o diff --git a/target/linux/ar71xx/patches-2.6.28/204-rtl8366-smi-driver.patch b/target/linux/ar71xx/patches-2.6.28/204-rtl8366-smi-driver.patch deleted file mode 100644 index afb3cbdb7b..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/204-rtl8366-smi-driver.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/drivers/net/phy/Kconfig -+++ b/drivers/net/phy/Kconfig -@@ -114,4 +114,8 @@ config MDIO_OF_GPIO - ---help--- - Supports GPIO lib-based MDIO busses. - -+config RTL8366_SMI -+ tristate "Support for RTL8366 switch via SMI interface" -+ depends on GENERIC_GPIO -+ - endif # PHYLIB ---- a/drivers/net/phy/Makefile -+++ b/drivers/net/phy/Makefile -@@ -17,6 +17,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o - obj-$(CONFIG_IP175C_PHY) += ip175c.o - obj-$(CONFIG_RTL8306_PHY) += rtl8306.o - obj-$(CONFIG_REALTEK_PHY) += realtek.o -+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o - obj-$(CONFIG_MICREL_PHY) += micrel.o - obj-$(CONFIG_FIXED_PHY) += fixed.o - obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o diff --git a/target/linux/ar71xx/patches-2.6.28/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.28/300-mips_fw_myloader.patch deleted file mode 100644 index 3bca34c8de..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/300-mips_fw_myloader.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -167,6 +167,7 @@ endif - # - libs-$(CONFIG_ARC) += arch/mips/fw/arc/ - libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ -+libs-$(CONFIG_MYLOADER) += arch/mips/fw/myloader/ - libs-$(CONFIG_SNIPROM) += arch/mips/fw/sni/ - libs-y += arch/mips/fw/lib/ - libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/ ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -789,6 +789,9 @@ config MIPS_NILE4 - config MIPS_DISABLE_OBSOLETE_IDE - bool - -+config MYLOADER -+ bool -+ - config SYNC_R4K - bool - diff --git a/target/linux/ar71xx/patches-2.6.28/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.28/901-get_c0_compare_irq_function.patch deleted file mode 100644 index ec3924f7cd..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/901-get_c0_compare_irq_function.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/arch/mips/kernel/traps.c -+++ b/arch/mips/kernel/traps.c -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - extern void check_wait(void); - extern asmlinkage void r4k_wait(void); -@@ -1514,6 +1515,8 @@ void __cpuinit per_cpu_trap_init(void) - */ - if (cpu_has_mips_r2) { - cp0_compare_irq = (read_c0_intctl() >> 29) & 7; -+ if (get_c0_compare_irq) -+ cp0_compare_irq = get_c0_compare_irq(); - cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7; - if (cp0_perfcount_irq == cp0_compare_irq) - cp0_perfcount_irq = -1; ---- a/arch/mips/include/asm/time.h -+++ b/arch/mips/include/asm/time.h -@@ -53,6 +53,7 @@ extern int (*perf_irq)(void); - #ifdef CONFIG_CEVT_R4K - extern int mips_clockevent_init(void); - extern unsigned int __weak get_c0_compare_int(void); -+extern unsigned int __weak get_c0_compare_irq(void); - #else - static inline int mips_clockevent_init(void) - { diff --git a/target/linux/ar71xx/patches-2.6.28/902-mips_clocksource_init_war.patch b/target/linux/ar71xx/patches-2.6.28/902-mips_clocksource_init_war.patch deleted file mode 100644 index 03a66ff133..0000000000 --- a/target/linux/ar71xx/patches-2.6.28/902-mips_clocksource_init_war.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/arch/mips/kernel/cevt-r4k.c -+++ b/arch/mips/kernel/cevt-r4k.c -@@ -15,6 +15,22 @@ - #include - - /* -+ * Compare interrupt can be routed and latched outside the core, -+ * so a single execution hazard barrier may not be enough to give -+ * it time to clear as seen in the Cause register. 4 time the -+ * pipeline depth seems reasonably conservative, and empirically -+ * works better in configurations with high CPU/bus clock ratios. -+ */ -+ -+#define compare_change_hazard() \ -+ do { \ -+ irq_disable_hazard(); \ -+ irq_disable_hazard(); \ -+ irq_disable_hazard(); \ -+ irq_disable_hazard(); \ -+ } while (0) -+ -+/* - * The SMTC Kernel for the 34K, 1004K, et. al. replaces several - * of these routines with SMTC-specific variants. - */ -@@ -30,6 +46,7 @@ static int mips_next_event(unsigned long - cnt = read_c0_count(); - cnt += delta; - write_c0_compare(cnt); -+ compare_change_hazard(); - res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0; - return res; - } -@@ -99,22 +116,6 @@ static int c0_compare_int_pending(void) - return (read_c0_cause() >> cp0_compare_irq) & 0x100; - } - --/* -- * Compare interrupt can be routed and latched outside the core, -- * so a single execution hazard barrier may not be enough to give -- * it time to clear as seen in the Cause register. 4 time the -- * pipeline depth seems reasonably conservative, and empirically -- * works better in configurations with high CPU/bus clock ratios. -- */ -- --#define compare_change_hazard() \ -- do { \ -- irq_disable_hazard(); \ -- irq_disable_hazard(); \ -- irq_disable_hazard(); \ -- irq_disable_hazard(); \ -- } while (0) -- - int c0_compare_int_usable(void) - { - unsigned int delta;