mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-12 07:08:03 +03:00
[ar71xx] add experimental support for 2.6.30
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15561 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
e32b61303b
commit
a826f98491
264
target/linux/ar71xx/config-2.6.30
Normal file
264
target/linux/ar71xx/config-2.6.30
Normal file
@ -0,0 +1,264 @@
|
|||||||
|
CONFIG_32BIT=y
|
||||||
|
# CONFIG_64BIT is not set
|
||||||
|
CONFIG_ADM6996_PHY=y
|
||||||
|
CONFIG_AG71XX=y
|
||||||
|
CONFIG_AG71XX_AR8216_SUPPORT=y
|
||||||
|
# CONFIG_AG71XX_DEBUG is not set
|
||||||
|
# CONFIG_AR71XX_EARLY_SERIAL is not set
|
||||||
|
CONFIG_AR71XX_MACH_AP81=y
|
||||||
|
CONFIG_AR71XX_MACH_AP83=y
|
||||||
|
CONFIG_AR71XX_MACH_AW_NR580=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_RB_4XX=y
|
||||||
|
CONFIG_AR71XX_MACH_TEW_632BRP=y
|
||||||
|
CONFIG_AR71XX_MACH_TL_WR941ND=y
|
||||||
|
CONFIG_AR71XX_MACH_UBNT=y
|
||||||
|
CONFIG_AR71XX_MACH_WNR2000=y
|
||||||
|
CONFIG_AR71XX_MACH_WP543=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_BASE_SMALL=0
|
||||||
|
# CONFIG_BCM47XX is not set
|
||||||
|
# CONFIG_BINARY_PRINTF is not set
|
||||||
|
CONFIG_BITREVERSE=y
|
||||||
|
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
|
||||||
|
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
|
||||||
|
CONFIG_CEVT_R4K=y
|
||||||
|
CONFIG_CEVT_R4K_LIB=y
|
||||||
|
CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
|
||||||
|
CONFIG_CPU_BIG_ENDIAN=y
|
||||||
|
# CONFIG_CPU_CAVIUM_OCTEON is not set
|
||||||
|
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_CRYPTO_PCOMP=m
|
||||||
|
CONFIG_CRYPTO_WORKQUEUE=m
|
||||||
|
CONFIG_CSRC_R4K=y
|
||||||
|
CONFIG_CSRC_R4K_LIB=y
|
||||||
|
CONFIG_DECOMPRESS_LZMA=y
|
||||||
|
CONFIG_DEFAULT_VEGAS=y
|
||||||
|
# CONFIG_DEFAULT_WESTWOOD is not set
|
||||||
|
CONFIG_DEVPORT=y
|
||||||
|
# CONFIG_DM9000 is not set
|
||||||
|
CONFIG_DMA_NEED_PCI_MAP_STATE=y
|
||||||
|
CONFIG_DMA_NONCOHERENT=y
|
||||||
|
CONFIG_EARLY_PRINTK=y
|
||||||
|
# CONFIG_EEPROM_AT25 is not set
|
||||||
|
# CONFIG_FREEZER is not set
|
||||||
|
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||||
|
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||||
|
CONFIG_GENERIC_CMOS_UPDATE=y
|
||||||
|
CONFIG_GENERIC_FIND_LAST_BIT=y
|
||||||
|
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||||
|
CONFIG_GENERIC_GPIO=y
|
||||||
|
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
|
||||||
|
CONFIG_GPIOLIB=y
|
||||||
|
CONFIG_GPIO_SYSFS=y
|
||||||
|
CONFIG_HARDWARE_WATCHPOINTS=y
|
||||||
|
CONFIG_HAS_DMA=y
|
||||||
|
CONFIG_HAS_IOMEM=y
|
||||||
|
CONFIG_HAS_IOPORT=y
|
||||||
|
# CONFIG_HAVE_AOUT is not set
|
||||||
|
CONFIG_HAVE_ARCH_KGDB=y
|
||||||
|
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||||
|
CONFIG_HAVE_IDE=y
|
||||||
|
CONFIG_HAVE_MLOCK=y
|
||||||
|
CONFIG_HAVE_OPROFILE=y
|
||||||
|
CONFIG_HW_HAS_PCI=y
|
||||||
|
# CONFIG_HW_RANDOM is not set
|
||||||
|
# CONFIG_I2C is not set
|
||||||
|
CONFIG_ICPLUS_PHY=y
|
||||||
|
# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
|
||||||
|
# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
|
||||||
|
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_LIB80211 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_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=y
|
||||||
|
# CONFIG_MTD_ABSENT is not set
|
||||||
|
CONFIG_MTD_BLKDEVS=y
|
||||||
|
CONFIG_MTD_BLOCK=y
|
||||||
|
# CONFIG_MTD_BLOCK2MTD is not set
|
||||||
|
# CONFIG_MTD_CFI is not set
|
||||||
|
CONFIG_MTD_CFI_I1=y
|
||||||
|
CONFIG_MTD_CFI_I2=y
|
||||||
|
# CONFIG_MTD_CFI_I4 is not set
|
||||||
|
# CONFIG_MTD_CFI_I8 is not set
|
||||||
|
CONFIG_MTD_CHAR=y
|
||||||
|
# CONFIG_MTD_CMDLINE_PARTS is not set
|
||||||
|
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
|
||||||
|
CONFIG_MTD_CONCAT=y
|
||||||
|
# CONFIG_MTD_JEDECPROBE is not set
|
||||||
|
CONFIG_MTD_M25P80=y
|
||||||
|
CONFIG_MTD_MAP_BANK_WIDTH_1=y
|
||||||
|
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
|
||||||
|
CONFIG_MTD_MAP_BANK_WIDTH_2=y
|
||||||
|
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
|
||||||
|
CONFIG_MTD_MAP_BANK_WIDTH_4=y
|
||||||
|
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
|
||||||
|
# CONFIG_MTD_MTDRAM is not set
|
||||||
|
CONFIG_MTD_NAND=y
|
||||||
|
# CONFIG_MTD_NAND_CAFE is not set
|
||||||
|
# CONFIG_MTD_NAND_DISKONCHIP is not set
|
||||||
|
# CONFIG_MTD_NAND_ECC_SMC is not set
|
||||||
|
CONFIG_MTD_NAND_IDS=y
|
||||||
|
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
|
||||||
|
# CONFIG_MTD_NAND_NANDSIM is not set
|
||||||
|
# CONFIG_MTD_NAND_PLATFORM is not set
|
||||||
|
CONFIG_MTD_NAND_RB4XX=y
|
||||||
|
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
|
||||||
|
# CONFIG_MTD_ONENAND is not set
|
||||||
|
CONFIG_MTD_PARTITIONS=y
|
||||||
|
# CONFIG_MTD_PHRAM is not set
|
||||||
|
# CONFIG_MTD_PLATRAM is not set
|
||||||
|
# CONFIG_MTD_PMC551 is not set
|
||||||
|
# CONFIG_MTD_RAM is not set
|
||||||
|
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
|
||||||
|
CONFIG_MTD_REDBOOT_PARTS=y
|
||||||
|
CONFIG_MTD_REDBOOT_PARTS_READONLY=y
|
||||||
|
# CONFIG_MTD_ROM is not set
|
||||||
|
# CONFIG_MTD_SLRAM is not set
|
||||||
|
CONFIG_MYLOADER=y
|
||||||
|
# CONFIG_NATSEMI is not set
|
||||||
|
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_NF_DEFRAG_IPV4 is not set
|
||||||
|
CONFIG_NLATTR=y
|
||||||
|
# CONFIG_NO_IOPORT is not set
|
||||||
|
# CONFIG_NXP_STB220 is not set
|
||||||
|
# CONFIG_NXP_STB225 is not set
|
||||||
|
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||||
|
# CONFIG_PAGE_SIZE_16KB is not set
|
||||||
|
CONFIG_PAGE_SIZE_4KB=y
|
||||||
|
# CONFIG_PAGE_SIZE_64KB is not set
|
||||||
|
# CONFIG_PAGE_SIZE_8KB is not set
|
||||||
|
CONFIG_PCI=y
|
||||||
|
CONFIG_PCI_DOMAINS=y
|
||||||
|
# CONFIG_PCI_STUB is not set
|
||||||
|
# CONFIG_PCSPKR_PLATFORM is not set
|
||||||
|
CONFIG_PHYLIB=y
|
||||||
|
# CONFIG_PHYS_ADDR_T_64BIT is not set
|
||||||
|
# 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_PROM_EMU=y
|
||||||
|
CONFIG_RTC_LIB=y
|
||||||
|
CONFIG_RWSEM_GENERIC_SPINLOCK=y
|
||||||
|
CONFIG_SCHED_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_SLOW_WORK is not set
|
||||||
|
CONFIG_SLUB=y
|
||||||
|
CONFIG_SPI=y
|
||||||
|
CONFIG_SPI_AR71XX=y
|
||||||
|
CONFIG_SPI_BITBANG=y
|
||||||
|
# CONFIG_SPI_GPIO is not set
|
||||||
|
# CONFIG_SPI_GPIO_OLD is not set
|
||||||
|
CONFIG_SPI_MASTER=y
|
||||||
|
# CONFIG_SPI_SPIDEV is not set
|
||||||
|
CONFIG_SSB_POSSIBLE=y
|
||||||
|
CONFIG_SYSVIPC_SYSCTL=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_TICK_ONESHOT=y
|
||||||
|
CONFIG_TRACING_SUPPORT=y
|
||||||
|
CONFIG_TRAD_SIGNALS=y
|
||||||
|
CONFIG_USB_SUPPORT=y
|
||||||
|
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
|
50
target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch
Normal file
50
target/linux/ar71xx/patches-2.6.30/001-ar71xx_core.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
--- a/arch/mips/Makefile
|
||||||
|
+++ b/arch/mips/Makefile
|
||||||
|
@@ -602,6 +602,13 @@ else
|
||||||
|
load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000
|
||||||
|
endif
|
||||||
|
|
||||||
|
+#
|
||||||
|
+# 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
|
||||||
|
@@ -633,6 +650,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
source "arch/mips/alchemy/Kconfig"
|
||||||
|
+source "arch/mips/ar71xx/Kconfig"
|
||||||
|
source "arch/mips/basler/excite/Kconfig"
|
||||||
|
source "arch/mips/jazz/Kconfig"
|
||||||
|
source "arch/mips/lasat/Kconfig"
|
10
target/linux/ar71xx/patches-2.6.30/002-ar71xx_pci.patch
Normal file
10
target/linux/ar71xx/patches-2.6.30/002-ar71xx_pci.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- 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
|
||||||
|
|
||||||
|
#
|
||||||
|
# These are still pretty much in the old state, watch, go blind.
|
58
target/linux/ar71xx/patches-2.6.30/003-ar71xx_usb_host.patch
Normal file
58
target/linux/ar71xx/patches-2.6.30/003-ar71xx_usb_host.patch
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
--- a/drivers/usb/host/Kconfig
|
||||||
|
+++ b/drivers/usb/host/Kconfig
|
||||||
|
@@ -78,6 +78,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
|
||||||
|
@@ -151,6 +158,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
|
||||||
|
@@ -1072,6 +1072,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
|
||||||
|
@@ -1081,6 +1081,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) && \
|
@ -0,0 +1,26 @@
|
|||||||
|
--- 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
|
@ -0,0 +1,21 @@
|
|||||||
|
--- a/drivers/net/Kconfig
|
||||||
|
+++ b/drivers/net/Kconfig
|
||||||
|
@@ -2087,6 +2087,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
|
||||||
|
@@ -2,6 +2,7 @@
|
||||||
|
# Makefile for the Linux network (ethercard) device drivers.
|
||||||
|
#
|
||||||
|
|
||||||
|
+obj-$(CONFIG_AG71XX) += ag71xx/
|
||||||
|
obj-$(CONFIG_E1000) += e1000/
|
||||||
|
obj-$(CONFIG_E1000E) += e1000e/
|
||||||
|
obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
|
@ -0,0 +1,26 @@
|
|||||||
|
--- a/drivers/watchdog/Kconfig
|
||||||
|
+++ b/drivers/watchdog/Kconfig
|
||||||
|
@@ -764,6 +764,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
|
||||||
|
@@ -105,6 +105,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
|
||||||
|
|
@ -0,0 +1,13 @@
|
|||||||
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
|
@@ -498,6 +498,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).
|
||||||
|
*/
|
@ -0,0 +1,24 @@
|
|||||||
|
--- a/drivers/net/phy/Kconfig
|
||||||
|
+++ b/drivers/net/phy/Kconfig
|
||||||
|
@@ -100,6 +100,11 @@ config AR8216_PHY
|
||||||
|
tristate "Driver for Atheros AR8216 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
|
||||||
|
@@ -18,6 +18,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
|
||||||
|
obj-$(CONFIG_REALTEK_PHY) += realtek.o
|
||||||
|
obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
||||||
|
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
|
||||||
|
+obj-$(CONFIG_MICREL) += micrel.o
|
||||||
|
obj-$(CONFIG_FIXED_PHY) += fixed.o
|
||||||
|
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
|
||||||
|
obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o
|
@ -0,0 +1,19 @@
|
|||||||
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
|
@@ -716,6 +716,16 @@ static int __devinit m25p_probe(struct s
|
||||||
|
part_probes, &parts, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef CONFIG_MTD_MYLOADER_PARTS
|
||||||
|
+ if (nr_parts <= 0) {
|
||||||
|
+ static const char *part_probes[]
|
||||||
|
+ = { "MyLoader", NULL, };
|
||||||
|
+
|
||||||
|
+ nr_parts = parse_mtd_partitions(&flash->mtd,
|
||||||
|
+ part_probes, &parts, 0);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
if (nr_parts <= 0 && data && data->parts) {
|
||||||
|
parts = data->parts;
|
||||||
|
nr_parts = data->nr_parts;
|
@ -0,0 +1,12 @@
|
|||||||
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
|
@@ -498,6 +498,9 @@ static struct flash_info __devinitdata m
|
||||||
|
{ "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, },
|
||||||
|
{ "at26df321", 0x1f4701, 0, 64 * 1024, 64, SECT_4K, },
|
||||||
|
|
||||||
|
+ /* EON -- en25px */
|
||||||
|
+ { "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
|
||||||
|
+
|
||||||
|
/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
|
||||||
|
{ "pm25lv512", 0, 32 * 1024, 2, SECT_4K },
|
||||||
|
{ "pm25lv010", 0, 32 * 1024, 4, SECT_4K },
|
@ -0,0 +1,18 @@
|
|||||||
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
|
@@ -729,6 +729,15 @@ static int __devinit m25p_probe(struct s
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifdef CONFIG_MTD_REDBOOT_PARTS
|
||||||
|
+ if (nr_parts <= 0) {
|
||||||
|
+ static const char *part_probes[]
|
||||||
|
+ = { "RedBoot", NULL, };
|
||||||
|
+
|
||||||
|
+ nr_parts = parse_mtd_partitions(&flash->mtd,
|
||||||
|
+ part_probes, &parts, 0);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
if (nr_parts <= 0 && data && data->parts) {
|
||||||
|
parts = data->parts;
|
||||||
|
nr_parts = data->nr_parts;
|
@ -0,0 +1,14 @@
|
|||||||
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
|
@@ -501,6 +501,11 @@ static struct flash_info __devinitdata m
|
||||||
|
/* EON -- en25px */
|
||||||
|
{ "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
|
||||||
|
|
||||||
|
+ /* 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 },
|
@ -0,0 +1,14 @@
|
|||||||
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
|
@@ -506,6 +506,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 },
|
@ -0,0 +1,22 @@
|
|||||||
|
--- 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
|
||||||
|
@@ -125,6 +125,7 @@ struct ehci_hcd { /* one per controlle
|
||||||
|
unsigned big_endian_mmio:1;
|
||||||
|
unsigned big_endian_desc:1;
|
||||||
|
unsigned has_amcc_usb23:1;
|
||||||
|
+ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
|
||||||
|
|
||||||
|
/* required for usb32 quirk */
|
||||||
|
#define OHCI_CTRL_HCFS (3 << 6)
|
@ -0,0 +1,54 @@
|
|||||||
|
--- 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;
|
@ -0,0 +1,21 @@
|
|||||||
|
--- a/drivers/mtd/nand/Kconfig
|
||||||
|
+++ b/drivers/mtd/nand/Kconfig
|
||||||
|
@@ -446,4 +446,8 @@ config MTD_NAND_SOCRATES
|
||||||
|
help
|
||||||
|
Enables support for NAND Flash chips wired onto Socrates board.
|
||||||
|
|
||||||
|
+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
|
||||||
|
@@ -30,6 +30,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
|
@ -0,0 +1,22 @@
|
|||||||
|
--- a/arch/mips/Makefile
|
||||||
|
+++ b/arch/mips/Makefile
|
||||||
|
@@ -164,6 +164,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
|
||||||
|
@@ -817,6 +817,9 @@ config MIPS_NILE4
|
||||||
|
config MIPS_DISABLE_OBSOLETE_IDE
|
||||||
|
bool
|
||||||
|
|
||||||
|
+config MYLOADER
|
||||||
|
+ bool
|
||||||
|
+
|
||||||
|
config SYNC_R4K
|
||||||
|
bool
|
||||||
|
|
@ -0,0 +1,10 @@
|
|||||||
|
--- a/arch/mips/Kconfig
|
||||||
|
+++ b/arch/mips/Kconfig
|
||||||
|
@@ -36,6 +36,7 @@ config ATHEROS_AR71XX
|
||||||
|
select SYS_SUPPORTS_BIG_ENDIAN
|
||||||
|
select SYS_HAS_EARLY_PRINTK
|
||||||
|
select MIPS_MACHINE
|
||||||
|
+ select PROM_EMU
|
||||||
|
help
|
||||||
|
Support for Atheros AR71xx based boards.
|
||||||
|
|
@ -0,0 +1,38 @@
|
|||||||
|
--- a/drivers/net/ag71xx/ag71xx_main.c
|
||||||
|
+++ b/drivers/net/ag71xx/ag71xx_main.c
|
||||||
|
@@ -561,7 +561,7 @@ static void ag71xx_oom_timer_handler(uns
|
||||||
|
struct net_device *dev = (struct net_device *) data;
|
||||||
|
struct ag71xx *ag = netdev_priv(dev);
|
||||||
|
|
||||||
|
- netif_rx_schedule(dev, &ag->napi);
|
||||||
|
+ netif_rx_schedule(&ag->napi);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ag71xx_tx_timeout(struct net_device *dev)
|
||||||
|
@@ -717,7 +717,7 @@ static int ag71xx_poll(struct napi_struc
|
||||||
|
DBG("%s: disable polling mode, done=%d, limit=%d\n",
|
||||||
|
dev->name, done, limit);
|
||||||
|
|
||||||
|
- netif_rx_complete(dev, napi);
|
||||||
|
+ netif_rx_complete(napi);
|
||||||
|
|
||||||
|
/* enable interrupts */
|
||||||
|
spin_lock_irqsave(&ag->lock, flags);
|
||||||
|
@@ -736,7 +736,7 @@ static int ag71xx_poll(struct napi_struc
|
||||||
|
printk(KERN_DEBUG "%s: out of memory\n", dev->name);
|
||||||
|
|
||||||
|
mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
|
||||||
|
- netif_rx_complete(dev, napi);
|
||||||
|
+ netif_rx_complete(napi);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -766,7 +766,7 @@ static irqreturn_t ag71xx_interrupt(int
|
||||||
|
if (likely(status & AG71XX_INT_POLL)) {
|
||||||
|
ag71xx_int_disable(ag, AG71XX_INT_POLL);
|
||||||
|
DBG("%s: enable polling mode\n", dev->name);
|
||||||
|
- netif_rx_schedule(dev, &ag->napi);
|
||||||
|
+ netif_rx_schedule(&ag->napi);
|
||||||
|
}
|
||||||
|
|
||||||
|
return IRQ_HANDLED;
|
@ -0,0 +1,38 @@
|
|||||||
|
--- a/drivers/net/ag71xx/ag71xx_main.c
|
||||||
|
+++ b/drivers/net/ag71xx/ag71xx_main.c
|
||||||
|
@@ -557,7 +557,7 @@ static void ag71xx_oom_timer_handler(uns
|
||||||
|
struct net_device *dev = (struct net_device *) data;
|
||||||
|
struct ag71xx *ag = netdev_priv(dev);
|
||||||
|
|
||||||
|
- netif_rx_schedule(&ag->napi);
|
||||||
|
+ napi_schedule(&ag->napi);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ag71xx_tx_timeout(struct net_device *dev)
|
||||||
|
@@ -713,7 +713,7 @@ static int ag71xx_poll(struct napi_struc
|
||||||
|
DBG("%s: disable polling mode, done=%d, limit=%d\n",
|
||||||
|
dev->name, done, limit);
|
||||||
|
|
||||||
|
- netif_rx_complete(napi);
|
||||||
|
+ napi_complete(napi);
|
||||||
|
|
||||||
|
/* enable interrupts */
|
||||||
|
spin_lock_irqsave(&ag->lock, flags);
|
||||||
|
@@ -732,7 +732,7 @@ static int ag71xx_poll(struct napi_struc
|
||||||
|
printk(KERN_DEBUG "%s: out of memory\n", dev->name);
|
||||||
|
|
||||||
|
mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
|
||||||
|
- netif_rx_complete(napi);
|
||||||
|
+ napi_complete(napi);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -762,7 +762,7 @@ static irqreturn_t ag71xx_interrupt(int
|
||||||
|
if (likely(status & AG71XX_INT_POLL)) {
|
||||||
|
ag71xx_int_disable(ag, AG71XX_INT_POLL);
|
||||||
|
DBG("%s: enable polling mode\n", dev->name);
|
||||||
|
- netif_rx_schedule(&ag->napi);
|
||||||
|
+ napi_schedule(&ag->napi);
|
||||||
|
}
|
||||||
|
|
||||||
|
return IRQ_HANDLED;
|
@ -0,0 +1,46 @@
|
|||||||
|
--- a/drivers/net/ag71xx/ag71xx_ethtool.c
|
||||||
|
+++ b/drivers/net/ag71xx/ag71xx_ethtool.c
|
||||||
|
@@ -44,7 +44,7 @@ static void ag71xx_ethtool_get_drvinfo(s
|
||||||
|
|
||||||
|
strcpy(info->driver, ag->pdev->dev.driver->name);
|
||||||
|
strcpy(info->version, AG71XX_DRV_VERSION);
|
||||||
|
- strcpy(info->bus_info, ag->pdev->dev.bus_id);
|
||||||
|
+ strcpy(info->bus_info, dev_name(&ag->pdev->dev));
|
||||||
|
}
|
||||||
|
|
||||||
|
static u32 ag71xx_ethtool_get_msglevel(struct net_device *dev)
|
||||||
|
--- a/drivers/net/ag71xx/ag71xx_phy.c
|
||||||
|
+++ b/drivers/net/ag71xx/ag71xx_phy.c
|
||||||
|
@@ -213,7 +213,7 @@ static int ag71xx_phy_connect_multi(stru
|
||||||
|
|
||||||
|
DBG("%s: PHY found at %s, uid=%08x\n",
|
||||||
|
dev->name,
|
||||||
|
- ag->mii_bus->phy_map[phy_addr]->dev.bus_id,
|
||||||
|
+ dev_name(&ag->mii_bus->phy_map[phy_addr]->dev),
|
||||||
|
ag->mii_bus->phy_map[phy_addr]->phy_id);
|
||||||
|
|
||||||
|
if (phydev == NULL)
|
||||||
|
@@ -229,12 +229,12 @@ static int ag71xx_phy_connect_multi(stru
|
||||||
|
ret = -ENODEV;
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
- ag->phy_dev = phy_connect(dev, phydev->dev.bus_id,
|
||||||
|
+ ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev),
|
||||||
|
&ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);
|
||||||
|
|
||||||
|
if (IS_ERR(ag->phy_dev)) {
|
||||||
|
printk(KERN_ERR "%s: could not connect to PHY at %s\n",
|
||||||
|
- dev->name, phydev->dev.bus_id);
|
||||||
|
+ dev->name, dev_name(&phydev->dev));
|
||||||
|
return PTR_ERR(ag->phy_dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -248,7 +248,7 @@ static int ag71xx_phy_connect_multi(stru
|
||||||
|
|
||||||
|
printk(KERN_DEBUG "%s: connected to PHY at %s "
|
||||||
|
"[uid=%08x, driver=%s]\n",
|
||||||
|
- dev->name, phydev->dev.bus_id,
|
||||||
|
+ dev->name, dev_name(&phydev->dev),
|
||||||
|
phydev->phy_id, phydev->drv->name);
|
||||||
|
|
||||||
|
ag->link = 0;
|
@ -0,0 +1,46 @@
|
|||||||
|
--- a/arch/mips/ar71xx/devices.c
|
||||||
|
+++ b/arch/mips/ar71xx/devices.c
|
||||||
|
@@ -655,6 +655,8 @@ static struct platform_device ar71xx_dsa
|
||||||
|
void __init ar71xx_add_device_dsa(unsigned int id,
|
||||||
|
struct dsa_platform_data *d)
|
||||||
|
{
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
|
switch (id) {
|
||||||
|
case 0:
|
||||||
|
d->netdev = &ar71xx_eth0_device.dev;
|
||||||
|
@@ -668,7 +670,10 @@ void __init ar71xx_add_device_dsa(unsign
|
||||||
|
id);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
- d->mii_bus = &ar71xx_mdio_device.dev;
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < d->nr_chips; i++)
|
||||||
|
+ d->chip[i].mii_bus = &ar71xx_mdio_device.dev;
|
||||||
|
+
|
||||||
|
ar71xx_dsa_switch_device.dev.platform_data = d;
|
||||||
|
|
||||||
|
platform_device_register(&ar71xx_dsa_switch_device);
|
||||||
|
--- a/arch/mips/ar71xx/mach-tl-wr941nd.c
|
||||||
|
+++ b/arch/mips/ar71xx/mach-tl-wr941nd.c
|
||||||
|
@@ -104,7 +104,7 @@ static struct gpio_button tl_wr941nd_gpi
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
-static struct dsa_platform_data tl_wr941nd_dsa_data = {
|
||||||
|
+static struct dsa_chip_data tl_wr941nd_dsa_chip = {
|
||||||
|
.port_names[0] = "wan",
|
||||||
|
.port_names[1] = "lan1",
|
||||||
|
.port_names[2] = "lan2",
|
||||||
|
@@ -113,6 +113,11 @@ static struct dsa_platform_data tl_wr941
|
||||||
|
.port_names[5] = "cpu",
|
||||||
|
};
|
||||||
|
|
||||||
|
+static struct dsa_platform_data tl_wr941nd_dsa_data = {
|
||||||
|
+ .nr_chips = 1,
|
||||||
|
+ .chip = &tl_wr941nd_dsa_chip,
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
static void __init tl_wr941nd_setup(void)
|
||||||
|
{
|
||||||
|
u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
|
@ -0,0 +1,34 @@
|
|||||||
|
--- a/drivers/usb/host/ehci-ar71xx.c
|
||||||
|
+++ b/drivers/usb/host/ehci-ar71xx.c
|
||||||
|
@@ -79,7 +79,7 @@ static int ehci_ar71xx_probe(const struc
|
||||||
|
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||||
|
if (!res) {
|
||||||
|
dev_dbg(&pdev->dev, "no IRQ specified for %s\n",
|
||||||
|
- pdev->dev.bus_id);
|
||||||
|
+ dev_name(&pdev->dev));
|
||||||
|
return -ENODEV;
|
||||||
|
}
|
||||||
|
irq = res->start;
|
||||||
|
@@ -87,11 +87,11 @@ static int ehci_ar71xx_probe(const struc
|
||||||
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
|
if (!res) {
|
||||||
|
dev_dbg(&pdev->dev, "no base address specified for %s\n",
|
||||||
|
- pdev->dev.bus_id);
|
||||||
|
+ dev_name(&pdev->dev));
|
||||||
|
return -ENODEV;
|
||||||
|
}
|
||||||
|
|
||||||
|
- hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
|
||||||
|
+ hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
|
||||||
|
if (!hcd)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@@ -205,7 +205,7 @@ static int ehci_ar71xx_driver_probe(stru
|
||||||
|
pdata = pdev->dev.platform_data;
|
||||||
|
if (!pdata) {
|
||||||
|
dev_err(&pdev->dev, "no platform data specified for %s\n",
|
||||||
|
- pdev->dev.bus_id);
|
||||||
|
+ dev_name(&pdev->dev));
|
||||||
|
return -ENODEV;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
|||||||
|
--- a/drivers/usb/host/ohci-ar71xx.c
|
||||||
|
+++ b/drivers/usb/host/ohci-ar71xx.c
|
||||||
|
@@ -30,19 +30,19 @@ static int usb_hcd_ar71xx_probe(const st
|
||||||
|
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||||
|
if (!res) {
|
||||||
|
dev_dbg(&pdev->dev, "no IRQ specified for %s\n",
|
||||||
|
- pdev->dev.bus_id);
|
||||||
|
+ dev_name(&pdev->dev));
|
||||||
|
return -ENODEV;
|
||||||
|
}
|
||||||
|
irq = res->start;
|
||||||
|
|
||||||
|
- hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
|
||||||
|
+ hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
|
||||||
|
if (!hcd)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
|
if (!res) {
|
||||||
|
dev_dbg(&pdev->dev, "no base address specified for %s\n",
|
||||||
|
- pdev->dev.bus_id);
|
||||||
|
+ dev_name(&pdev->dev));
|
||||||
|
ret = -ENODEV;
|
||||||
|
goto err_put_hcd;
|
||||||
|
}
|
@ -0,0 +1,29 @@
|
|||||||
|
--- a/arch/mips/kernel/traps.c
|
||||||
|
+++ b/arch/mips/kernel/traps.c
|
||||||
|
@@ -48,6 +48,7 @@
|
||||||
|
#include <asm/types.h>
|
||||||
|
#include <asm/stacktrace.h>
|
||||||
|
#include <asm/irq.h>
|
||||||
|
+#include <asm/time.h>
|
||||||
|
|
||||||
|
extern void check_wait(void);
|
||||||
|
extern asmlinkage void r4k_wait(void);
|
||||||
|
@@ -1542,6 +1543,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
|
||||||
|
@@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
|
||||||
|
*/
|
||||||
|
#ifdef CONFIG_CEVT_R4K_LIB
|
||||||
|
extern unsigned int __weak get_c0_compare_int(void);
|
||||||
|
+extern unsigned int __weak get_c0_compare_irq(void);
|
||||||
|
extern int r4k_clockevent_init(void);
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,56 @@
|
|||||||
|
--- a/arch/mips/kernel/cevt-r4k.c
|
||||||
|
+++ b/arch/mips/kernel/cevt-r4k.c
|
||||||
|
@@ -15,6 +15,22 @@
|
||||||
|
#include <asm/cevt-r4k.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
+ * 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;
|
Loading…
Reference in New Issue
Block a user