RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-01-03 21:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: update 3.10 to 3.10.26

Browse Source 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39220
This commit is contained in:
Gabor Juhos 2014-01-11 16:06:37 +00:00
parent 30ebad2dee
commit 0e2586a774
54 changed files with 210 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -17,8 +17,8 @@ endif
ifeq ($(LINUX_VERSION),3.9.11) ifeq ($(LINUX_VERSION),3.9.11)
LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755 LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755
endif endif
ifeq ($(LINUX_VERSION),3.10.24) ifeq ($(LINUX_VERSION),3.10.26)
LINUX_KERNEL_MD5SUM:=4b1270dda167a0ee8bead2681e0a9965 LINUX_KERNEL_MD5SUM:=9cdbcb3463b9753fafd97cddb38d1211
endif endif
ifeq ($(LINUX_VERSION),3.12.5) ifeq ($(LINUX_VERSION),3.12.5)
LINUX_KERNEL_MD5SUM:=5b5330f657f562f7bef6da100a7133b1 LINUX_KERNEL_MD5SUM:=5b5330f657f562f7bef6da100a7133b1

2
target/linux/ar7/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=squashfs atm
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
SUBTARGETS:=generic ac49x SUBTARGETS:=generic ac49x
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/ar71xx/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=mips16
CPU_TYPE=34kc CPU_TYPE=34kc
SUBTARGETS:=generic nand mikrotik SUBTARGETS:=generic nand mikrotik
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/avr32/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32
FEATURES:=squashfs FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/bcm53xx/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=squashfs usb pci pcie gpio
MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
CPU_TYPE:=cortex-a9 CPU_TYPE:=cortex-a9
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/brcm2708/Makefile
View File

@ -15,7 +15,7 @@ MAINTAINER:=Florian Fainelli <florian@openwrt.org>
CPU_TYPE:=arm1176jzf-s CPU_TYPE:=arm1176jzf-s
CPU_SUBTYPE:=vfp CPU_SUBTYPE:=vfp
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835 DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835

2
target/linux/brcm47xx/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb pcmcia FEATURES:=squashfs usb pcmcia
MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += swconfig kmod-diag wpad-mini nvram DEFAULT_PACKAGES += swconfig kmod-diag wpad-mini nvram

2
target/linux/brcm63xx/Makefile
View File

@ -11,7 +11,7 @@ BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM63xx BOARDNAME:=Broadcom BCM63xx
SUBTARGETS:=generic smp SUBTARGETS:=generic smp
FEATURES:=squashfs usb atm pci pcmcia FEATURES:=squashfs usb atm pci pcmcia
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/brcm63xx/patches-3.10/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -1091,7 +1091,8 @@ static int m25p_probe(struct spi_device @@ -1092,7 +1092,8 @@ static int m25p_probe(struct spi_device
/* partitions should match sector boundaries; and it may be good to /* partitions should match sector boundaries; and it may be good to
* use readonly partitions for writeprotected sectors (BP2..BP0). * use readonly partitions for writeprotected sectors (BP2..BP0).
*/ */

2
target/linux/brcm63xx/patches-3.10/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
View File

@ -60,7 +60,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
/* /*
* Write an address range to the flash chip. Data must be written in * Write an address range to the flash chip. Data must be written in
* FLASH_PAGESIZE chunks. The address range may be any size provided * FLASH_PAGESIZE chunks. The address range may be any size provided
@@ -986,6 +1008,9 @@ static int m25p_probe(struct spi_device @@ -987,6 +1009,9 @@ static int m25p_probe(struct spi_device
return -ENOMEM; return -ENOMEM;
} }

2
target/linux/brcm63xx/patches-3.10/414-MTD-m25p80-allow-passing-pp_data.patch
View File

@ -10,7 +10,7 @@ Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -975,6 +975,9 @@ static int m25p_probe(struct spi_device @@ -976,6 +976,9 @@ static int m25p_probe(struct spi_device
dev_warn(&spi->dev, "unrecognized id %s\n", data->type); dev_warn(&spi->dev, "unrecognized id %s\n", data->type);
} }

2
target/linux/cns21xx/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx
FEATURES:=squashfs FEATURES:=squashfs
CPU_TYPE:=fa526 CPU_TYPE:=fa526
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

6
target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch
View File

@ -157,7 +157,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
return 0; return 0;
--- a/arch/mips/mm/dma-default.c --- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c
@@ -289,7 +289,6 @@ static void mips_dma_sync_single_for_cpu @@ -293,7 +293,6 @@ static void mips_dma_sync_single_for_cpu
static void mips_dma_sync_single_for_device(struct device *dev, static void mips_dma_sync_single_for_device(struct device *dev,
dma_addr_t dma_handle, size_t size, enum dma_data_direction direction) dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
{ {
@ -165,7 +165,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!plat_device_is_coherent(dev)) if (!plat_device_is_coherent(dev))
__dma_sync(dma_addr_to_page(dev, dma_handle), __dma_sync(dma_addr_to_page(dev, dma_handle),
dma_handle & ~PAGE_MASK, size, direction); dma_handle & ~PAGE_MASK, size, direction);
@@ -323,7 +322,7 @@ static void mips_dma_sync_sg_for_device( @@ -327,7 +326,7 @@ static void mips_dma_sync_sg_for_device(
int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{ {
@ -174,7 +174,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
} }
int mips_dma_supported(struct device *dev, u64 mask) int mips_dma_supported(struct device *dev, u64 mask)
@@ -336,7 +335,6 @@ void dma_cache_sync(struct device *dev, @@ -340,7 +339,6 @@ void dma_cache_sync(struct device *dev,
{ {
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);

44
target/linux/generic/patches-3.10/132-mips_inline_dma_ops.patch
View File

@ -459,7 +459,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
int hw_coherentio = 0; /* Actual hardware supported DMA coherency setting. */ int hw_coherentio = 0; /* Actual hardware supported DMA coherency setting. */
static int __init setcoherentio(char *str) static int __init setcoherentio(char *str)
@@ -44,26 +44,6 @@ static int __init setnocoherentio(char * @@ -44,13 +44,6 @@ static int __init setnocoherentio(char *
early_param("nocoherentio", setnocoherentio); early_param("nocoherentio", setnocoherentio);
#endif #endif
@ -470,23 +470,10 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- plat_dma_addr_to_phys(dev, dma_addr) >> PAGE_SHIFT); - plat_dma_addr_to_phys(dev, dma_addr) >> PAGE_SHIFT);
-} -}
- -
-/* /*
- * Warning on the terminology - Linux calls an uncached area coherent; * The affected CPUs below in 'cpu_needs_post_dma_flush()' can
- * MIPS terminology calls memory areas with hardware maintained coherency * speculatively fill random cachelines with stale data at any time,
- * coherent. @@ -123,8 +116,9 @@ void *dma_alloc_noncoherent(struct devic
- */
-
-static inline int cpu_is_noncoherent_r10000(struct device *dev)
-{
- return !plat_device_is_coherent(dev) &&
- (current_cpu_type() == CPU_R10000 ||
- current_cpu_type() == CPU_R12000);
-}
-
static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
{
gfp_t dma_flag;
@@ -119,8 +99,9 @@ void *dma_alloc_noncoherent(struct devic
} }
EXPORT_SYMBOL(dma_alloc_noncoherent); EXPORT_SYMBOL(dma_alloc_noncoherent);
@ -498,7 +485,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
{ {
void *ret; void *ret;
@@ -144,6 +125,7 @@ static void *mips_dma_alloc_coherent(str @@ -148,6 +142,7 @@ static void *mips_dma_alloc_coherent(str
return ret; return ret;
} }
@ -506,7 +493,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
@@ -154,8 +136,8 @@ void dma_free_noncoherent(struct device @@ -158,8 +153,8 @@ void dma_free_noncoherent(struct device
} }
EXPORT_SYMBOL(dma_free_noncoherent); EXPORT_SYMBOL(dma_free_noncoherent);
@ -517,7 +504,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
{ {
unsigned long addr = (unsigned long) vaddr; unsigned long addr = (unsigned long) vaddr;
int order = get_order(size); int order = get_order(size);
@@ -170,6 +152,7 @@ static void mips_dma_free_coherent(struc @@ -174,6 +169,7 @@ static void mips_dma_free_coherent(struc
free_pages(addr, get_order(size)); free_pages(addr, get_order(size));
} }
@ -525,7 +512,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
static inline void __dma_sync_virtual(void *addr, size_t size, static inline void __dma_sync_virtual(void *addr, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
@@ -198,8 +181,8 @@ static inline void __dma_sync_virtual(vo @@ -202,8 +198,8 @@ static inline void __dma_sync_virtual(vo
* If highmem is not configured then the bulk of this loop gets * If highmem is not configured then the bulk of this loop gets
* optimized out. * optimized out.
*/ */
@ -536,15 +523,14 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
{ {
size_t left = size; size_t left = size;
@@ -228,109 +211,7 @@ static inline void __dma_sync(struct pag @@ -233,108 +229,7 @@ static inline void __dma_sync(struct pag
left -= len;
} while (left); } while (left);
} }
-
-static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr, -static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
- size_t size, enum dma_data_direction direction, struct dma_attrs *attrs) - size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
-{ -{
- if (cpu_is_noncoherent_r10000(dev)) - if (cpu_needs_post_dma_flush(dev))
- __dma_sync(dma_addr_to_page(dev, dma_addr), - __dma_sync(dma_addr_to_page(dev, dma_addr),
- dma_addr & ~PAGE_MASK, size, direction); - dma_addr & ~PAGE_MASK, size, direction);
- -
@ -595,7 +581,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-static void mips_dma_sync_single_for_cpu(struct device *dev, -static void mips_dma_sync_single_for_cpu(struct device *dev,
- dma_addr_t dma_handle, size_t size, enum dma_data_direction direction) - dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
-{ -{
- if (cpu_is_noncoherent_r10000(dev)) - if (cpu_needs_post_dma_flush(dev))
- __dma_sync(dma_addr_to_page(dev, dma_handle), - __dma_sync(dma_addr_to_page(dev, dma_handle),
- dma_handle & ~PAGE_MASK, size, direction); - dma_handle & ~PAGE_MASK, size, direction);
-} -}
@ -615,7 +601,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- -
- /* Make sure that gcc doesn't leave the empty loop body. */ - /* Make sure that gcc doesn't leave the empty loop body. */
- for (i = 0; i < nelems; i++, sg++) { - for (i = 0; i < nelems; i++, sg++) {
- if (cpu_is_noncoherent_r10000(dev)) - if (cpu_needs_post_dma_flush(dev))
- __dma_sync(sg_page(sg), sg->offset, sg->length, - __dma_sync(sg_page(sg), sg->offset, sg->length,
- direction); - direction);
- } - }
@ -647,7 +633,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
void dma_cache_sync(struct device *dev, void *vaddr, size_t size, void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
@@ -343,23 +224,10 @@ void dma_cache_sync(struct device *dev, @@ -347,23 +242,10 @@ void dma_cache_sync(struct device *dev,
EXPORT_SYMBOL(dma_cache_sync); EXPORT_SYMBOL(dma_cache_sync);

2
target/linux/generic/patches-3.10/950-vm_exports.patch
View File

@ -52,7 +52,7 @@
* When we die, we re-parent all our children, and try to: * When we die, we re-parent all our children, and try to:
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -3707,6 +3707,7 @@ int can_nice(const struct task_struct *p @@ -3719,6 +3719,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE)); capable(CAP_SYS_NICE));
} }

2
target/linux/imx6/Makefile
View File

@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9
CPU_SUBTYPE:=vfpv3 CPU_SUBTYPE:=vfpv3
MAINTAINER:=Luka Perkov <luka@openwrt.org> MAINTAINER:=Luka Perkov <luka@openwrt.org>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/imx6/patches-3.10/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch
View File

@ -47,7 +47,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
--- a/drivers/of/address.c --- a/drivers/of/address.c
+++ b/drivers/of/address.c +++ b/drivers/of/address.c
@@ -231,6 +231,73 @@ int of_pci_address_to_resource(struct de @@ -223,6 +223,73 @@ int of_pci_address_to_resource(struct de
return __of_address_to_resource(dev, addrp, size, flags, NULL, r); return __of_address_to_resource(dev, addrp, size, flags, NULL, r);
} }
EXPORT_SYMBOL_GPL(of_pci_address_to_resource); EXPORT_SYMBOL_GPL(of_pci_address_to_resource);

2
target/linux/ixp4xx/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
SUBTARGETS=generic harddisk SUBTARGETS=generic harddisk
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch
View File

@ -10,7 +10,7 @@
/* Get the HEAD */ /* Get the HEAD */
skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node); skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node);
@@ -1085,6 +1088,10 @@ int pskb_expand_head(struct sk_buff *skb @@ -1082,6 +1085,10 @@ int pskb_expand_head(struct sk_buff *skb
if (skb_shared(skb)) if (skb_shared(skb))
BUG(); BUG();

2
target/linux/kirkwood/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=targz usb jffs2_nand ubifs
CPU_TYPE:=xscale CPU_TYPE:=xscale
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/kirkwood/patches-3.10/0001-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch
View File

@ -50,7 +50,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
--- a/drivers/of/address.c --- a/drivers/of/address.c
+++ b/drivers/of/address.c +++ b/drivers/of/address.c
@@ -231,6 +231,73 @@ int of_pci_address_to_resource(struct de @@ -223,6 +223,73 @@ int of_pci_address_to_resource(struct de
return __of_address_to_resource(dev, addrp, size, flags, NULL, r); return __of_address_to_resource(dev, addrp, size, flags, NULL, r);
} }
EXPORT_SYMBOL_GPL(of_pci_address_to_resource); EXPORT_SYMBOL_GPL(of_pci_address_to_resource);

2
target/linux/lantiq/Makefile
View File

@ -11,7 +11,7 @@ BOARDNAME:=Lantiq GPON/XWAY/SVIP
FEATURES:=squashfs FEATURES:=squashfs
SUBTARGETS=xway xrx200 ase falcon SUBTARGETS=xway xrx200 ase falcon
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
CPU_TYPE:=mips32r2 CPU_TYPE:=mips32r2

4
target/linux/lantiq/patches-3.10/0012-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -925,10 +925,13 @@ static int m25p_probe(struct spi_device @@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device
unsigned i; unsigned i;
struct mtd_part_parser_data ppdata; struct mtd_part_parser_data ppdata;
struct device_node __maybe_unused *np = spi->dev.of_node; struct device_node __maybe_unused *np = spi->dev.of_node;
@ -28,7 +28,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#endif #endif
/* Platform data helps sort out which chip type we have, as /* Platform data helps sort out which chip type we have, as
@@ -1004,6 +1007,8 @@ static int m25p_probe(struct spi_device @@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device
if (data && data->name) if (data && data->name)
flash->mtd.name = data->name; flash->mtd.name = data->name;

2
target/linux/malta/Makefile
View File

@ -12,7 +12,7 @@ SUBTARGETS:=le be le64 be64
INITRAMFS_EXTRA_FILES:= INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
DEVICE_TYPE:=developerboard DEVICE_TYPE:=developerboard

2
target/linux/mpc85xx/Makefile
View File

@ -14,7 +14,7 @@ FEATURES:=spe_fpu squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
SUBTARGETS=generic p1020 SUBTARGETS=generic p1020
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/mvebu/Makefile
View File

@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9
CPU_SUBTYPE:=vfpv3 CPU_SUBTYPE:=vfpv3
MAINTAINER:=Luka Perkov <luka@openwrt.org> MAINTAINER:=Luka Perkov <luka@openwrt.org>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/octeon/Makefile
View File

@ -14,7 +14,7 @@ CPU_TYPE:=octeon
CPU_CFLAGS_octeon:=-march=octeon CPU_CFLAGS_octeon:=-march=octeon
MAINTAINER:=John Crispin <blogic@openwrt.org> MAINTAINER:=John Crispin <blogic@openwrt.org>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/ppc40x/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=squashfs
CPU_TYPE:=405 CPU_TYPE:=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/ppc44x/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=squashfs broken
CPU_TYPE:=440 CPU_TYPE:=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/ramips/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=Ralink RT288x/RT3xxx
SUBTARGETS:=rt305x mt7620a mt7620n mt7621 rt3883 rt288x SUBTARGETS:=rt305x mt7620a mt7620n mt7621 rt3883 rt288x
FEATURES:=squashfs gpio FEATURES:=squashfs gpio
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\ DEFAULT_PACKAGES+=\

4
target/linux/ramips/patches-3.10/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -925,10 +925,13 @@ static int m25p_probe(struct spi_device @@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device
unsigned i; unsigned i;
struct mtd_part_parser_data ppdata; struct mtd_part_parser_data ppdata;
struct device_node __maybe_unused *np = spi->dev.of_node; struct device_node __maybe_unused *np = spi->dev.of_node;
@ -28,7 +28,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#endif #endif
/* Platform data helps sort out which chip type we have, as /* Platform data helps sort out which chip type we have, as
@@ -1004,6 +1007,8 @@ static int m25p_probe(struct spi_device @@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device
if (data && data->name) if (data && data->name)
flash->mtd.name = data->name; flash->mtd.name = data->name;

138
target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
View File

@ -46,10 +46,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
create mode 100644 drivers/net/ethernet/ralink/soc_rt305x.c create mode 100644 drivers/net/ethernet/ralink/soc_rt305x.c
create mode 100644 drivers/net/ethernet/ralink/soc_rt3883.c create mode 100644 drivers/net/ethernet/ralink/soc_rt3883.c
Index: linux-3.10.21/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h --- /dev/null
=================================================================== +++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h 2013-12-09 13:26:42.320125202 +0100
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
+/* +/*
+ * Ralink RT305x SoC platform device registration + * Ralink RT305x SoC platform device registration
@ -78,11 +76,9 @@ Index: linux-3.10.21/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
+}; +};
+ +
+#endif /* _RT305X_ESW_PLATFORM_H */ +#endif /* _RT305X_ESW_PLATFORM_H */
Index: linux-3.10.21/arch/mips/ralink/rt305x.c --- a/arch/mips/ralink/rt305x.c
=================================================================== +++ b/arch/mips/ralink/rt305x.c
--- linux-3.10.21.orig/arch/mips/ralink/rt305x.c 2013-11-29 20:12:03.000000000 +0100 @@ -221,6 +221,7 @@ void __init ralink_clk_init(void)
+++ linux-3.10.21/arch/mips/ralink/rt305x.c 2013-12-09 14:04:34.200179338 +0100
@@ -221,6 +221,7 @@
} }
ralink_clk_add("cpu", cpu_rate); ralink_clk_add("cpu", cpu_rate);
@ -90,11 +86,9 @@ Index: linux-3.10.21/arch/mips/ralink/rt305x.c
ralink_clk_add("10000b00.spi", sys_rate); ralink_clk_add("10000b00.spi", sys_rate);
ralink_clk_add("10000100.timer", wdt_rate); ralink_clk_add("10000100.timer", wdt_rate);
ralink_clk_add("10000120.watchdog", wdt_rate); ralink_clk_add("10000120.watchdog", wdt_rate);
Index: linux-3.10.21/drivers/net/ethernet/Kconfig --- a/drivers/net/ethernet/Kconfig
=================================================================== +++ b/drivers/net/ethernet/Kconfig
--- linux-3.10.21.orig/drivers/net/ethernet/Kconfig 2013-11-29 20:12:03.000000000 +0100 @@ -135,6 +135,7 @@ config ETHOC
+++ linux-3.10.21/drivers/net/ethernet/Kconfig 2013-12-09 13:26:42.324125203 +0100
@@ -135,6 +135,7 @@
source "drivers/net/ethernet/packetengines/Kconfig" source "drivers/net/ethernet/packetengines/Kconfig"
source "drivers/net/ethernet/pasemi/Kconfig" source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig"
@ -102,11 +96,9 @@ Index: linux-3.10.21/drivers/net/ethernet/Kconfig
source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/realtek/Kconfig"
source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/renesas/Kconfig"
source "drivers/net/ethernet/rdc/Kconfig" source "drivers/net/ethernet/rdc/Kconfig"
Index: linux-3.10.21/drivers/net/ethernet/Makefile --- a/drivers/net/ethernet/Makefile
=================================================================== +++ b/drivers/net/ethernet/Makefile
--- linux-3.10.21.orig/drivers/net/ethernet/Makefile 2013-11-29 20:12:03.000000000 +0100 @@ -53,6 +53,7 @@ obj-$(CONFIG_ETHOC) += ethoc.o
+++ linux-3.10.21/drivers/net/ethernet/Makefile 2013-12-09 13:26:42.324125203 +0100
@@ -53,6 +53,7 @@
obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/ obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
@ -114,10 +106,8 @@ Index: linux-3.10.21/drivers/net/ethernet/Makefile
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_SH_ETH) += renesas/ obj-$(CONFIG_SH_ETH) += renesas/
obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
Index: linux-3.10.21/drivers/net/ethernet/ralink/Kconfig --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/Kconfig
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/Kconfig 2013-12-09 13:26:42.324125203 +0100
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+config NET_RALINK +config NET_RALINK
+ tristate "Ralink RT288X/RT3X5X/RT3662/RT3883/MT7620 ethernet driver" + tristate "Ralink RT288X/RT3X5X/RT3662/RT3883/MT7620 ethernet driver"
@ -151,10 +141,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/Kconfig
+ select PHYLIB + select PHYLIB
+ select SWCONFIG + select SWCONFIG
+endif +endif
Index: linux-3.10.21/drivers/net/ethernet/ralink/Makefile --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/Makefile
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/Makefile 2013-12-09 13:26:42.324125203 +0100
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+# +#
+# Makefile for the Ralink SoCs built-in ethernet macs +# Makefile for the Ralink SoCs built-in ethernet macs
@ -174,10 +162,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/Makefile
+ralink-eth-$(CONFIG_SOC_MT7620) += soc_mt7620.o +ralink-eth-$(CONFIG_SOC_MT7620) += soc_mt7620.o
+ +
+obj-$(CONFIG_NET_RALINK) += ralink-eth.o +obj-$(CONFIG_NET_RALINK) += ralink-eth.o
Index: linux-3.10.21/drivers/net/ethernet/ralink/esw_rt3052.c --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/esw_rt3052.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/esw_rt3052.c 2013-12-09 13:26:42.328125203 +0100
@@ -0,0 +1,1463 @@ @@ -0,0 +1,1463 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -1642,10 +1628,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/esw_rt3052.c
+{ +{
+ platform_driver_unregister(&esw_driver); + platform_driver_unregister(&esw_driver);
+} +}
Index: linux-3.10.21/drivers/net/ethernet/ralink/esw_rt3052.h --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/esw_rt3052.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/esw_rt3052.h 2013-12-09 13:26:42.328125203 +0100
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -1679,10 +1663,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/esw_rt3052.h
+ +
+#endif +#endif
+#endif +#endif
Index: linux-3.10.21/drivers/net/ethernet/ralink/gsw_mt7620a.c --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/gsw_mt7620a.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/gsw_mt7620a.c 2013-12-09 13:26:42.328125203 +0100
@@ -0,0 +1,566 @@ @@ -0,0 +1,566 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -2250,10 +2232,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/gsw_mt7620a.c
+ +
+ return 0; + return 0;
+} +}
Index: linux-3.10.21/drivers/net/ethernet/ralink/gsw_mt7620a.h --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/gsw_mt7620a.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/gsw_mt7620a.h 2013-12-09 13:26:42.328125203 +0100
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -2285,10 +2265,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/gsw_mt7620a.h
+extern int mt7620a_has_carrier(struct fe_priv *priv); +extern int mt7620a_has_carrier(struct fe_priv *priv);
+ +
+#endif +#endif
Index: linux-3.10.21/drivers/net/ethernet/ralink/mdio.c --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/mdio.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/mdio.c 2013-12-09 13:26:42.328125203 +0100
@@ -0,0 +1,244 @@ @@ -0,0 +1,244 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -2534,10 +2512,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/mdio.c
+ of_node_put(priv->mii_bus->dev.of_node); + of_node_put(priv->mii_bus->dev.of_node);
+ kfree(priv->mii_bus); + kfree(priv->mii_bus);
+} +}
Index: linux-3.10.21/drivers/net/ethernet/ralink/mdio.h --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/mdio.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/mdio.h 2013-12-09 13:26:42.328125203 +0100
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -2568,10 +2544,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/mdio.h
+static inline void fe_mdio_cleanup(struct fe_priv *priv) {} +static inline void fe_mdio_cleanup(struct fe_priv *priv) {}
+#endif +#endif
+#endif +#endif
Index: linux-3.10.21/drivers/net/ethernet/ralink/mdio_rt2880.c --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/mdio_rt2880.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/mdio_rt2880.c 2013-12-09 13:26:42.328125203 +0100
@@ -0,0 +1,232 @@ @@ -0,0 +1,232 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -2805,10 +2779,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/mdio_rt2880.c
+ +
+ return; + return;
+} +}
Index: linux-3.10.21/drivers/net/ethernet/ralink/mdio_rt2880.h --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/mdio_rt2880.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/mdio_rt2880.h 2013-12-09 13:26:42.328125203 +0100
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -2836,10 +2808,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/mdio_rt2880.h
+void rt2880_port_init(struct fe_priv *priv, struct device_node *np); +void rt2880_port_init(struct fe_priv *priv, struct device_node *np);
+ +
+#endif +#endif
Index: linux-3.10.21/drivers/net/ethernet/ralink/ralink_soc_eth.c --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/ralink_soc_eth.c 2013-12-09 14:01:00.060174130 +0100
@@ -0,0 +1,846 @@ @@ -0,0 +1,846 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -3687,10 +3657,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/ralink_soc_eth.c
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); +MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
+MODULE_DESCRIPTION("Ethernet driver for Ralink SoC"); +MODULE_DESCRIPTION("Ethernet driver for Ralink SoC");
Index: linux-3.10.21/drivers/net/ethernet/ralink/ralink_soc_eth.h --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/ralink_soc_eth.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/ralink_soc_eth.h 2013-12-09 13:26:42.332125203 +0100
@@ -0,0 +1,384 @@ @@ -0,0 +1,384 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -4076,10 +4044,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/ralink_soc_eth.h
+u32 fe_r32(unsigned reg); +u32 fe_r32(unsigned reg);
+ +
+#endif /* FE_ETH_H */ +#endif /* FE_ETH_H */
Index: linux-3.10.21/drivers/net/ethernet/ralink/soc_mt7620.c --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/soc_mt7620.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/soc_mt7620.c 2013-12-09 13:26:42.332125203 +0100
@@ -0,0 +1,172 @@ @@ -0,0 +1,172 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -4253,10 +4219,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/soc_mt7620.c
+}; +};
+ +
+MODULE_DEVICE_TABLE(of, of_fe_match); +MODULE_DEVICE_TABLE(of, of_fe_match);
Index: linux-3.10.21/drivers/net/ethernet/ralink/soc_rt2880.c --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/soc_rt2880.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/soc_rt2880.c 2013-12-09 13:26:42.332125203 +0100
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -4309,10 +4273,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/soc_rt2880.c
+}; +};
+ +
+MODULE_DEVICE_TABLE(of, of_fe_match); +MODULE_DEVICE_TABLE(of, of_fe_match);
Index: linux-3.10.21/drivers/net/ethernet/ralink/soc_rt305x.c --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/soc_rt305x.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/soc_rt305x.c 2013-12-09 13:26:42.332125203 +0100
@@ -0,0 +1,113 @@ @@ -0,0 +1,113 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -4427,10 +4389,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/soc_rt305x.c
+}; +};
+ +
+MODULE_DEVICE_TABLE(of, of_fe_match); +MODULE_DEVICE_TABLE(of, of_fe_match);
Index: linux-3.10.21/drivers/net/ethernet/ralink/soc_rt3883.c --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/soc_rt3883.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/soc_rt3883.c 2013-12-09 13:26:42.332125203 +0100
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -4492,10 +4452,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/soc_rt3883.c
+ +
+MODULE_DEVICE_TABLE(of, of_fe_match); +MODULE_DEVICE_TABLE(of, of_fe_match);
+ +
Index: linux-3.10.21/drivers/net/ethernet/ralink/mt7530.c --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/mt7530.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/mt7530.c 2013-12-09 13:26:42.336125203 +0100
@@ -0,0 +1,467 @@ @@ -0,0 +1,467 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or + * This program is free software; you can redistribute it and/or
@ -4964,10 +4922,8 @@ Index: linux-3.10.21/drivers/net/ethernet/ralink/mt7530.c
+ +
+ return 0; + return 0;
+} +}
Index: linux-3.10.21/drivers/net/ethernet/ralink/mt7530.h --- /dev/null
=================================================================== +++ b/drivers/net/ethernet/ralink/mt7530.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/net/ethernet/ralink/mt7530.h 2013-12-09 13:26:42.336125203 +0100
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or + * This program is free software; you can redistribute it and/or

12
target/linux/ramips/patches-3.10/0206-MTD-add-chunked-read-io-to-m25p80.patch
View File

@ -8,11 +8,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
drivers/mtd/devices/m25p80.c | 127 ++++++++++++++++++++++++++++++++++++++++++ drivers/mtd/devices/m25p80.c | 127 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 127 insertions(+) 1 file changed, 127 insertions(+)
Index: linux-3.10.21/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
=================================================================== +++ b/drivers/mtd/devices/m25p80.c
--- linux-3.10.21.orig/drivers/mtd/devices/m25p80.c 2013-12-09 19:34:40.828651303 +0100 @@ -392,6 +392,57 @@ static int m25p80_read(struct mtd_info *
+++ linux-3.10.21/drivers/mtd/devices/m25p80.c 2013-12-09 19:40:37.636659793 +0100
@@ -392,6 +392,57 @@
return 0; return 0;
} }
@ -70,7 +68,7 @@ Index: linux-3.10.21/drivers/mtd/devices/m25p80.c
/* /*
* Write an address range to the flash chip. Data must be written in * Write an address range to the flash chip. Data must be written in
* FLASH_PAGESIZE chunks. The address range may be any size provided * FLASH_PAGESIZE chunks. The address range may be any size provided
@@ -479,6 +530,76 @@ @@ -479,6 +530,76 @@ static int m25p80_write(struct mtd_info
return 0; return 0;
} }
@ -147,7 +145,7 @@ Index: linux-3.10.21/drivers/mtd/devices/m25p80.c
static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf) size_t *retlen, const u_char *buf)
{ {
@@ -1057,6 +1178,12 @@ @@ -1058,6 +1179,12 @@ static int m25p_probe(struct spi_device
flash->fast_read = true; flash->fast_read = true;
#endif #endif

38
target/linux/ramips/patches-3.10/0300-DMA-add-rt2880-dma-engine.patch
View File

@ -11,11 +11,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
3 files changed, 603 insertions(+) 3 files changed, 603 insertions(+)
create mode 100644 drivers/dma/ralink-gdma.c create mode 100644 drivers/dma/ralink-gdma.c
Index: linux-3.10.18/drivers/dma/Kconfig --- a/drivers/dma/Kconfig
=================================================================== +++ b/drivers/dma/Kconfig
--- linux-3.10.18.orig/drivers/dma/Kconfig 2013-11-04 13:31:29.000000000 +0100 @@ -312,6 +312,12 @@ config MMP_PDMA
+++ linux-3.10.18/drivers/dma/Kconfig 2013-12-04 17:52:32.852756567 +0100
@@ -312,6 +312,12 @@
help help
Support the MMP PDMA engine for PXA and MMP platfrom. Support the MMP PDMA engine for PXA and MMP platfrom.
@ -28,10 +26,8 @@ Index: linux-3.10.18/drivers/dma/Kconfig
config DMA_ENGINE config DMA_ENGINE
bool bool
Index: linux-3.10.18/drivers/dma/ralink-gdma.c --- /dev/null
=================================================================== +++ b/drivers/dma/ralink-gdma.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.18/drivers/dma/ralink-gdma.c 2013-12-05 21:17:22.245128605 +0100
@@ -0,0 +1,577 @@ @@ -0,0 +1,577 @@
+/* +/*
+ * Copyright (C) 2013, Lars-Peter Clausen <lars@metafoo.de> + * Copyright (C) 2013, Lars-Peter Clausen <lars@metafoo.de>
@ -610,11 +606,9 @@ Index: linux-3.10.18/drivers/dma/ralink-gdma.c
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>"); +MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("GDMA4740 DMA driver"); +MODULE_DESCRIPTION("GDMA4740 DMA driver");
+MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPLv2");
Index: linux-3.10.18/drivers/dma/dmaengine.c --- a/drivers/dma/dmaengine.c
=================================================================== +++ b/drivers/dma/dmaengine.c
--- linux-3.10.18.orig/drivers/dma/dmaengine.c 2013-11-04 13:31:29.000000000 +0100 @@ -504,6 +504,32 @@ static struct dma_chan *private_candidat
+++ linux-3.10.18/drivers/dma/dmaengine.c 2013-12-04 17:52:32.856756568 +0100
@@ -504,6 +504,32 @@
} }
/** /**
@ -647,11 +641,9 @@ Index: linux-3.10.18/drivers/dma/dmaengine.c
* dma_request_channel - try to allocate an exclusive channel * dma_request_channel - try to allocate an exclusive channel
* @mask: capabilities that the channel must satisfy * @mask: capabilities that the channel must satisfy
* @fn: optional callback to disposition available channels * @fn: optional callback to disposition available channels
Index: linux-3.10.18/include/linux/dmaengine.h --- a/include/linux/dmaengine.h
=================================================================== +++ b/include/linux/dmaengine.h
--- linux-3.10.18.orig/include/linux/dmaengine.h 2013-11-04 13:31:29.000000000 +0100 @@ -999,6 +999,7 @@ static inline void dma_release_channel(s
+++ linux-3.10.18/include/linux/dmaengine.h 2013-12-04 17:52:32.856756568 +0100
@@ -999,6 +999,7 @@
int dma_async_device_register(struct dma_device *device); int dma_async_device_register(struct dma_device *device);
void dma_async_device_unregister(struct dma_device *device); void dma_async_device_unregister(struct dma_device *device);
void dma_run_dependencies(struct dma_async_tx_descriptor *tx); void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
@ -659,11 +651,9 @@ Index: linux-3.10.18/include/linux/dmaengine.h
struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type); struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);
struct dma_chan *net_dma_find_channel(void); struct dma_chan *net_dma_find_channel(void);
#define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
Index: linux-3.10.18/drivers/dma/Makefile --- a/drivers/dma/Makefile
=================================================================== +++ b/drivers/dma/Makefile
--- linux-3.10.18.orig/drivers/dma/Makefile 2013-11-04 13:31:29.000000000 +0100 @@ -38,3 +38,4 @@ obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o
+++ linux-3.10.18/drivers/dma/Makefile 2013-12-04 17:52:32.856756568 +0100
@@ -38,3 +38,4 @@
obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o
obj-$(CONFIG_DMA_OMAP) += omap-dma.o obj-$(CONFIG_DMA_OMAP) += omap-dma.o
obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o

54
target/linux/ramips/patches-3.10/0301-asoc-add-mt7620-support.patch
View File

@ -19,11 +19,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
create mode 100644 sound/soc/ralink/mt7620-pcm.c create mode 100644 sound/soc/ralink/mt7620-pcm.c
create mode 100644 sound/soc/ralink/mt7620-wm8960.c create mode 100644 sound/soc/ralink/mt7620-wm8960.c
Index: linux-3.10.18/sound/soc/Kconfig --- a/sound/soc/Kconfig
=================================================================== +++ b/sound/soc/Kconfig
--- linux-3.10.18.orig/sound/soc/Kconfig 2013-11-04 13:31:29.000000000 +0100 @@ -48,6 +48,7 @@ source "sound/soc/kirkwood/Kconfig"
+++ linux-3.10.18/sound/soc/Kconfig 2013-12-04 17:52:32.884756569 +0100
@@ -48,6 +48,7 @@
source "sound/soc/mid-x86/Kconfig" source "sound/soc/mid-x86/Kconfig"
source "sound/soc/mxs/Kconfig" source "sound/soc/mxs/Kconfig"
source "sound/soc/pxa/Kconfig" source "sound/soc/pxa/Kconfig"
@ -31,11 +29,9 @@ Index: linux-3.10.18/sound/soc/Kconfig
source "sound/soc/samsung/Kconfig" source "sound/soc/samsung/Kconfig"
source "sound/soc/s6000/Kconfig" source "sound/soc/s6000/Kconfig"
source "sound/soc/sh/Kconfig" source "sound/soc/sh/Kconfig"
Index: linux-3.10.18/sound/soc/Makefile --- a/sound/soc/Makefile
=================================================================== +++ b/sound/soc/Makefile
--- linux-3.10.18.orig/sound/soc/Makefile 2013-11-04 13:31:29.000000000 +0100 @@ -26,6 +26,7 @@ obj-$(CONFIG_SND_SOC) += nuc900/
+++ linux-3.10.18/sound/soc/Makefile 2013-12-04 17:52:32.884756569 +0100
@@ -26,6 +26,7 @@
obj-$(CONFIG_SND_SOC) += omap/ obj-$(CONFIG_SND_SOC) += omap/
obj-$(CONFIG_SND_SOC) += kirkwood/ obj-$(CONFIG_SND_SOC) += kirkwood/
obj-$(CONFIG_SND_SOC) += pxa/ obj-$(CONFIG_SND_SOC) += pxa/
@ -43,10 +39,8 @@ Index: linux-3.10.18/sound/soc/Makefile
obj-$(CONFIG_SND_SOC) += samsung/ obj-$(CONFIG_SND_SOC) += samsung/
obj-$(CONFIG_SND_SOC) += s6000/ obj-$(CONFIG_SND_SOC) += s6000/
obj-$(CONFIG_SND_SOC) += sh/ obj-$(CONFIG_SND_SOC) += sh/
Index: linux-3.10.18/sound/soc/ralink/Kconfig --- /dev/null
=================================================================== +++ b/sound/soc/ralink/Kconfig
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.18/sound/soc/ralink/Kconfig 2013-12-04 17:52:32.884756569 +0100
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+config SND_MT7620_SOC_I2S +config SND_MT7620_SOC_I2S
+ depends on SOC_MT7620 && SND_SOC + depends on SOC_MT7620 && SND_SOC
@ -63,10 +57,8 @@ Index: linux-3.10.18/sound/soc/ralink/Kconfig
+ help + help
+ Say Y if you want to add support for ASoC audio on the Qi LB60 board + Say Y if you want to add support for ASoC audio on the Qi LB60 board
+ a.k.a Qi Ben NanoNote. + a.k.a Qi Ben NanoNote.
Index: linux-3.10.18/sound/soc/ralink/Makefile --- /dev/null
=================================================================== +++ b/sound/soc/ralink/Makefile
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.18/sound/soc/ralink/Makefile 2013-12-04 17:52:32.884756569 +0100
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+# +#
+# Jz4740 Platform Support +# Jz4740 Platform Support
@ -79,10 +71,8 @@ Index: linux-3.10.18/sound/soc/ralink/Makefile
+snd-soc-mt7620-wm8960-objs := mt7620-wm8960.o +snd-soc-mt7620-wm8960-objs := mt7620-wm8960.o
+ +
+obj-$(CONFIG_SND_MT7620_SOC_WM8960) += snd-soc-mt7620-wm8960.o +obj-$(CONFIG_SND_MT7620_SOC_WM8960) += snd-soc-mt7620-wm8960.o
Index: linux-3.10.18/sound/soc/ralink/mt7620-i2s.c --- /dev/null
=================================================================== +++ b/sound/soc/ralink/mt7620-i2s.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.18/sound/soc/ralink/mt7620-i2s.c 2013-12-05 21:18:46.913130624 +0100
@@ -0,0 +1,466 @@ @@ -0,0 +1,466 @@
+/* +/*
+ * Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de> + * Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
@ -550,10 +540,8 @@ Index: linux-3.10.18/sound/soc/ralink/mt7620-i2s.c
+MODULE_DESCRIPTION("Ingenic JZ4740 SoC I2S driver"); +MODULE_DESCRIPTION("Ingenic JZ4740 SoC I2S driver");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mt7620-i2s"); +MODULE_ALIAS("platform:mt7620-i2s");
Index: linux-3.10.18/sound/soc/ralink/mt7620-wm8960.c --- /dev/null
=================================================================== +++ b/sound/soc/ralink/mt7620-wm8960.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.18/sound/soc/ralink/mt7620-wm8960.c 2013-12-04 17:52:32.884756569 +0100
@@ -0,0 +1,125 @@ @@ -0,0 +1,125 @@
+/* +/*
+ * Copyright (C) 2009, Lars-Peter Clausen <lars@metafoo.de> + * Copyright (C) 2009, Lars-Peter Clausen <lars@metafoo.de>
@ -680,10 +668,8 @@ Index: linux-3.10.18/sound/soc/ralink/mt7620-wm8960.c
+MODULE_DESCRIPTION("ALSA SoC QI LB60 Audio support"); +MODULE_DESCRIPTION("ALSA SoC QI LB60 Audio support");
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:qi-lb60-audio"); +MODULE_ALIAS("platform:qi-lb60-audio");
Index: linux-3.10.18/arch/mips/ralink/of.c --- a/arch/mips/ralink/of.c
=================================================================== +++ b/arch/mips/ralink/of.c
--- linux-3.10.18.orig/arch/mips/ralink/of.c 2013-12-04 17:52:32.736756565 +0100
+++ linux-3.10.18/arch/mips/ralink/of.c 2013-12-04 17:52:32.884756569 +0100
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -700,10 +686,8 @@ Index: linux-3.10.18/arch/mips/ralink/of.c
__iomem void *rt_memc_membase; __iomem void *rt_memc_membase;
extern struct boot_param_header __dtb_start; extern struct boot_param_header __dtb_start;
Index: linux-3.10.18/sound/soc/soc-io.c --- a/sound/soc/soc-io.c
=================================================================== +++ b/sound/soc/soc-io.c
--- linux-3.10.18.orig/sound/soc/soc-io.c 2013-11-04 13:31:29.000000000 +0100
+++ linux-3.10.18/sound/soc/soc-io.c 2013-12-04 17:52:32.888756569 +0100
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
#include <trace/events/asoc.h> #include <trace/events/asoc.h>
@ -712,7 +696,7 @@ Index: linux-3.10.18/sound/soc/soc-io.c
static int hw_write(struct snd_soc_codec *codec, unsigned int reg, static int hw_write(struct snd_soc_codec *codec, unsigned int reg,
unsigned int value) unsigned int value)
{ {
@@ -161,12 +160,3 @@ @@ -161,12 +160,3 @@ int snd_soc_codec_set_cache_io(struct sn
return PTR_RET(codec->control_data); return PTR_RET(codec->control_data);
} }
EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io); EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);

28
target/linux/ramips/patches-3.10/0500-spi-mt7621.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.10.21/drivers/spi/spi-rt2880.c --- a/drivers/spi/spi-rt2880.c
=================================================================== +++ b/drivers/spi/spi-rt2880.c
--- linux-3.10.21.orig/drivers/spi/spi-rt2880.c 2013-12-09 20:17:54.380713104 +0100
+++ linux-3.10.21/drivers/spi/spi-rt2880.c 2013-12-09 20:35:08.004737585 +0100
@@ -21,8 +21,11 @@ @@ -21,8 +21,11 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/reset.h> #include <linux/reset.h>
@ -40,7 +38,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
struct rt2880_spi { struct rt2880_spi {
struct spi_master *master; struct spi_master *master;
void __iomem *base; void __iomem *base;
@@ -70,6 +92,8 @@ @@ -70,6 +92,8 @@ struct rt2880_spi {
unsigned int speed; unsigned int speed;
struct clk *clk; struct clk *clk;
spinlock_t lock; spinlock_t lock;
@ -49,7 +47,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
}; };
static inline struct rt2880_spi *spidev_to_rt2880_spi(struct spi_device *spi) static inline struct rt2880_spi *spidev_to_rt2880_spi(struct spi_device *spi)
@@ -149,6 +173,17 @@ @@ -149,6 +173,17 @@ static int rt2880_spi_baudrate_set(struc
return 0; return 0;
} }
@ -67,7 +65,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
/* /*
* called only when no transfer is active on the bus * called only when no transfer is active on the bus
*/ */
@@ -164,7 +199,7 @@ @@ -164,7 +199,7 @@ rt2880_spi_setup_transfer(struct spi_dev
if (rs->speed != speed) { if (rs->speed != speed) {
dev_dbg(&spi->dev, "speed_hz:%u\n", speed); dev_dbg(&spi->dev, "speed_hz:%u\n", speed);
@ -76,7 +74,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
if (rc) if (rc)
return rc; return rc;
} }
@@ -180,6 +215,17 @@ @@ -180,6 +215,17 @@ static void rt2880_spi_set_cs(struct rt2
rt2880_spi_setbits(rs, RAMIPS_SPI_CTL, SPICTL_SPIENA); rt2880_spi_setbits(rs, RAMIPS_SPI_CTL, SPICTL_SPIENA);
} }
@ -94,7 +92,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
static inline int rt2880_spi_wait_till_ready(struct rt2880_spi *rs) static inline int rt2880_spi_wait_till_ready(struct rt2880_spi *rs)
{ {
int i; int i;
@@ -198,8 +244,26 @@ @@ -198,8 +244,26 @@ static inline int rt2880_spi_wait_till_r
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -122,7 +120,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
{ {
struct rt2880_spi *rs = spidev_to_rt2880_spi(spi); struct rt2880_spi *rs = spidev_to_rt2880_spi(spi);
unsigned count = 0; unsigned count = 0;
@@ -239,6 +303,100 @@ @@ -239,6 +303,100 @@ out:
return count; return count;
} }
@ -223,7 +221,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
static int rt2880_spi_transfer_one_message(struct spi_master *master, static int rt2880_spi_transfer_one_message(struct spi_master *master,
struct spi_message *m) struct spi_message *m)
{ {
@@ -280,25 +438,25 @@ @@ -280,25 +438,25 @@ static int rt2880_spi_transfer_one_messa
} }
if (!cs_active) { if (!cs_active) {
@ -253,7 +251,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
m->status = status; m->status = status;
spi_finalize_current_message(master); spi_finalize_current_message(master);
@@ -334,8 +492,41 @@ @@ -334,8 +492,41 @@ static void rt2880_spi_reset(struct rt28
rt2880_spi_write(rs, RAMIPS_SPI_CTL, SPICTL_HIZSDO | SPICTL_SPIENA); rt2880_spi_write(rs, RAMIPS_SPI_CTL, SPICTL_HIZSDO | SPICTL_SPIENA);
} }
@ -295,7 +293,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
struct spi_master *master; struct spi_master *master;
struct rt2880_spi *rs; struct rt2880_spi *rs;
unsigned long flags; unsigned long flags;
@@ -344,6 +535,10 @@ @@ -344,6 +535,10 @@ static int rt2880_spi_probe(struct platf
int status = 0; int status = 0;
struct clk *clk; struct clk *clk;
@ -306,7 +304,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
r = platform_get_resource(pdev, IORESOURCE_MEM, 0); r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&pdev->dev, r); base = devm_ioremap_resource(&pdev->dev, r);
if (IS_ERR(base)) if (IS_ERR(base))
@@ -382,12 +577,13 @@ @@ -382,12 +577,13 @@ static int rt2880_spi_probe(struct platf
rs->clk = clk; rs->clk = clk;
rs->master = master; rs->master = master;
rs->sys_freq = clk_get_rate(rs->clk); rs->sys_freq = clk_get_rate(rs->clk);
@ -321,7 +319,7 @@ Index: linux-3.10.21/drivers/spi/spi-rt2880.c
return spi_register_master(master); return spi_register_master(master);
} }
@@ -408,12 +604,6 @@ @@ -408,12 +604,6 @@ static int rt2880_spi_remove(struct plat
MODULE_ALIAS("platform:" DRIVER_NAME); MODULE_ALIAS("platform:" DRIVER_NAME);

5
target/linux/ramips/patches-3.10/0501-MIPS-increase-GIC_INTR_MAX.patch
View File

@ -8,8 +8,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/include/asm/gic.h | 2 +- arch/mips/include/asm/gic.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/gic.h b/arch/mips/include/asm/gic.h
index b2e3e93..2902d93 100644
--- a/arch/mips/include/asm/gic.h --- a/arch/mips/include/asm/gic.h
+++ b/arch/mips/include/asm/gic.h +++ b/arch/mips/include/asm/gic.h
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
@ -21,6 +19,3 @@ index b2e3e93..2902d93 100644
#define MSK(n) ((1 << (n)) - 1) #define MSK(n) ((1 << (n)) - 1)
#define REG32(addr) (*(volatile unsigned int *) (addr)) #define REG32(addr) (*(volatile unsigned int *) (addr))
--
1.7.10.4

50
target/linux/ramips/patches-3.10/0502-MIPS-ralink-add-MT7621-support.patch
View File

@ -18,10 +18,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
create mode 100644 arch/mips/ralink/malta-amon.c create mode 100644 arch/mips/ralink/malta-amon.c
create mode 100644 arch/mips/ralink/mt7621.c create mode 100644 arch/mips/ralink/mt7621.c
Index: linux-3.10.21/arch/mips/include/asm/mach-ralink/mt7621.h --- /dev/null
=================================================================== +++ b/arch/mips/include/asm/mach-ralink/mt7621.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/arch/mips/include/asm/mach-ralink/mt7621.h 2013-12-09 19:52:51.752677298 +0100
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it
@ -62,10 +60,8 @@ Index: linux-3.10.21/arch/mips/include/asm/mach-ralink/mt7621.h
+#define MIPS_GIC_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8) +#define MIPS_GIC_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8)
+ +
+#endif +#endif
Index: linux-3.10.21/arch/mips/ralink/Kconfig --- a/arch/mips/ralink/Kconfig
=================================================================== +++ b/arch/mips/ralink/Kconfig
--- linux-3.10.21.orig/arch/mips/ralink/Kconfig 2013-12-09 19:51:55.600675960 +0100
+++ linux-3.10.21/arch/mips/ralink/Kconfig 2013-12-09 19:52:51.756677296 +0100
@@ -1,5 +1,10 @@ @@ -1,5 +1,10 @@
if RALINK if RALINK
@ -77,7 +73,7 @@ Index: linux-3.10.21/arch/mips/ralink/Kconfig
config CLKEVT_RT3352 config CLKEVT_RT3352
bool "Systick Clockevent source" bool "Systick Clockevent source"
depends on SOC_RT305X || SOC_MT7620 depends on SOC_RT305X || SOC_MT7620
@@ -35,6 +40,15 @@ @@ -35,6 +40,15 @@ choice
select USB_ARCH_HAS_EHCI select USB_ARCH_HAS_EHCI
select HW_HAS_PCI select HW_HAS_PCI
@ -93,7 +89,7 @@ Index: linux-3.10.21/arch/mips/ralink/Kconfig
endchoice endchoice
choice choice
@@ -62,6 +76,10 @@ @@ -62,6 +76,10 @@ choice
bool "MT7620A eval kit" bool "MT7620A eval kit"
depends on SOC_MT7620 depends on SOC_MT7620
@ -104,10 +100,8 @@ Index: linux-3.10.21/arch/mips/ralink/Kconfig
endchoice endchoice
endif endif
Index: linux-3.10.21/arch/mips/ralink/Makefile --- a/arch/mips/ralink/Makefile
=================================================================== +++ b/arch/mips/ralink/Makefile
--- linux-3.10.21.orig/arch/mips/ralink/Makefile 2013-12-09 19:51:55.600675960 +0100
+++ linux-3.10.21/arch/mips/ralink/Makefile 2013-12-09 19:52:51.756677296 +0100
@@ -6,7 +6,11 @@ @@ -6,7 +6,11 @@
# Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org> # Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org>
# Copyright (C) 2013 John Crispin <blogic@openwrt.org> # Copyright (C) 2013 John Crispin <blogic@openwrt.org>
@ -121,7 +115,7 @@ Index: linux-3.10.21/arch/mips/ralink/Makefile
obj-$(CONFIG_CLKEVT_RT3352) += cevt-rt3352.o obj-$(CONFIG_CLKEVT_RT3352) += cevt-rt3352.o
@@ -16,6 +20,7 @@ @@ -16,6 +20,7 @@ obj-$(CONFIG_SOC_RT288X) += rt288x.o
obj-$(CONFIG_SOC_RT305X) += rt305x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o
obj-$(CONFIG_SOC_RT3883) += rt3883.o obj-$(CONFIG_SOC_RT3883) += rt3883.o
obj-$(CONFIG_SOC_MT7620) += mt7620.o obj-$(CONFIG_SOC_MT7620) += mt7620.o
@ -129,11 +123,9 @@ Index: linux-3.10.21/arch/mips/ralink/Makefile
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
Index: linux-3.10.21/arch/mips/ralink/Platform --- a/arch/mips/ralink/Platform
=================================================================== +++ b/arch/mips/ralink/Platform
--- linux-3.10.21.orig/arch/mips/ralink/Platform 2013-12-09 19:51:55.000000000 +0100 @@ -26,3 +26,10 @@ cflags-$(CONFIG_SOC_RT3883) += -I$(srctr
+++ linux-3.10.21/arch/mips/ralink/Platform 2013-12-09 19:53:54.660678800 +0100
@@ -26,3 +26,10 @@
# Ralink MT7620 # Ralink MT7620
# #
load-$(CONFIG_SOC_MT7620) += 0xffffffff80000000 load-$(CONFIG_SOC_MT7620) += 0xffffffff80000000
@ -144,10 +136,8 @@ Index: linux-3.10.21/arch/mips/ralink/Platform
+# +#
+load-$(CONFIG_SOC_MT7621) += 0xffffffff80001000 +load-$(CONFIG_SOC_MT7621) += 0xffffffff80001000
+cflags-$(CONFIG_SOC_MT7620) += -I$(srctree)/arch/mips/include/asm/mach-ralink/mt7621 +cflags-$(CONFIG_SOC_MT7620) += -I$(srctree)/arch/mips/include/asm/mach-ralink/mt7621
Index: linux-3.10.21/arch/mips/ralink/irq-gic.c --- /dev/null
=================================================================== +++ b/arch/mips/ralink/irq-gic.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/arch/mips/ralink/irq-gic.c 2013-12-09 19:52:51.756677296 +0100
@@ -0,0 +1,255 @@ @@ -0,0 +1,255 @@
+#include <linux/init.h> +#include <linux/init.h>
+#include <linux/sched.h> +#include <linux/sched.h>
@ -404,10 +394,8 @@ Index: linux-3.10.21/arch/mips/ralink/irq-gic.c
+{ +{
+ of_irq_init(of_irq_ids); + of_irq_init(of_irq_ids);
+} +}
Index: linux-3.10.21/arch/mips/ralink/malta-amon.c --- /dev/null
=================================================================== +++ b/arch/mips/ralink/malta-amon.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/arch/mips/ralink/malta-amon.c 2013-12-09 19:52:51.756677296 +0100
@@ -0,0 +1,81 @@ @@ -0,0 +1,81 @@
+/* +/*
+ * Copyright (C) 2007 MIPS Technologies, Inc. + * Copyright (C) 2007 MIPS Technologies, Inc.
@ -490,10 +478,8 @@ Index: linux-3.10.21/arch/mips/ralink/malta-amon.c
+ smp_rmb(); /* Target will be updating flags soon */ + smp_rmb(); /* Target will be updating flags soon */
+ pr_debug("launch: cpu%d gone!\n", cpu); + pr_debug("launch: cpu%d gone!\n", cpu);
+} +}
Index: linux-3.10.21/arch/mips/ralink/mt7621.c --- /dev/null
=================================================================== +++ b/arch/mips/ralink/mt7621.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/arch/mips/ralink/mt7621.c 2013-12-09 19:52:51.760677296 +0100
@@ -0,0 +1,186 @@ @@ -0,0 +1,186 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it

8
target/linux/ramips/patches-3.10/0503-MIPS-ralink-add-MT7621-early_printk-support.patch
View File

@ -8,10 +8,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/ralink/early_printk.c | 10 +++++++--- arch/mips/ralink/early_printk.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-) 1 file changed, 7 insertions(+), 3 deletions(-)
Index: linux-3.10.21/arch/mips/ralink/early_printk.c --- a/arch/mips/ralink/early_printk.c
=================================================================== +++ b/arch/mips/ralink/early_printk.c
--- linux-3.10.21.orig/arch/mips/ralink/early_printk.c 2013-11-29 20:12:03.000000000 +0100
+++ linux-3.10.21/arch/mips/ralink/early_printk.c 2013-12-09 20:11:51.600704498 +0100
@@ -13,6 +13,8 @@ @@ -13,6 +13,8 @@
#ifdef CONFIG_SOC_RT288X #ifdef CONFIG_SOC_RT288X
@ -21,7 +19,7 @@ Index: linux-3.10.21/arch/mips/ralink/early_printk.c
#else #else
#define EARLY_UART_BASE 0x10000c00 #define EARLY_UART_BASE 0x10000c00
#endif #endif
@@ -40,9 +42,13 @@ @@ -40,9 +42,13 @@ static inline u32 uart_r32(unsigned reg)
void prom_putchar(unsigned char ch) void prom_putchar(unsigned char ch)
{ {

14
target/linux/ramips/patches-3.10/0504-MIPS-ralink-add-pcie-driver.patch
View File

@ -10,21 +10,16 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
2 files changed, 798 insertions(+) 2 files changed, 798 insertions(+)
create mode 100644 arch/mips/pci/pci-mt7621.c create mode 100644 arch/mips/pci/pci-mt7621.c
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 719e455..80886fe 100644
--- a/arch/mips/pci/Makefile --- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o @@ -44,6 +44,7 @@ obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o
obj-$(CONFIG_LANTIQ) += fixup-lantiq.o obj-$(CONFIG_SOC_MT7620) += pci-mt7620a.o
obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o obj-$(CONFIG_SOC_RT2880) += pci-rt2880.o
obj-$(CONFIG_SOC_RT3883) += pci-rt3883.o obj-$(CONFIG_SOC_RT3883) += pci-rt3883.o
+obj-$(CONFIG_SOC_MT7621) += pci-mt7621.o +obj-$(CONFIG_SOC_MT7621) += pci-mt7621.o
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
diff --git a/arch/mips/pci/pci-mt7621.c b/arch/mips/pci/pci-mt7621.c
new file mode 100644
index 0000000..0b58fce
--- /dev/null --- /dev/null
+++ b/arch/mips/pci/pci-mt7621.c +++ b/arch/mips/pci/pci-mt7621.c
@@ -0,0 +1,797 @@ @@ -0,0 +1,797 @@
@ -825,6 +820,3 @@ index 0000000..0b58fce
+{ +{
+ return 0; + return 0;
+} +}
--
1.7.10.4

22
target/linux/ramips/patches-3.10/0505-watchdog-add-MT7621-support.patch
View File

@ -11,11 +11,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
3 files changed, 193 insertions(+) 3 files changed, 193 insertions(+)
create mode 100644 drivers/watchdog/mt7621_wdt.c create mode 100644 drivers/watchdog/mt7621_wdt.c
Index: linux-3.10.21/drivers/watchdog/Kconfig --- a/drivers/watchdog/Kconfig
=================================================================== +++ b/drivers/watchdog/Kconfig
--- linux-3.10.21.orig/drivers/watchdog/Kconfig 2013-12-09 19:56:09.360682007 +0100 @@ -1116,7 +1116,14 @@ config LANTIQ_WDT
+++ linux-3.10.21/drivers/watchdog/Kconfig 2013-12-09 19:59:20.636686594 +0100
@@ -1116,7 +1116,14 @@
config RALINK_WDT config RALINK_WDT
tristate "Ralink SoC watchdog" tristate "Ralink SoC watchdog"
select WATCHDOG_CORE select WATCHDOG_CORE
@ -31,11 +29,9 @@ Index: linux-3.10.21/drivers/watchdog/Kconfig
help help
Hardware driver for the Ralink SoC Watchdog Timer. Hardware driver for the Ralink SoC Watchdog Timer.
Index: linux-3.10.21/drivers/watchdog/Makefile --- a/drivers/watchdog/Makefile
=================================================================== +++ b/drivers/watchdog/Makefile
--- linux-3.10.21.orig/drivers/watchdog/Makefile 2013-12-09 19:56:09.360682007 +0100 @@ -136,6 +136,7 @@ obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
+++ linux-3.10.21/drivers/watchdog/Makefile 2013-12-09 19:56:09.752682016 +0100
@@ -136,6 +136,7 @@
octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o
obj-$(CONFIG_RALINK_WDT) += rt2880_wdt.o obj-$(CONFIG_RALINK_WDT) += rt2880_wdt.o
@ -43,10 +39,8 @@ Index: linux-3.10.21/drivers/watchdog/Makefile
# PARISC Architecture # PARISC Architecture
Index: linux-3.10.21/drivers/watchdog/mt7621_wdt.c --- /dev/null
=================================================================== +++ b/drivers/watchdog/mt7621_wdt.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/watchdog/mt7621_wdt.c 2013-12-09 19:56:09.752682016 +0100
@@ -0,0 +1,185 @@ @@ -0,0 +1,185 @@
+/* +/*
+ * Ralink RT288x/RT3xxx/MT76xx built-in hardware watchdog timer + * Ralink RT288x/RT3xxx/MT76xx built-in hardware watchdog timer

22
target/linux/ramips/patches-3.10/0506-GPIO-ralink-add-mt7621-gpio-controller.patch
View File

@ -12,11 +12,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
4 files changed, 191 insertions(+) 4 files changed, 191 insertions(+)
create mode 100644 drivers/gpio/gpio-mt7621.c create mode 100644 drivers/gpio/gpio-mt7621.c
Index: linux-3.10.21/drivers/gpio/Kconfig --- a/drivers/gpio/Kconfig
=================================================================== +++ b/drivers/gpio/Kconfig
--- linux-3.10.21.orig/drivers/gpio/Kconfig 2013-12-09 19:56:09.376682007 +0100 @@ -710,6 +710,12 @@ config GPIO_MSIC
+++ linux-3.10.21/drivers/gpio/Kconfig 2013-12-09 19:58:35.372685422 +0100
@@ -710,6 +710,12 @@
Enable support for GPIO on intel MSIC controllers found in Enable support for GPIO on intel MSIC controllers found in
intel MID devices intel MID devices
@ -29,19 +27,15 @@ Index: linux-3.10.21/drivers/gpio/Kconfig
comment "USB GPIO expanders:" comment "USB GPIO expanders:"
config GPIO_VIPERBOARD config GPIO_VIPERBOARD
Index: linux-3.10.21/drivers/gpio/Makefile --- a/drivers/gpio/Makefile
=================================================================== +++ b/drivers/gpio/Makefile
--- linux-3.10.21.orig/drivers/gpio/Makefile 2013-12-09 19:56:09.376682007 +0100 @@ -88,3 +88,4 @@ obj-$(CONFIG_GPIO_WM831X) += gpio-wm831x
+++ linux-3.10.21/drivers/gpio/Makefile 2013-12-09 19:56:09.760682017 +0100
@@ -88,3 +88,4 @@
obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350.o obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350.o
obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o
obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o
+obj-$(CONFIG_GPIO_MT7621) += gpio-mt7621.o +obj-$(CONFIG_GPIO_MT7621) += gpio-mt7621.o
Index: linux-3.10.21/drivers/gpio/gpio-mt7621.c --- /dev/null
=================================================================== +++ b/drivers/gpio/gpio-mt7621.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10.21/drivers/gpio/gpio-mt7621.c 2013-12-09 19:56:09.760682017 +0100
@@ -0,0 +1,183 @@ @@ -0,0 +1,183 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it

53
target/linux/ramips/patches-3.10/0507-MTD-add-mt7621-nand-support.patch
View File

@ -29,11 +29,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
create mode 100644 drivers/mtd/nand/nand_device_list.h create mode 100644 drivers/mtd/nand/nand_device_list.h
create mode 100644 drivers/mtd/nand/partition.h create mode 100644 drivers/mtd/nand/partition.h
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index d885298..51ba744 100644
--- a/drivers/mtd/nand/Kconfig --- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig
@@ -538,4 +538,10 @@ config MTD_NAND_XWAY @@ -544,4 +544,10 @@ config MTD_NAND_XWAY
Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached
to the External Bus Unit (EBU). to the External Bus Unit (EBU).
@ -44,20 +42,15 @@ index d885298..51ba744 100644
+ select MTD_NAND_ECC + select MTD_NAND_ECC
+ +
endif # MTD_NAND endif # MTD_NAND
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 542b568..c68c96c 100644
--- a/drivers/mtd/nand/Makefile --- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile
@@ -49,5 +49,6 @@ obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o @@ -50,5 +50,6 @@ obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740
obj-$(CONFIG_MTD_NAND_GPMI_NAND) += gpmi-nand/ obj-$(CONFIG_MTD_NAND_GPMI_NAND) += gpmi-nand/
obj-$(CONFIG_MTD_NAND_XWAY) += xway_nand.o obj-$(CONFIG_MTD_NAND_XWAY) += xway_nand.o
obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash/ obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash/
+obj-$(CONFIG_MTK_MTD_NAND) += mtk_nand.o bmt.o +obj-$(CONFIG_MTK_MTD_NAND) += mtk_nand.o bmt.o
nand-objs := nand_base.o nand_bbt.o nand-objs := nand_base.o nand_bbt.o
diff --git a/drivers/mtd/nand/bmt.c b/drivers/mtd/nand/bmt.c
new file mode 100644
index 0000000..0462871
--- /dev/null --- /dev/null
+++ b/drivers/mtd/nand/bmt.c +++ b/drivers/mtd/nand/bmt.c
@@ -0,0 +1,750 @@ @@ -0,0 +1,750 @@
@ -811,9 +804,6 @@ index 0000000..0462871
+MODULE_AUTHOR("MediaTek"); +MODULE_AUTHOR("MediaTek");
+MODULE_DESCRIPTION("Bad Block mapping management for MediaTek NAND Flash Driver"); +MODULE_DESCRIPTION("Bad Block mapping management for MediaTek NAND Flash Driver");
+#endif +#endif
diff --git a/drivers/mtd/nand/bmt.h b/drivers/mtd/nand/bmt.h
new file mode 100644
index 0000000..2d30ea9
--- /dev/null --- /dev/null
+++ b/drivers/mtd/nand/bmt.h +++ b/drivers/mtd/nand/bmt.h
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@
@ -897,9 +887,6 @@ index 0000000..2d30ea9
+unsigned short get_mapping_block_index(int index); +unsigned short get_mapping_block_index(int index);
+ +
+#endif // #ifndef __BMT_H__ +#endif // #ifndef __BMT_H__
diff --git a/drivers/mtd/nand/dev-nand.c b/drivers/mtd/nand/dev-nand.c
new file mode 100644
index 0000000..9fb5235
--- /dev/null --- /dev/null
+++ b/drivers/mtd/nand/dev-nand.c +++ b/drivers/mtd/nand/dev-nand.c
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
@ -966,9 +953,6 @@ index 0000000..9fb5235
+ return retval; + return retval;
+} +}
+arch_initcall(mtk_nand_register); +arch_initcall(mtk_nand_register);
diff --git a/drivers/mtd/nand/mt6575_typedefs.h b/drivers/mtd/nand/mt6575_typedefs.h
new file mode 100644
index 0000000..a7b9647
--- /dev/null --- /dev/null
+++ b/drivers/mtd/nand/mt6575_typedefs.h +++ b/drivers/mtd/nand/mt6575_typedefs.h
@@ -0,0 +1,340 @@ @@ -0,0 +1,340 @@
@ -1312,9 +1296,6 @@ index 0000000..a7b9647
+ +
+#endif // _MT6575_TYPEDEFS_H +#endif // _MT6575_TYPEDEFS_H
+ +
diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
new file mode 100644
index 0000000..00e150c
--- /dev/null --- /dev/null
+++ b/drivers/mtd/nand/mtk_nand.c +++ b/drivers/mtd/nand/mtk_nand.c
@@ -0,0 +1,2304 @@ @@ -0,0 +1,2304 @@
@ -3622,9 +3603,6 @@ index 0000000..00e150c
+module_init(mtk_nand_init); +module_init(mtk_nand_init);
+module_exit(mtk_nand_exit); +module_exit(mtk_nand_exit);
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/nand/mtk_nand.h b/drivers/mtd/nand/mtk_nand.h
new file mode 100644
index 0000000..6db88c4
--- /dev/null --- /dev/null
+++ b/drivers/mtd/nand/mtk_nand.h +++ b/drivers/mtd/nand/mtk_nand.h
@@ -0,0 +1,452 @@ @@ -0,0 +1,452 @@
@ -4080,11 +4058,9 @@ index 0000000..6db88c4
+extern u32 CFG_BLOCKSIZE; +extern u32 CFG_BLOCKSIZE;
+#endif +#endif
+#endif +#endif
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index d340b2f..d83655f 100644
--- a/drivers/mtd/nand/nand_base.c --- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c
@@ -90,7 +90,7 @@ static struct nand_ecclayout nand_oob_128 = { @@ -90,7 +90,7 @@ static struct nand_ecclayout nand_oob_12
.length = 78} } .length = 78} }
}; };
@ -4093,7 +4069,7 @@ index d340b2f..d83655f 100644
static int nand_do_write_oob(struct mtd_info *mtd, loff_t to, static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
struct mtd_oob_ops *ops); struct mtd_oob_ops *ops);
@@ -128,7 +128,7 @@ static int check_offs_len(struct mtd_info *mtd, @@ -128,7 +128,7 @@ static int check_offs_len(struct mtd_inf
* *
* Release chip lock and wake up anyone waiting on the device. * Release chip lock and wake up anyone waiting on the device.
*/ */
@ -4102,7 +4078,7 @@ index d340b2f..d83655f 100644
{ {
struct nand_chip *chip = mtd->priv; struct nand_chip *chip = mtd->priv;
@@ -736,7 +736,7 @@ static void panic_nand_get_device(struct nand_chip *chip, @@ -739,7 +739,7 @@ static void panic_nand_get_device(struct
* *
* Get the device and lock it for exclusive access * Get the device and lock it for exclusive access
*/ */
@ -4111,12 +4087,10 @@ index d340b2f..d83655f 100644
nand_get_device(struct mtd_info *mtd, int new_state) nand_get_device(struct mtd_info *mtd, int new_state)
{ {
struct nand_chip *chip = mtd->priv; struct nand_chip *chip = mtd->priv;
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index bc06196..da93baf 100644
--- a/drivers/mtd/nand/nand_bbt.c --- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c
@@ -1391,5 +1391,24 @@ int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs) @@ -1378,6 +1378,25 @@ int nand_isbad_bbt(struct mtd_info *mtd,
return ret; return 1;
} }
+void nand_bbt_set(struct mtd_info *mtd, int page, int flag) +void nand_bbt_set(struct mtd_info *mtd, int page, int flag)
@ -4140,9 +4114,7 @@ index bc06196..da93baf 100644
+ +
EXPORT_SYMBOL(nand_scan_bbt); EXPORT_SYMBOL(nand_scan_bbt);
EXPORT_SYMBOL(nand_default_bbt); EXPORT_SYMBOL(nand_default_bbt);
diff --git a/drivers/mtd/nand/nand_def.h b/drivers/mtd/nand/nand_def.h EXPORT_SYMBOL_GPL(nand_update_bbt);
new file mode 100644
index 0000000..82e957d
--- /dev/null --- /dev/null
+++ b/drivers/mtd/nand/nand_def.h +++ b/drivers/mtd/nand/nand_def.h
@@ -0,0 +1,123 @@ @@ -0,0 +1,123 @@
@ -4269,9 +4241,6 @@ index 0000000..82e957d
+#include "mt6575_typedefs.h" +#include "mt6575_typedefs.h"
+ +
+#endif /* __NAND_DEF_H__ */ +#endif /* __NAND_DEF_H__ */
diff --git a/drivers/mtd/nand/nand_device_list.h b/drivers/mtd/nand/nand_device_list.h
new file mode 100644
index 0000000..4c36b3a
--- /dev/null --- /dev/null
+++ b/drivers/mtd/nand/nand_device_list.h +++ b/drivers/mtd/nand/nand_device_list.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
@ -4330,9 +4299,6 @@ index 0000000..4c36b3a
+ +
+ +
+#endif +#endif
diff --git a/drivers/mtd/nand/partition.h b/drivers/mtd/nand/partition.h
new file mode 100644
index 0000000..034e1af
--- /dev/null --- /dev/null
+++ b/drivers/mtd/nand/partition.h +++ b/drivers/mtd/nand/partition.h
@@ -0,0 +1,115 @@ @@ -0,0 +1,115 @@
@ -4451,6 +4417,3 @@ index 0000000..034e1af
+//#endif +//#endif
+#undef RECONFIG_PARTITION_SIZE +#undef RECONFIG_PARTITION_SIZE
+ +
--
1.7.10.4

6
target/linux/ramips/patches-3.10/800-eco.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.10.18/arch/mips/include/asm/mach-ralink/mt7620.h --- a/arch/mips/include/asm/mach-ralink/mt7620.h
=================================================================== +++ b/arch/mips/include/asm/mach-ralink/mt7620.h
--- linux-3.10.18.orig/arch/mips/include/asm/mach-ralink/mt7620.h 2013-12-06 16:20:27.753388970 +0100
+++ linux-3.10.18/arch/mips/include/asm/mach-ralink/mt7620.h 2013-12-06 16:21:14.021390074 +0100
@@ -101,4 +101,9 @@ @@ -101,4 +101,9 @@
#define MT7620_GPIO_MODE_EPHY 15 #define MT7620_GPIO_MODE_EPHY 15
#define MT7620_GPIO_MODE_PA 20 #define MT7620_GPIO_MODE_PA 20

8
target/linux/ramips/patches-3.10/999-raeth_fixes.patch
View File

@ -1,8 +1,6 @@
Index: linux-3.10.24/drivers/net/ethernet/ralink/ralink_soc_eth.c --- a/drivers/net/ethernet/ralink/ralink_soc_eth.c
=================================================================== +++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c
--- linux-3.10.24.orig/drivers/net/ethernet/ralink/ralink_soc_eth.c 2013-12-27 20:32:59.004068866 +0100 @@ -335,7 +335,7 @@ static int fe_start_xmit(struct sk_buff
+++ linux-3.10.24/drivers/net/ethernet/ralink/ralink_soc_eth.c 2013-12-27 21:16:44.892046631 +0100
@@ -335,7 +335,7 @@
if (priv->soc->tso) if (priv->soc->tso)
fe_start_tso(skb, dev, nr_frags, tx); fe_start_tso(skb, dev, nr_frags, tx);

2
target/linux/rb532/Makefile
View File

@ -11,7 +11,7 @@ BOARD:=rb532
BOARDNAME:=Mikrotik RouterBoard 532 BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=pci targz broken FEATURES:=pci targz broken
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532 DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532

2
target/linux/realview/Makefile
View File

@ -14,7 +14,7 @@ CPU_TYPE:=mpcore
CPU_SUBTYPE:=vfp CPU_SUBTYPE:=vfp
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
DEVICE_TYPE:=developerboard DEVICE_TYPE:=developerboard

2
target/linux/sparc/Makefile
View File

@ -11,7 +11,7 @@ BOARD:=sparc
BOARDNAME:=Sun UltraSPARC BOARDNAME:=Sun UltraSPARC
FEATURES+=fpu tgz ext4 squashfs broken FEATURES+=fpu tgz ext4 squashfs broken
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/x86/alix2/target.mk
View File

@ -19,7 +19,7 @@ DEFAULT_PACKAGES += \
kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
kmod-ledtrig-netdev \ kmod-ledtrig-netdev \
kmod-cpu-msr hwclock wpad kmod-cpu-msr hwclock wpad
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
CS5535_MASK:=0x0b000042 CS5535_MASK:=0x0b000042
CPU_TYPE := geode CPU_TYPE := geode

2
target/linux/x86/generic/target.mk
View File

@ -1,6 +1,6 @@
BOARDNAME:=Generic BOARDNAME:=Generic
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
define Target/Description define Target/Description
Build firmware images for x86 based boards Build firmware images for x86 based boards

2
target/linux/x86/kvm_guest/target.mk
View File

@ -2,4 +2,4 @@ BOARDNAME:=KVM Guest
FEATURES:=ext4 pci usb FEATURES:=ext4 pci usb
DEFAULT_PACKAGES += kmod-virtio-balloon kmod-virtio-net kmod-virtio-random DEFAULT_PACKAGES += kmod-virtio-balloon kmod-virtio-net kmod-virtio-random
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26

2
target/linux/x86_64/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=x86_64
FEATURES:=ext4 vdi vmdk targz FEATURES:=ext4 vdi vmdk targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
KERNELNAME:=bzImage KERNELNAME:=bzImage

2
target/linux/xburst/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst
FEATURES:=targz ubifs audio FEATURES:=targz ubifs audio
SUBTARGETS:=qi_lb60 n516 n526 id800wt SUBTARGETS:=qi_lb60 n516 n526 id800wt
LINUX_VERSION:=3.10.24 LINUX_VERSION:=3.10.26
DEVICE_TYPE=other DEVICE_TYPE=other

2
target/linux/xburst/patches-3.10/003-NAND-Add-support-for-subpage-reads-for-NAND_ECC_HW_O.patch
View File

@ -106,7 +106,7 @@ Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
else else
ret = chip->ecc.read_page(mtd, chip, bufpoi, ret = chip->ecc.read_page(mtd, chip, bufpoi,
oob_required, page); oob_required, page);
@@ -3477,8 +3546,13 @@ int nand_scan_tail(struct mtd_info *mtd) @@ -3488,8 +3557,13 @@ int nand_scan_tail(struct mtd_info *mtd)
"hardware ECC not possible\n"); "hardware ECC not possible\n");
BUG(); BUG();
} }