mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-02 23:38:38 +03:00
ar71xx: add 2.6.34 preliminary support (patches)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20141 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
90a9fdc494
commit
e9242b2541
50
target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch
Normal file
50
target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
--- a/arch/mips/Makefile
|
||||||
|
+++ b/arch/mips/Makefile
|
||||||
|
@@ -637,6 +637,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
|
||||||
|
@@ -48,6 +48,23 @@ config AR7
|
||||||
|
Support for the Texas Instruments AR7 System-on-a-Chip
|
||||||
|
family: TNETD7100, 7200 and 7300.
|
||||||
|
|
||||||
|
+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 BCM47XX
|
||||||
|
bool "BCM47XX based boards"
|
||||||
|
select CEVT_R4K
|
||||||
|
@@ -682,6 +699,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
source "arch/mips/alchemy/Kconfig"
|
||||||
|
+source "arch/mips/ar71xx/Kconfig"
|
||||||
|
source "arch/mips/bcm63xx/Kconfig"
|
||||||
|
source "arch/mips/jazz/Kconfig"
|
||||||
|
source "arch/mips/lasat/Kconfig"
|
10
target/linux/ar71xx/patches-2.6.34/002-ar71xx_pci.patch
Normal file
10
target/linux/ar71xx/patches-2.6.34/002-ar71xx_pci.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- a/arch/mips/pci/Makefile
|
||||||
|
+++ b/arch/mips/pci/Makefile
|
||||||
|
@@ -18,6 +18,7 @@ obj-$(CONFIG_PCI_TX4927) += ops-tx4927.o
|
||||||
|
obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o
|
||||||
|
obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o fixup-bcm63xx.o \
|
||||||
|
ops-bcm63xx.o
|
||||||
|
+obj-$(CONFIG_ATHEROS_AR71XX) += pci-ar71xx.o pci-ar724x.o
|
||||||
|
|
||||||
|
#
|
||||||
|
# These are still pretty much in the old state, watch, go blind.
|
58
target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch
Normal file
58
target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
--- a/drivers/usb/host/Kconfig
|
||||||
|
+++ b/drivers/usb/host/Kconfig
|
||||||
|
@@ -109,6 +109,13 @@ config XPS_USB_HCD_XILINX
|
||||||
|
support both high speed and full speed devices, or high speed
|
||||||
|
devices only.
|
||||||
|
|
||||||
|
+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
|
||||||
|
@@ -207,6 +214,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
|
||||||
|
@@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL");
|
||||||
|
#define PLATFORM_DRIVER ehci_atmel_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
|
||||||
|
@@ -1085,6 +1085,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
|
||||||
|
@@ -2128,6 +2128,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
|
||||||
|
@@ -106,6 +106,7 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac/
|
||||||
|
# end link order section
|
||||||
|
#
|
||||||
|
|
||||||
|
+obj-$(CONFIG_AG71XX) += ag71xx/
|
||||||
|
obj-$(CONFIG_SUNDANCE) += sundance.o
|
||||||
|
obj-$(CONFIG_HAMACHI) += hamachi.o
|
||||||
|
obj-$(CONFIG_NET) += Space.o loopback.o
|
@ -0,0 +1,26 @@
|
|||||||
|
--- a/drivers/watchdog/Kconfig
|
||||||
|
+++ b/drivers/watchdog/Kconfig
|
||||||
|
@@ -840,6 +840,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
|
||||||
|
@@ -112,6 +112,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
|
||||||
|
+obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o
|
||||||
|
|
||||||
|
# PARISC Architecture
|
||||||
|
|
@ -0,0 +1,26 @@
|
|||||||
|
--- 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 && BROKEN
|
||||||
|
--- a/drivers/mtd/maps/Makefile
|
||||||
|
+++ b/drivers/mtd/maps/Makefile
|
||||||
|
@@ -40,6 +40,7 @@
|
||||||
|
obj-$(CONFIG_MTD_DBOX2) += dbox2-flash.o
|
||||||
|
obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
|
||||||
|
obj-$(CONFIG_MTD_PCI) += pci.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
|
@ -0,0 +1,24 @@
|
|||||||
|
--- a/drivers/net/phy/Kconfig
|
||||||
|
+++ b/drivers/net/phy/Kconfig
|
||||||
|
@@ -114,6 +114,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
|
||||||
|
@@ -24,6 +24,7 @@ obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi
|
||||||
|
obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
|
||||||
|
obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.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
|
||||||
|
@@ -922,6 +922,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,18 @@
|
|||||||
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
|
@@ -932,6 +932,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,29 @@
|
|||||||
|
--- a/drivers/mtd/chips/jedec_probe.c
|
||||||
|
+++ b/drivers/mtd/chips/jedec_probe.c
|
||||||
|
@@ -166,6 +166,7 @@
|
||||||
|
#define SST39LF160 0x2782
|
||||||
|
#define SST39VF1601 0x234b
|
||||||
|
#define SST39VF3201 0x235b
|
||||||
|
+#define SST39VF6401B 0x236d
|
||||||
|
#define SST39LF512 0x00D4
|
||||||
|
#define SST39LF010 0x00D5
|
||||||
|
#define SST39LF020 0x00D6
|
||||||
|
@@ -1556,6 +1557,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",
|
@ -0,0 +1,69 @@
|
|||||||
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
|
@@ -1130,8 +1130,8 @@ static int __xipram do_write_oneword(str
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (chip_ready(map, adr))
|
||||||
|
- break;
|
||||||
|
+ if (chip_good(map, adr, datum))
|
||||||
|
+ goto enable_xip;
|
||||||
|
|
||||||
|
/* Latency issues. Drop the lock, wait a while and retry */
|
||||||
|
UDELAY(map, chip, adr, 1);
|
||||||
|
@@ -1147,6 +1147,8 @@ static int __xipram do_write_oneword(str
|
||||||
|
|
||||||
|
ret = -EIO;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ enable_xip:
|
||||||
|
xip_enable(map, chip, adr);
|
||||||
|
op_done:
|
||||||
|
chip->state = FL_READY;
|
||||||
|
@@ -1493,7 +1495,6 @@ static int cfi_amdstd_write_buffers(stru
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
/*
|
||||||
|
* Handle devices with one erase region, that only implement
|
||||||
|
* the chip erase command.
|
||||||
|
@@ -1557,8 +1558,8 @@ static int __xipram do_erase_chip(struct
|
||||||
|
chip->erase_suspended = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (chip_ready(map, adr))
|
||||||
|
- break;
|
||||||
|
+ if (chip_good(map, adr, map_word_ff(map)))
|
||||||
|
+ goto op_done;
|
||||||
|
|
||||||
|
if (time_after(jiffies, timeo)) {
|
||||||
|
printk(KERN_WARNING "MTD %s(): software timeout\n",
|
||||||
|
@@ -1578,6 +1579,7 @@ static int __xipram do_erase_chip(struct
|
||||||
|
ret = -EIO;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ op_done:
|
||||||
|
chip->state = FL_READY;
|
||||||
|
xip_enable(map, chip, adr);
|
||||||
|
put_chip(map, chip, adr);
|
||||||
|
@@ -1645,9 +1647,9 @@ 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;
|
||||||
|
+ goto op_done;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (time_after(jiffies, timeo)) {
|
||||||
|
@@ -1669,6 +1671,7 @@ static int __xipram do_erase_oneblock(st
|
||||||
|
ret = -EIO;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ op_done:
|
||||||
|
chip->state = FL_READY;
|
||||||
|
put_chip(map, chip, adr);
|
||||||
|
spin_unlock(chip->mutex);
|
@ -0,0 +1,44 @@
|
|||||||
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
|
@@ -941,6 +941,16 @@ static int __devinit m25p_probe(struct s
|
||||||
|
part_probes, &parts, 0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+#ifdef CONFIG_MTD_WRT160NL_PARTS
|
||||||
|
+ if (nr_parts <= 0) {
|
||||||
|
+ static const char *part_probes[]
|
||||||
|
+ = { "wrt160nl", 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;
|
||||||
|
--- a/drivers/mtd/Kconfig
|
||||||
|
+++ b/drivers/mtd/Kconfig
|
||||||
|
@@ -181,6 +181,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_AR231X || 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
|
||||||
|
|
@ -0,0 +1,22 @@
|
|||||||
|
--- a/drivers/usb/host/ehci-q.c
|
||||||
|
+++ b/drivers/usb/host/ehci-q.c
|
||||||
|
@@ -1194,6 +1194,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
|
||||||
|
@@ -129,6 +129,7 @@ struct ehci_hcd { /* one per controlle
|
||||||
|
unsigned has_amcc_usb23:1;
|
||||||
|
unsigned need_io_watchdog:1;
|
||||||
|
unsigned broken_periodic:1;
|
||||||
|
+ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
|
||||||
|
|
||||||
|
/* required for usb32 quirk */
|
||||||
|
#define OHCI_CTRL_HCFS (3 << 6)
|
@ -0,0 +1,61 @@
|
|||||||
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
|
@@ -39,7 +39,7 @@
|
||||||
|
#include <linux/mtd/xip.h>
|
||||||
|
|
||||||
|
#define AMD_BOOTLOC_BUG
|
||||||
|
-#define FORCE_WORD_WRITE 0
|
||||||
|
+#define FORCE_WORD_WRITE 1
|
||||||
|
|
||||||
|
#define MAX_WORD_RETRIES 3
|
||||||
|
|
||||||
|
@@ -55,7 +55,9 @@
|
||||||
|
|
||||||
|
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
|
||||||
|
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
||||||
|
+#if !FORCE_WORD_WRITE
|
||||||
|
static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
||||||
|
+#endif
|
||||||
|
static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
|
||||||
|
static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
|
||||||
|
static void cfi_amdstd_sync (struct mtd_info *);
|
||||||
|
@@ -190,6 +192,7 @@ static void fixup_amd_bootblock(struct m
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if !FORCE_WORD_WRITE
|
||||||
|
static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
|
||||||
|
{
|
||||||
|
struct map_info *map = mtd->priv;
|
||||||
|
@@ -199,6 +202,7 @@ static void fixup_use_write_buffers(stru
|
||||||
|
mtd->write = cfi_amdstd_write_buffers;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+#endif /* !FORCE_WORD_WRITE */
|
||||||
|
|
||||||
|
/* Atmel chips don't use the same PRI format as AMD chips */
|
||||||
|
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
|
||||||
|
@@ -1304,6 +1308,7 @@ static int cfi_amdstd_write_words(struct
|
||||||
|
/*
|
||||||
|
* FIXME: interleaved mode not tested, and probably not supported!
|
||||||
|
*/
|
||||||
|
+#if !FORCE_WORD_WRITE
|
||||||
|
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
|
||||||
|
unsigned long adr, const u_char *buf,
|
||||||
|
int len)
|
||||||
|
@@ -1415,7 +1420,6 @@ static int __xipram do_write_buffer(stru
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
|
||||||
|
size_t *retlen, const u_char *buf)
|
||||||
|
{
|
||||||
|
@@ -1494,6 +1498,7 @@ static int cfi_amdstd_write_buffers(stru
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
+#endif /* !FORCE_WORD_WRITE */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handle devices with one erase region, that only implement
|
@ -0,0 +1,11 @@
|
|||||||
|
--- a/net/dsa/tag_trailer.c
|
||||||
|
+++ b/net/dsa/tag_trailer.c
|
||||||
|
@@ -86,7 +86,7 @@ static int trailer_rcv(struct sk_buff *s
|
||||||
|
|
||||||
|
trailer = skb_tail_pointer(skb) - 4;
|
||||||
|
if (trailer[0] != 0x80 || (trailer[1] & 0xf8) != 0x00 ||
|
||||||
|
- (trailer[3] & 0xef) != 0x00 || trailer[3] != 0x00)
|
||||||
|
+ (trailer[2] & 0xef) != 0x00 || (trailer[3] & 0xfe) != 0x00)
|
||||||
|
goto out_drop;
|
||||||
|
|
||||||
|
source_port = trailer[1] & 7;
|
@ -0,0 +1,26 @@
|
|||||||
|
--- a/net/dsa/Kconfig
|
||||||
|
+++ b/net/dsa/Kconfig
|
||||||
|
@@ -36,6 +36,13 @@ config NET_DSA_MV88E6060
|
||||||
|
This enables support for the Marvell 88E6060 ethernet switch
|
||||||
|
chip.
|
||||||
|
|
||||||
|
+config NET_DSA_MV88E6063
|
||||||
|
+ bool "Marvell 88E6063 ethernet switch chip support"
|
||||||
|
+ select NET_DSA_TAG_TRAILER
|
||||||
|
+ ---help---
|
||||||
|
+ This enables support for the Marvell 88E6063 ethernet switch
|
||||||
|
+ chip
|
||||||
|
+
|
||||||
|
config NET_DSA_MV88E6XXX_NEED_PPU
|
||||||
|
bool
|
||||||
|
default n
|
||||||
|
--- a/net/dsa/Makefile
|
||||||
|
+++ b/net/dsa/Makefile
|
||||||
|
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag
|
||||||
|
# switch drivers
|
||||||
|
obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
|
||||||
|
obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
|
||||||
|
+obj-$(CONFIG_NET_DSA_MV88E6063) += mv88e6063.o
|
||||||
|
obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o
|
||||||
|
obj-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o
|
||||||
|
|
@ -0,0 +1,79 @@
|
|||||||
|
--- a/include/linux/if_ether.h
|
||||||
|
+++ b/include/linux/if_ether.h
|
||||||
|
@@ -81,6 +81,7 @@
|
||||||
|
#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */
|
||||||
|
#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */
|
||||||
|
#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */
|
||||||
|
+#define ETH_P_QINQ 0x9100 /* QinQ VLAN Stacking Protocol */
|
||||||
|
#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- a/net/dsa/dsa_priv.h
|
||||||
|
+++ b/net/dsa/dsa_priv.h
|
||||||
|
@@ -174,6 +174,9 @@ netdev_tx_t dsa_xmit(struct sk_buff *skb
|
||||||
|
/* tag_edsa.c */
|
||||||
|
netdev_tx_t edsa_xmit(struct sk_buff *skb, struct net_device *dev);
|
||||||
|
|
||||||
|
+/* tag_qinq.c */
|
||||||
|
+netdev_tx_t qinq_xmit(struct sk_buff *skb, struct net_device *dev);
|
||||||
|
+
|
||||||
|
/* tag_trailer.c */
|
||||||
|
netdev_tx_t trailer_xmit(struct sk_buff *skb, struct net_device *dev);
|
||||||
|
|
||||||
|
--- a/net/dsa/Kconfig
|
||||||
|
+++ b/net/dsa/Kconfig
|
||||||
|
@@ -23,6 +23,10 @@ config NET_DSA_TAG_TRAILER
|
||||||
|
bool
|
||||||
|
default n
|
||||||
|
|
||||||
|
+config NET_DSA_TAG_QINQ
|
||||||
|
+ bool
|
||||||
|
+ default y
|
||||||
|
+
|
||||||
|
|
||||||
|
# switch drivers
|
||||||
|
config NET_DSA_MV88E6XXX
|
||||||
|
--- a/net/dsa/Makefile
|
||||||
|
+++ b/net/dsa/Makefile
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
# tagging formats
|
||||||
|
obj-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o
|
||||||
|
obj-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o
|
||||||
|
+obj-$(CONFIG_NET_DSA_TAG_QINQ) += tag_qinq.o
|
||||||
|
obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
|
||||||
|
|
||||||
|
# switch drivers
|
||||||
|
--- a/net/dsa/slave.c
|
||||||
|
+++ b/net/dsa/slave.c
|
||||||
|
@@ -321,6 +321,19 @@ static const struct net_device_ops edsa_
|
||||||
|
.ndo_do_ioctl = dsa_slave_ioctl,
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
+#ifdef CONFIG_NET_DSA_TAG_QINQ
|
||||||
|
+static const struct net_device_ops qinq_netdev_ops = {
|
||||||
|
+ .ndo_init = dsa_slave_init,
|
||||||
|
+ .ndo_open = dsa_slave_open,
|
||||||
|
+ .ndo_stop = dsa_slave_close,
|
||||||
|
+ .ndo_start_xmit = qinq_xmit,
|
||||||
|
+ .ndo_change_rx_flags = dsa_slave_change_rx_flags,
|
||||||
|
+ .ndo_set_rx_mode = dsa_slave_set_rx_mode,
|
||||||
|
+ .ndo_set_multicast_list = dsa_slave_set_rx_mode,
|
||||||
|
+ .ndo_set_mac_address = dsa_slave_set_mac_address,
|
||||||
|
+ .ndo_do_ioctl = dsa_slave_ioctl,
|
||||||
|
+};
|
||||||
|
+#endif
|
||||||
|
#ifdef CONFIG_NET_DSA_TAG_TRAILER
|
||||||
|
static const struct net_device_ops trailer_netdev_ops = {
|
||||||
|
.ndo_init = dsa_slave_init,
|
||||||
|
@@ -366,6 +379,11 @@ dsa_slave_create(struct dsa_switch *ds,
|
||||||
|
slave_dev->netdev_ops = &edsa_netdev_ops;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
+#ifdef CONFIG_NET_DSA_TAG_QINQ
|
||||||
|
+ case htons(ETH_P_QINQ):
|
||||||
|
+ slave_dev->netdev_ops = &qinq_netdev_ops;
|
||||||
|
+ break;
|
||||||
|
+#endif
|
||||||
|
#ifdef CONFIG_NET_DSA_TAG_TRAILER
|
||||||
|
case htons(ETH_P_TRAILER):
|
||||||
|
slave_dev->netdev_ops = &trailer_netdev_ops;
|
@ -0,0 +1,28 @@
|
|||||||
|
--- a/net/dsa/Kconfig
|
||||||
|
+++ b/net/dsa/Kconfig
|
||||||
|
@@ -29,6 +29,15 @@ config NET_DSA_TAG_QINQ
|
||||||
|
|
||||||
|
|
||||||
|
# switch drivers
|
||||||
|
+config NET_DSA_AR7240
|
||||||
|
+ bool "Atheros AR7240 built-in ethernet switch support"
|
||||||
|
+ depends on ATHEROS_AR71XX
|
||||||
|
+ default n
|
||||||
|
+ select NET_DSA_TAG_QINQ
|
||||||
|
+ ---help---
|
||||||
|
+ This enables support for the built-in ethernet switch of the
|
||||||
|
+ Atheros AR7240 SoC.
|
||||||
|
+
|
||||||
|
config NET_DSA_MV88E6XXX
|
||||||
|
bool
|
||||||
|
default n
|
||||||
|
--- a/net/dsa/Makefile
|
||||||
|
+++ b/net/dsa/Makefile
|
||||||
|
@@ -5,6 +5,7 @@ obj-$(CONFIG_NET_DSA_TAG_QINQ) += tag_qi
|
||||||
|
obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
|
||||||
|
|
||||||
|
# switch drivers
|
||||||
|
+obj-$(CONFIG_NET_DSA_AR7240) += ar7240.o
|
||||||
|
obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
|
||||||
|
obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
|
||||||
|
obj-$(CONFIG_NET_DSA_MV88E6063) += mv88e6063.o
|
@ -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
|
||||||
|
@@ -488,4 +488,8 @@ config MTD_NAND_W90P910
|
||||||
|
This enables the driver for the NAND Flash on evaluation board based
|
||||||
|
on w90p910.
|
||||||
|
|
||||||
|
+config MTD_NAND_RB4XX
|
||||||
|
+ tristate "NAND flash driver for RouterBoard 4xx series"
|
||||||
|
+ depends on MTD_NAND && AR71XX_MACH_RB4XX
|
||||||
|
+
|
||||||
|
endif # MTD_NAND
|
||||||
|
--- a/drivers/mtd/nand/Makefile
|
||||||
|
+++ b/drivers/mtd/nand/Makefile
|
||||||
|
@@ -30,6 +30,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270) += cmx27
|
||||||
|
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,27 @@
|
|||||||
|
--- 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
|
@ -0,0 +1,24 @@
|
|||||||
|
--- a/drivers/spi/Kconfig
|
||||||
|
+++ b/drivers/spi/Kconfig
|
||||||
|
@@ -365,6 +365,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
|
||||||
|
@@ -54,6 +54,7 @@ spi_s3c24xx_hw-$(CONFIG_SPI_S3C24XX_FIQ)
|
||||||
|
|
||||||
|
# SPI protocol drivers (device/link on bus)
|
||||||
|
obj-$(CONFIG_SPI_SPIDEV) += spidev.o
|
||||||
|
+obj-$(CONFIG_SPI_VSC7385) += spi_vsc7385.o
|
||||||
|
obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o
|
||||||
|
# ... add above this line ...
|
||||||
|
|
@ -0,0 +1,27 @@
|
|||||||
|
--- 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
|
||||||
|
@@ -24,6 +24,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
|
@ -0,0 +1,26 @@
|
|||||||
|
--- 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.
|
||||||
|
|
||||||
|
+config LEDS_WNDR3700_USB
|
||||||
|
+ tristate "NETGEAR WNDR3700 USB LED driver"
|
||||||
|
+ depends on LEDS_CLASS && AR71XX_MACH_WNDR3700
|
||||||
|
+ help
|
||||||
|
+ This option enables support for the USB LED found on the
|
||||||
|
+ NETGEAR WNDR3700 board.
|
||||||
|
+
|
||||||
|
comment "LED Triggers"
|
||||||
|
|
||||||
|
config LEDS_TRIGGERS
|
||||||
|
--- a/drivers/leds/Makefile
|
||||||
|
+++ b/drivers/leds/Makefile
|
||||||
|
@@ -29,6 +29,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
|
||||||
|
+obj-${CONFIG_LEDS_WNDR3700_USB} += leds-wndr3700-usb.o
|
||||||
|
obj-$(CONFIG_LEDS_REGULATOR) += leds-regulator.o
|
||||||
|
obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o
|
||||||
|
obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o
|
@ -0,0 +1,25 @@
|
|||||||
|
--- a/drivers/gpio/Kconfig
|
||||||
|
+++ b/drivers/gpio/Kconfig
|
||||||
|
@@ -255,4 +255,12 @@ config GPIO_UCB1400
|
||||||
|
To compile this driver as a module, choose M here: the
|
||||||
|
module will be called ucb1400_gpio.
|
||||||
|
|
||||||
|
+comment "Other GPIO expanders"
|
||||||
|
+
|
||||||
|
+config GPIO_NXP_74HC153
|
||||||
|
+ tristate "NXP 74HC153 Dual 4-input multiplexer"
|
||||||
|
+ help
|
||||||
|
+ Platform driver for NXP 74HC153 Dual 4-input Multiplexer. This
|
||||||
|
+ provides a GPIO interface supporting inputs.
|
||||||
|
+
|
||||||
|
endif
|
||||||
|
--- a/drivers/gpio/Makefile
|
||||||
|
+++ b/drivers/gpio/Makefile
|
||||||
|
@@ -11,6 +11,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
|
||||||
|
+obj-$(CONFIG_GPIO_NXP_74HC153) += nxp_74hc153.o
|
||||||
|
obj-$(CONFIG_GPIO_PCA953X) += pca953x.o
|
||||||
|
obj-$(CONFIG_GPIO_PCF857X) += pcf857x.o
|
||||||
|
obj-$(CONFIG_GPIO_PL061) += pl061.o
|
@ -0,0 +1,23 @@
|
|||||||
|
--- a/drivers/leds/Kconfig
|
||||||
|
+++ b/drivers/leds/Kconfig
|
||||||
|
@@ -276,6 +276,10 @@ config LEDS_WNDR3700_USB
|
||||||
|
This option enables support for the USB LED found on the
|
||||||
|
NETGEAR WNDR3700 board.
|
||||||
|
|
||||||
|
+config LEDS_RB750
|
||||||
|
+ tristate "LED driver for the Mikrotik RouterBOARD 750"
|
||||||
|
+ depends on LEDS_CLASS && AR71XX_MACH_RB750
|
||||||
|
+
|
||||||
|
comment "LED Triggers"
|
||||||
|
|
||||||
|
config LEDS_TRIGGERS
|
||||||
|
--- 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
|
||||||
|
obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o
|
||||||
|
obj-$(CONFIG_LEDS_ADP5520) += leds-adp5520.o
|
||||||
|
+obj-$(CONFIG_LEDS_RB750) += leds-rb750.o
|
||||||
|
|
||||||
|
# LED SPI Drivers
|
||||||
|
obj-$(CONFIG_LEDS_DAC124S085) += leds-dac124s085.o
|
@ -0,0 +1,21 @@
|
|||||||
|
--- a/drivers/mtd/nand/Kconfig
|
||||||
|
+++ b/drivers/mtd/nand/Kconfig
|
||||||
|
@@ -492,4 +492,8 @@ config MTD_NAND_RB4XX
|
||||||
|
tristate "NAND flash driver for RouterBoard 4xx series"
|
||||||
|
depends on MTD_NAND && AR71XX_MACH_RB4XX
|
||||||
|
|
||||||
|
+config MTD_NAND_RB750
|
||||||
|
+ tristate "NAND flash driver for the RouterBoard 750"
|
||||||
|
+ depends on MTD_NAND && AR71XX_MACH_RB750
|
||||||
|
+
|
||||||
|
endif # MTD_NAND
|
||||||
|
--- a/drivers/mtd/nand/Makefile
|
||||||
|
+++ b/drivers/mtd/nand/Makefile
|
||||||
|
@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx
|
||||||
|
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_NAND_RB750) += rb750_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
|
||||||
|
@@ -181,6 +181,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/
|
||||||
|
|
||||||
|
--- a/arch/mips/Kconfig
|
||||||
|
+++ b/arch/mips/Kconfig
|
||||||
|
@@ -877,6 +877,9 @@ config MIPS_NILE4
|
||||||
|
config MIPS_DISABLE_OBSOLETE_IDE
|
||||||
|
bool
|
||||||
|
|
||||||
|
+config MYLOADER
|
||||||
|
+ bool
|
||||||
|
+
|
||||||
|
config SYNC_R4K
|
||||||
|
bool
|
||||||
|
|
@ -0,0 +1,134 @@
|
|||||||
|
--- a/arch/mips/kernel/mips_machine.c
|
||||||
|
+++ b/arch/mips/kernel/mips_machine.c
|
||||||
|
@@ -7,12 +7,13 @@
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#include <linux/mm.h>
|
||||||
|
+#include <linux/string.h>
|
||||||
|
|
||||||
|
#include <asm/mips_machine.h>
|
||||||
|
-#include <asm/bootinfo.h>
|
||||||
|
|
||||||
|
static struct list_head mips_machines __initdata =
|
||||||
|
LIST_HEAD_INIT(mips_machines);
|
||||||
|
+static char *mips_machid __initdata;
|
||||||
|
|
||||||
|
char *mips_machine_name = "Unknown";
|
||||||
|
|
||||||
|
@@ -55,20 +56,65 @@ void __init mips_machine_set_name(char *
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-void __init mips_machine_setup(unsigned long machtype)
|
||||||
|
+void __init mips_machine_setup(void)
|
||||||
|
{
|
||||||
|
struct mips_machine *mach;
|
||||||
|
|
||||||
|
- mach = mips_machine_find(machtype);
|
||||||
|
+ mach = mips_machine_find(mips_machtype);
|
||||||
|
if (!mach) {
|
||||||
|
- printk(KERN_ALERT "MIPS: no machine registered for "
|
||||||
|
- "machtype %lu\n", machtype);
|
||||||
|
+ printk(KERN_WARNING "MIPS: no machine registered for "
|
||||||
|
+ "machtype %lu\n", mips_machtype);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
mips_machine_set_name(mach->mach_name);
|
||||||
|
- printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name);
|
||||||
|
+ printk(KERN_NOTICE "MIPS: machine is %s\n", mips_machine_name);
|
||||||
|
|
||||||
|
if (mach->mach_setup)
|
||||||
|
mach->mach_setup();
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+int __init mips_machtype_setup(char *id)
|
||||||
|
+{
|
||||||
|
+ if (mips_machid == NULL)
|
||||||
|
+ mips_machid = id;
|
||||||
|
+
|
||||||
|
+ return 1;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+__setup("machtype=", mips_machtype_setup);
|
||||||
|
+
|
||||||
|
+static int __init mips_machtype_init(void)
|
||||||
|
+{
|
||||||
|
+ struct list_head *this;
|
||||||
|
+ struct mips_machine *mach;
|
||||||
|
+
|
||||||
|
+ if (mips_machid == NULL)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ list_for_each(this, &mips_machines) {
|
||||||
|
+ mach = list_entry(this, struct mips_machine, list);
|
||||||
|
+ if (mach->mach_id == NULL)
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ if (strcmp(mach->mach_id, mips_machid) == 0) {
|
||||||
|
+ mips_machtype = mach->mach_type;
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ printk(KERN_WARNING
|
||||||
|
+ "MIPS: no machine found for id: '%s', registered machines:\n",
|
||||||
|
+ mips_machid);
|
||||||
|
+ printk(KERN_WARNING "%32s %s\n", "id", "name");
|
||||||
|
+
|
||||||
|
+ list_for_each(this, &mips_machines) {
|
||||||
|
+ mach = list_entry(this, struct mips_machine, list);
|
||||||
|
+ printk(KERN_WARNING "%32s %s\n",
|
||||||
|
+ mach->mach_id ? mach->mach_id : "", mach->mach_name);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+core_initcall(mips_machtype_init);
|
||||||
|
--- a/arch/mips/include/asm/mips_machine.h
|
||||||
|
+++ b/arch/mips/include/asm/mips_machine.h
|
||||||
|
@@ -13,25 +13,33 @@
|
||||||
|
#include <linux/init.h>
|
||||||
|
#include <linux/list.h>
|
||||||
|
|
||||||
|
+#include <asm/bootinfo.h>
|
||||||
|
+
|
||||||
|
struct mips_machine {
|
||||||
|
unsigned long mach_type;
|
||||||
|
- void (*mach_setup)(void);
|
||||||
|
+ char *mach_id;
|
||||||
|
char *mach_name;
|
||||||
|
+ void (*mach_setup)(void);
|
||||||
|
struct list_head list;
|
||||||
|
};
|
||||||
|
|
||||||
|
void mips_machine_register(struct mips_machine *) __init;
|
||||||
|
-void mips_machine_setup(unsigned long machtype) __init;
|
||||||
|
+void mips_machine_setup(void) __init;
|
||||||
|
+int mips_machtype_setup(char *id) __init;
|
||||||
|
void mips_machine_set_name(char *name) __init;
|
||||||
|
|
||||||
|
extern char *mips_machine_name;
|
||||||
|
|
||||||
|
-#define MIPS_MACHINE(_type, _name, _setup) \
|
||||||
|
-static char machine_name_##_type[] __initdata = _name; \
|
||||||
|
+#define MIPS_MACHINE(_type, _id, _name, _setup) \
|
||||||
|
+static const char machine_name_##_type[] __initconst \
|
||||||
|
+ __aligned(1) = _name; \
|
||||||
|
+static const char machine_id_##_type[] __initconst \
|
||||||
|
+ __aligned(1) = _id; \
|
||||||
|
static struct mips_machine machine_##_type __initdata = \
|
||||||
|
{ \
|
||||||
|
.mach_type = _type, \
|
||||||
|
- .mach_name = machine_name_##_type, \
|
||||||
|
+ .mach_id = (char *) machine_id_##_type, \
|
||||||
|
+ .mach_name = (char *) machine_name_##_type, \
|
||||||
|
.mach_setup = _setup, \
|
||||||
|
}; \
|
||||||
|
\
|
||||||
|
@@ -44,4 +52,3 @@ static int __init register_machine_##_ty
|
||||||
|
pure_initcall(register_machine_##_type)
|
||||||
|
|
||||||
|
#endif /* __ASM_MIPS_MACHINE_H */
|
||||||
|
-
|
@ -0,0 +1,29 @@
|
|||||||
|
--- a/arch/mips/kernel/traps.c
|
||||||
|
+++ b/arch/mips/kernel/traps.c
|
||||||
|
@@ -51,6 +51,7 @@
|
||||||
|
#include <asm/stacktrace.h>
|
||||||
|
#include <asm/irq.h>
|
||||||
|
#include <asm/uasm.h>
|
||||||
|
+#include <asm/time.h>
|
||||||
|
|
||||||
|
extern void check_wait(void);
|
||||||
|
extern asmlinkage void r4k_wait(void);
|
||||||
|
@@ -1501,6 +1502,8 @@
|
||||||
|
if (cpu_has_mips_r2) {
|
||||||
|
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
|
||||||
|
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
|
||||||
|
+ if (get_c0_compare_irq)
|
||||||
|
+ cp0_compare_irq = get_c0_compare_irq();
|
||||||
|
cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 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
|
||||||
|
@@ -16,6 +16,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.
|
||||||
|
*/
|
||||||
|
@@ -31,6 +47,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;
|
||||||
|
}
|
||||||
|
@@ -100,22 +117,6 @@ static int c0_compare_int_pending(void)
|
||||||
|
return (read_c0_cause() >> cp0_compare_irq_shift) & (1ul << CAUSEB_IP);
|
||||||
|
}
|
||||||
|
|
||||||
|
-/*
|
||||||
|
- * 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