mirror of https://github.com/hak5/openwrt.git
kernel: update 3.10 to 3.10.9
Also refresh 3.10 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37832lede-17.01
parent
6f232cba62
commit
043edd8074
|
@ -17,9 +17,6 @@ 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.4)
|
|
||||||
LINUX_KERNEL_MD5SUM:=0378156d0a4ebf155d083531c3cb3826
|
|
||||||
endif
|
|
||||||
ifeq ($(LINUX_VERSION),3.10.9)
|
ifeq ($(LINUX_VERSION),3.10.9)
|
||||||
LINUX_KERNEL_MD5SUM:=28d1e1117c30fdd861f70ac0f9b677aa
|
LINUX_KERNEL_MD5SUM:=28d1e1117c30fdd861f70ac0f9b677aa
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -13,7 +13,7 @@ FEATURES:=squashfs targz mips16
|
||||||
CFLAGS:=-Os -pipe -mips32r2 -mtune=34kc -mno-branch-likely
|
CFLAGS:=-Os -pipe -mips32r2 -mtune=34kc -mno-branch-likely
|
||||||
SUBTARGETS:=generic nand
|
SUBTARGETS:=generic nand
|
||||||
|
|
||||||
LINUX_VERSION:=3.10.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
|
|
@ -83,7 +83,7 @@
|
||||||
for (; info->mtd[i] == NULL && *probe_type != NULL; probe_type++)
|
for (; info->mtd[i] == NULL && *probe_type != NULL; probe_type++)
|
||||||
--- a/include/linux/mtd/physmap.h
|
--- a/include/linux/mtd/physmap.h
|
||||||
+++ b/include/linux/mtd/physmap.h
|
+++ b/include/linux/mtd/physmap.h
|
||||||
@@ -26,6 +26,8 @@ struct physmap_flash_data {
|
@@ -25,6 +25,8 @@ struct physmap_flash_data {
|
||||||
unsigned int width;
|
unsigned int width;
|
||||||
int (*init)(struct platform_device *);
|
int (*init)(struct platform_device *);
|
||||||
void (*exit)(struct platform_device *);
|
void (*exit)(struct platform_device *);
|
||||||
|
|
|
@ -84,7 +84,7 @@
|
||||||
mutex_unlock(&flash->lock);
|
mutex_unlock(&flash->lock);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1021,6 +1044,12 @@ static int m25p_probe(struct spi_device
|
@@ -1017,6 +1040,12 @@ static int m25p_probe(struct spi_device
|
||||||
flash->mtd._unlock = m25p80_unlock;
|
flash->mtd._unlock = m25p80_unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/mtd/devices/m25p80.c
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
+++ b/drivers/mtd/devices/m25p80.c
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
@@ -1121,7 +1121,9 @@ static int m25p_probe(struct spi_device
|
@@ -1117,7 +1117,9 @@ 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).
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/mtd/devices/m25p80.c
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
+++ b/drivers/mtd/devices/m25p80.c
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
@@ -1071,6 +1071,7 @@ static int m25p_probe(struct spi_device
|
@@ -1067,6 +1067,7 @@ static int m25p_probe(struct spi_device
|
||||||
if (info->flags & M25P_NO_ERASE)
|
if (info->flags & M25P_NO_ERASE)
|
||||||
flash->mtd.flags |= MTD_NO_ERASE;
|
flash->mtd.flags |= MTD_NO_ERASE;
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -993,6 +993,9 @@ config MIPS_MSC
|
@@ -998,6 +998,9 @@ config MIPS_MSC
|
||||||
config MIPS_NILE4
|
config MIPS_NILE4
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
Index: linux-3.10.4/arch/mips/ath79/Kconfig
|
--- a/arch/mips/ath79/Kconfig
|
||||||
===================================================================
|
+++ b/arch/mips/ath79/Kconfig
|
||||||
--- linux-3.10.4.orig/arch/mips/ath79/Kconfig 2013-08-04 19:08:12.739921385 +0200
|
@@ -254,6 +254,16 @@ config ATH79_MACH_WPE72
|
||||||
+++ linux-3.10.4/arch/mips/ath79/Kconfig 2013-08-04 19:09:15.379922883 +0200
|
|
||||||
@@ -254,6 +254,16 @@
|
|
||||||
select ATH79_DEV_USB
|
select ATH79_DEV_USB
|
||||||
select MYLOADER
|
select MYLOADER
|
||||||
|
|
||||||
|
@ -19,11 +17,9 @@ Index: linux-3.10.4/arch/mips/ath79/Kconfig
|
||||||
config ATH79_MACH_DIR_600_A1
|
config ATH79_MACH_DIR_600_A1
|
||||||
bool "D-Link DIR-600 A1/DIR-615 E4 support"
|
bool "D-Link DIR-600 A1/DIR-615 E4 support"
|
||||||
select SOC_AR724X
|
select SOC_AR724X
|
||||||
Index: linux-3.10.4/arch/mips/ath79/Makefile
|
--- a/arch/mips/ath79/Makefile
|
||||||
===================================================================
|
+++ b/arch/mips/ath79/Makefile
|
||||||
--- linux-3.10.4.orig/arch/mips/ath79/Makefile 2013-08-04 19:07:36.299920522 +0200
|
@@ -53,6 +53,7 @@ obj-$(CONFIG_ATH79_MACH_ARCHER_C7) += ma
|
||||||
+++ linux-3.10.4/arch/mips/ath79/Makefile 2013-08-04 19:09:42.363923523 +0200
|
|
||||||
@@ -53,6 +53,7 @@
|
|
||||||
obj-$(CONFIG_ATH79_MACH_AW_NR580) += mach-aw-nr580.o
|
obj-$(CONFIG_ATH79_MACH_AW_NR580) += mach-aw-nr580.o
|
||||||
obj-$(CONFIG_ATH79_MACH_CAP4200AG) += mach-cap4200ag.o
|
obj-$(CONFIG_ATH79_MACH_CAP4200AG) += mach-cap4200ag.o
|
||||||
obj-$(CONFIG_ATH79_MACH_DB120) += mach-db120.o
|
obj-$(CONFIG_ATH79_MACH_DB120) += mach-db120.o
|
||||||
|
@ -31,11 +27,9 @@ Index: linux-3.10.4/arch/mips/ath79/Makefile
|
||||||
obj-$(CONFIG_ATH79_MACH_DIR_600_A1) += mach-dir-600-a1.o
|
obj-$(CONFIG_ATH79_MACH_DIR_600_A1) += mach-dir-600-a1.o
|
||||||
obj-$(CONFIG_ATH79_MACH_DIR_615_C1) += mach-dir-615-c1.o
|
obj-$(CONFIG_ATH79_MACH_DIR_615_C1) += mach-dir-615-c1.o
|
||||||
obj-$(CONFIG_ATH79_MACH_DIR_825_B1) += mach-dir-825-b1.o
|
obj-$(CONFIG_ATH79_MACH_DIR_825_B1) += mach-dir-825-b1.o
|
||||||
Index: linux-3.10.4/arch/mips/ath79/machtypes.h
|
--- a/arch/mips/ath79/machtypes.h
|
||||||
===================================================================
|
+++ b/arch/mips/ath79/machtypes.h
|
||||||
--- linux-3.10.4.orig/arch/mips/ath79/machtypes.h 2013-08-04 19:08:12.739921385 +0200
|
@@ -37,6 +37,7 @@ enum ath79_mach_type {
|
||||||
+++ linux-3.10.4/arch/mips/ath79/machtypes.h 2013-08-04 19:09:29.715923222 +0200
|
|
||||||
@@ -37,6 +37,7 @@
|
|
||||||
ATH79_MACH_CARAMBOLA2, /* 8devices Carambola2 */
|
ATH79_MACH_CARAMBOLA2, /* 8devices Carambola2 */
|
||||||
ATH79_MACH_DB120, /* Atheros DB120 reference board */
|
ATH79_MACH_DB120, /* Atheros DB120 reference board */
|
||||||
ATH79_MACH_PB44, /* Atheros PB44 reference board */
|
ATH79_MACH_PB44, /* Atheros PB44 reference board */
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -137,6 +137,19 @@ config BCM63XX
|
@@ -138,6 +138,19 @@ config BCM63XX
|
||||||
help
|
help
|
||||||
Support for BCM63XX based boards
|
Support for BCM63XX based boards
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
config MIPS_COBALT
|
config MIPS_COBALT
|
||||||
bool "Cobalt Server"
|
bool "Cobalt Server"
|
||||||
select CEVT_R4K
|
select CEVT_R4K
|
||||||
@@ -837,6 +850,7 @@ config NLM_XLP_BOARD
|
@@ -838,6 +851,7 @@ config NLM_XLP_BOARD
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
|
obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -147,6 +147,7 @@ config ATHEROS_AR231X
|
@@ -148,6 +148,7 @@ config ATHEROS_AR231X
|
||||||
select SYS_SUPPORTS_BIG_ENDIAN
|
select SYS_SUPPORTS_BIG_ENDIAN
|
||||||
select SYS_SUPPORTS_32BIT_KERNEL
|
select SYS_SUPPORTS_32BIT_KERNEL
|
||||||
select ARCH_REQUIRE_GPIOLIB
|
select ARCH_REQUIRE_GPIOLIB
|
||||||
|
|
|
@ -12,7 +12,7 @@ BOARDNAME:=Broadcom BCM47xx/53xx with ARM CPU
|
||||||
FEATURES:=squashfs usb pci pcie gpio
|
FEATURES:=squashfs usb pci pcie gpio
|
||||||
MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
|
MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
|
||||||
|
|
||||||
LINUX_VERSION:=3.10.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ BOARDNAME:=Broadcom BCM2708/BCM2835
|
||||||
FEATURES:=ext4 audio usb usbgadget display gpio
|
FEATURES:=ext4 audio usb usbgadget display gpio
|
||||||
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
|
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
|
||||||
|
|
||||||
LINUX_VERSION:=3.10.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
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
|
||||||
|
|
|
@ -2079,7 +2079,7 @@
|
||||||
+ENDPROC(__FIQ_Branch)
|
+ENDPROC(__FIQ_Branch)
|
||||||
--- a/arch/arm/kernel/fiq.c
|
--- a/arch/arm/kernel/fiq.c
|
||||||
+++ b/arch/arm/kernel/fiq.c
|
+++ b/arch/arm/kernel/fiq.c
|
||||||
@@ -137,6 +137,7 @@ void disable_fiq(int fiq)
|
@@ -145,6 +145,7 @@ void disable_fiq(int fiq)
|
||||||
EXPORT_SYMBOL(set_fiq_handler);
|
EXPORT_SYMBOL(set_fiq_handler);
|
||||||
EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */
|
EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */
|
||||||
EXPORT_SYMBOL(__get_fiq_regs); /* defined in fiqasm.S */
|
EXPORT_SYMBOL(__get_fiq_regs); /* defined in fiqasm.S */
|
||||||
|
|
|
@ -11,7 +11,7 @@ BOARD:=brcm47xx
|
||||||
BOARDNAME:=Broadcom BCM947xx/953xx
|
BOARDNAME:=Broadcom BCM947xx/953xx
|
||||||
FEATURES:=squashfs usb pcmcia
|
FEATURES:=squashfs usb pcmcia
|
||||||
|
|
||||||
LINUX_VERSION:=3.10.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
DEFAULT_PACKAGES += swconfig kmod-switch kmod-diag wpad-mini nvram
|
DEFAULT_PACKAGES += swconfig kmod-switch kmod-diag wpad-mini nvram
|
||||||
|
|
|
@ -16,7 +16,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -117,7 +117,6 @@ config BCM47XX
|
@@ -118,7 +118,6 @@ config BCM47XX
|
||||||
select NO_EXCEPT_FILL
|
select NO_EXCEPT_FILL
|
||||||
select SYS_SUPPORTS_32BIT_KERNEL
|
select SYS_SUPPORTS_32BIT_KERNEL
|
||||||
select SYS_SUPPORTS_LITTLE_ENDIAN
|
select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||||
|
|
|
@ -16,7 +16,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -128,6 +128,8 @@ config BCM63XX
|
@@ -129,6 +129,8 @@ config BCM63XX
|
||||||
select DMA_NONCOHERENT
|
select DMA_NONCOHERENT
|
||||||
select IRQ_CPU
|
select IRQ_CPU
|
||||||
select SYS_HAS_CPU_MIPS32_R1
|
select SYS_HAS_CPU_MIPS32_R1
|
||||||
|
|
|
@ -20,7 +20,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -123,6 +123,7 @@ config BCM47XX
|
@@ -124,6 +124,7 @@ config BCM47XX
|
||||||
|
|
||||||
config BCM63XX
|
config BCM63XX
|
||||||
bool "Broadcom BCM63XX based boards"
|
bool "Broadcom BCM63XX based boards"
|
||||||
|
|
|
@ -17,7 +17,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -129,6 +129,7 @@ config BCM63XX
|
@@ -130,6 +130,7 @@ config BCM63XX
|
||||||
select DMA_NONCOHERENT
|
select DMA_NONCOHERENT
|
||||||
select IRQ_CPU
|
select IRQ_CPU
|
||||||
select SYS_HAS_CPU_MIPS32_R1
|
select SYS_HAS_CPU_MIPS32_R1
|
||||||
|
@ -25,7 +25,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
|
select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
|
||||||
select NR_CPUS_DEFAULT_2
|
select NR_CPUS_DEFAULT_2
|
||||||
select SYS_SUPPORTS_32BIT_KERNEL
|
select SYS_SUPPORTS_32BIT_KERNEL
|
||||||
@@ -1447,41 +1448,21 @@ config CPU_CAVIUM_OCTEON
|
@@ -1453,41 +1454,21 @@ config CPU_CAVIUM_OCTEON
|
||||||
can have up to 16 Mips64v2 cores and 8 integrated gigabit ethernets.
|
can have up to 16 Mips64v2 cores and 8 integrated gigabit ethernets.
|
||||||
Full details can be found at http://www.caviumnetworks.com.
|
Full details can be found at http://www.caviumnetworks.com.
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
|
|
||||||
config CPU_XLR
|
config CPU_XLR
|
||||||
bool "Netlogic XLR SoC"
|
bool "Netlogic XLR SoC"
|
||||||
@@ -1562,14 +1543,25 @@ config CPU_LOONGSON1
|
@@ -1568,14 +1549,25 @@ config CPU_LOONGSON1
|
||||||
select CPU_SUPPORTS_32BIT_KERNEL
|
select CPU_SUPPORTS_32BIT_KERNEL
|
||||||
select CPU_SUPPORTS_HIGHMEM
|
select CPU_SUPPORTS_HIGHMEM
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
|
|
||||||
config SYS_HAS_CPU_LOONGSON2E
|
config SYS_HAS_CPU_LOONGSON2E
|
||||||
bool
|
bool
|
||||||
@@ -1643,6 +1635,9 @@ config SYS_HAS_CPU_SB1
|
@@ -1649,6 +1641,9 @@ config SYS_HAS_CPU_SB1
|
||||||
config SYS_HAS_CPU_CAVIUM_OCTEON
|
config SYS_HAS_CPU_CAVIUM_OCTEON
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ fix bmips selection
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -130,7 +130,6 @@ config BCM63XX
|
@@ -131,7 +131,6 @@ config BCM63XX
|
||||||
select IRQ_CPU
|
select IRQ_CPU
|
||||||
select SYS_HAS_CPU_MIPS32_R1
|
select SYS_HAS_CPU_MIPS32_R1
|
||||||
select SYS_HAS_CPU_BMIPS
|
select SYS_HAS_CPU_BMIPS
|
||||||
|
|
|
@ -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
|
||||||
@@ -1092,7 +1092,8 @@ static int m25p_probe(struct spi_device
|
@@ -1088,7 +1088,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).
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -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
|
||||||
@@ -987,6 +1009,9 @@ static int m25p_probe(struct spi_device
|
@@ -983,6 +1005,9 @@ static int m25p_probe(struct spi_device
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ Subject: [PATCH 63/79] MTD: physmap: allow passing pp_data
|
||||||
|
|
||||||
--- a/include/linux/mtd/physmap.h
|
--- a/include/linux/mtd/physmap.h
|
||||||
+++ b/include/linux/mtd/physmap.h
|
+++ b/include/linux/mtd/physmap.h
|
||||||
@@ -32,6 +32,7 @@ struct physmap_flash_data {
|
@@ -31,6 +31,7 @@ struct physmap_flash_data {
|
||||||
char *probe_type;
|
char *probe_type;
|
||||||
struct mtd_partition *parts;
|
struct mtd_partition *parts;
|
||||||
const char * const *part_probe_types;
|
const char * const *part_probe_types;
|
||||||
|
|
|
@ -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
|
||||||
@@ -976,6 +976,9 @@ static int m25p_probe(struct spi_device
|
@@ -972,6 +972,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
{USB_DEVICE(0x0af0, 0xd155)},
|
{USB_DEVICE(0x0af0, 0xd155)},
|
||||||
--- a/drivers/usb/storage/unusual_devs.h
|
--- a/drivers/usb/storage/unusual_devs.h
|
||||||
+++ b/drivers/usb/storage/unusual_devs.h
|
+++ b/drivers/usb/storage/unusual_devs.h
|
||||||
@@ -1252,6 +1252,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
|
@@ -1259,6 +1259,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
|
||||||
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
|
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
|
||||||
0 ),
|
0 ),
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -296,7 +296,7 @@ config MIPS_MALTA
|
@@ -297,7 +297,7 @@ config MIPS_MALTA
|
||||||
select CEVT_R4K
|
select CEVT_R4K
|
||||||
select CSRC_R4K
|
select CSRC_R4K
|
||||||
select CSRC_GIC
|
select CSRC_GIC
|
||||||
|
@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||||
select GENERIC_ISA_DMA
|
select GENERIC_ISA_DMA
|
||||||
select HAVE_PCSPKR_PLATFORM
|
select HAVE_PCSPKR_PLATFORM
|
||||||
select IRQ_CPU
|
select IRQ_CPU
|
||||||
@@ -947,6 +947,10 @@ config FW_CFE
|
@@ -948,6 +948,10 @@ config FW_CFE
|
||||||
config ARCH_DMA_ADDR_T_64BIT
|
config ARCH_DMA_ADDR_T_64BIT
|
||||||
def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
|
def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -1430,6 +1430,7 @@ config CPU_CAVIUM_OCTEON
|
@@ -1431,6 +1431,7 @@ config CPU_CAVIUM_OCTEON
|
||||||
select LIBFDT
|
select LIBFDT
|
||||||
select USE_OF
|
select USE_OF
|
||||||
select USB_EHCI_BIG_ENDIAN_MMIO
|
select USB_EHCI_BIG_ENDIAN_MMIO
|
||||||
|
@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||||
help
|
help
|
||||||
The Cavium Octeon processor is a highly integrated chip containing
|
The Cavium Octeon processor is a highly integrated chip containing
|
||||||
many ethernet hardware widgets for networking tasks. The processor
|
many ethernet hardware widgets for networking tasks. The processor
|
||||||
@@ -1650,6 +1651,9 @@ config SYS_HAS_CPU_XLR
|
@@ -1651,6 +1652,9 @@ config SYS_HAS_CPU_XLR
|
||||||
config SYS_HAS_CPU_XLP
|
config SYS_HAS_CPU_XLP
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -475,7 +475,7 @@
|
||||||
__stop_unwind_tab = .;
|
__stop_unwind_tab = .;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -162,24 +162,24 @@ SECTIONS
|
@@ -179,24 +179,24 @@ SECTIONS
|
||||||
}
|
}
|
||||||
.init.arch.info : {
|
.init.arch.info : {
|
||||||
__arch_info_begin = .;
|
__arch_info_begin = .;
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
bool
|
bool
|
||||||
--- a/include/linux/regmap.h
|
--- a/include/linux/regmap.h
|
||||||
+++ b/include/linux/regmap.h
|
+++ b/include/linux/regmap.h
|
||||||
@@ -45,7 +45,7 @@ struct reg_default {
|
@@ -46,7 +46,7 @@ struct reg_default {
|
||||||
unsigned int def;
|
unsigned int def;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
|
||||||
---
|
---
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -895,9 +895,6 @@ config FW_ARC
|
@@ -896,9 +896,6 @@ config FW_ARC
|
||||||
config ARCH_MAY_HAVE_PC_FDC
|
config ARCH_MAY_HAVE_PC_FDC
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
|
||||||
config CEVT_BCM1480
|
config CEVT_BCM1480
|
||||||
bool
|
bool
|
||||||
|
|
||||||
@@ -2391,6 +2388,18 @@ config USE_OF
|
@@ -2396,6 +2393,18 @@ config USE_OF
|
||||||
select OF_EARLY_FLATTREE
|
select OF_EARLY_FLATTREE
|
||||||
select IRQ_DOMAIN
|
select IRQ_DOMAIN
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -988,6 +988,10 @@ config SYNC_R4K
|
@@ -993,6 +993,10 @@ config SYNC_R4K
|
||||||
config MIPS_MACHINE
|
config MIPS_MACHINE
|
||||||
def_bool n
|
def_bool n
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
|
||||||
--
|
--
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -976,6 +976,17 @@ config I8259
|
@@ -981,6 +981,17 @@ config I8259
|
||||||
config MIPS_BONITO64
|
config MIPS_BONITO64
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
Index: linux-3.10/arch/mips/Makefile
|
--- a/arch/mips/Makefile
|
||||||
===================================================================
|
+++ b/arch/mips/Makefile
|
||||||
--- linux-3.10.orig/arch/mips/Makefile 2013-08-04 14:03:15.323485386 +0200
|
@@ -90,8 +90,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
|
||||||
+++ linux-3.10/arch/mips/Makefile 2013-08-04 14:03:15.379485387 +0200
|
|
||||||
@@ -90,8 +90,13 @@
|
|
||||||
cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
|
cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
|
||||||
cflags-y += -msoft-float
|
cflags-y += -msoft-float
|
||||||
LDFLAGS_vmlinux += -G 0 -static -n -nostdlib --gc-sections
|
LDFLAGS_vmlinux += -G 0 -static -n -nostdlib --gc-sections
|
||||||
|
@ -16,11 +14,9 @@ Index: linux-3.10/arch/mips/Makefile
|
||||||
|
|
||||||
ifndef CONFIG_FUNCTION_TRACER
|
ifndef CONFIG_FUNCTION_TRACER
|
||||||
KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections
|
KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections
|
||||||
Index: linux-3.10/arch/mips/include/asm/module.h
|
--- a/arch/mips/include/asm/module.h
|
||||||
===================================================================
|
+++ b/arch/mips/include/asm/module.h
|
||||||
--- linux-3.10.orig/arch/mips/include/asm/module.h 2013-07-01 00:13:29.000000000 +0200
|
@@ -11,6 +11,11 @@ struct mod_arch_specific {
|
||||||
+++ linux-3.10/arch/mips/include/asm/module.h 2013-08-04 14:03:15.383485387 +0200
|
|
||||||
@@ -11,6 +11,11 @@
|
|
||||||
const struct exception_table_entry *dbe_start;
|
const struct exception_table_entry *dbe_start;
|
||||||
const struct exception_table_entry *dbe_end;
|
const struct exception_table_entry *dbe_end;
|
||||||
struct mips_hi16 *r_mips_hi16_list;
|
struct mips_hi16 *r_mips_hi16_list;
|
||||||
|
@ -32,11 +28,9 @@ Index: linux-3.10/arch/mips/include/asm/module.h
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
|
typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
|
||||||
Index: linux-3.10/arch/mips/kernel/module.c
|
--- a/arch/mips/kernel/module.c
|
||||||
===================================================================
|
+++ b/arch/mips/kernel/module.c
|
||||||
--- linux-3.10.orig/arch/mips/kernel/module.c 2013-07-01 00:13:29.000000000 +0200
|
@@ -42,14 +42,222 @@ struct mips_hi16 {
|
||||||
+++ linux-3.10/arch/mips/kernel/module.c 2013-08-04 15:31:24.995611431 +0200
|
|
||||||
@@ -42,14 +42,222 @@
|
|
||||||
static LIST_HEAD(dbe_list);
|
static LIST_HEAD(dbe_list);
|
||||||
static DEFINE_SPINLOCK(dbe_lock);
|
static DEFINE_SPINLOCK(dbe_lock);
|
||||||
|
|
||||||
|
@ -260,7 +254,7 @@ Index: linux-3.10/arch/mips/kernel/module.c
|
||||||
|
|
||||||
int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
|
int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
|
||||||
{
|
{
|
||||||
@@ -63,8 +271,39 @@
|
@@ -63,8 +271,39 @@ static int apply_r_mips_32_rel(struct mo
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -300,7 +294,7 @@ Index: linux-3.10/arch/mips/kernel/module.c
|
||||||
if (v % 4) {
|
if (v % 4) {
|
||||||
pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
|
pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
|
||||||
me->name);
|
me->name);
|
||||||
@@ -72,14 +311,17 @@
|
@@ -72,14 +311,17 @@ static int apply_r_mips_26_rel(struct mo
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
|
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
|
||||||
|
@ -323,7 +317,7 @@ Index: linux-3.10/arch/mips/kernel/module.c
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -286,11 +528,32 @@
|
@@ -286,11 +528,32 @@ int module_finalize(const Elf_Ehdr *hdr,
|
||||||
list_add(&me->arch.dbe_list, &dbe_list);
|
list_add(&me->arch.dbe_list, &dbe_list);
|
||||||
spin_unlock_irq(&dbe_lock);
|
spin_unlock_irq(&dbe_lock);
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
|
||||||
struct m25p {
|
struct m25p {
|
||||||
@@ -1022,7 +1028,7 @@ static int m25p_probe(struct spi_device
|
@@ -1018,7 +1024,7 @@ static int m25p_probe(struct spi_device
|
||||||
flash->mtd._write = m25p80_write;
|
flash->mtd._write = m25p80_write;
|
||||||
|
|
||||||
/* prefer "small sector" erase if possible */
|
/* prefer "small sector" erase if possible */
|
||||||
|
|
|
@ -219,26 +219,26 @@
|
||||||
{
|
{
|
||||||
UInt32 dicSize;
|
UInt32 dicSize;
|
||||||
Byte d;
|
Byte d;
|
||||||
@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma
|
@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma
|
||||||
return SZ_OK;
|
return SZ_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
||||||
-{
|
|
||||||
- CLzmaProps propNew;
|
|
||||||
- RINOK(LzmaProps_Decode(&propNew, props, propsSize));
|
|
||||||
- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
|
|
||||||
- p->prop = propNew;
|
|
||||||
- return SZ_OK;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
|
||||||
+static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
+static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
||||||
{
|
{
|
||||||
CLzmaProps propNew;
|
CLzmaProps propNew;
|
||||||
- SizeT dicBufSize;
|
|
||||||
RINOK(LzmaProps_Decode(&propNew, props, propsSize));
|
RINOK(LzmaProps_Decode(&propNew, props, propsSize));
|
||||||
RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
|
@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
|
||||||
|
p->prop = propNew;
|
||||||
|
return SZ_OK;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
|
||||||
|
-{
|
||||||
|
- CLzmaProps propNew;
|
||||||
|
- SizeT dicBufSize;
|
||||||
|
- RINOK(LzmaProps_Decode(&propNew, props, propsSize));
|
||||||
|
- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
|
||||||
- dicBufSize = propNew.dicSize;
|
- dicBufSize = propNew.dicSize;
|
||||||
- if (p->dic == 0 || dicBufSize != p->dicBufSize)
|
- if (p->dic == 0 || dicBufSize != p->dicBufSize)
|
||||||
- {
|
- {
|
||||||
|
@ -251,9 +251,12 @@
|
||||||
- }
|
- }
|
||||||
- }
|
- }
|
||||||
- p->dicBufSize = dicBufSize;
|
- p->dicBufSize = dicBufSize;
|
||||||
p->prop = propNew;
|
- p->prop = propNew;
|
||||||
return SZ_OK;
|
- return SZ_OK;
|
||||||
}
|
-}
|
||||||
|
|
||||||
|
SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
|
||||||
|
const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
|
||||||
--- a/include/linux/lzma/LzmaEnc.h
|
--- a/include/linux/lzma/LzmaEnc.h
|
||||||
+++ b/include/linux/lzma/LzmaEnc.h
|
+++ b/include/linux/lzma/LzmaEnc.h
|
||||||
@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
|
@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
|
||||||
|
|
|
@ -76,10 +76,11 @@
|
||||||
|
|
||||||
counters = alloc_counters(table);
|
counters = alloc_counters(table);
|
||||||
if (IS_ERR(counters))
|
if (IS_ERR(counters))
|
||||||
@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_
|
@@ -960,6 +989,14 @@ copy_entries_to_user(unsigned int total_
|
||||||
|
ret = -EFAULT;
|
||||||
goto free_counters;
|
goto free_counters;
|
||||||
}
|
}
|
||||||
|
+
|
||||||
+ flags = e->ip.flags & IPT_F_MASK;
|
+ flags = e->ip.flags & IPT_F_MASK;
|
||||||
+ if (copy_to_user(userptr + off
|
+ if (copy_to_user(userptr + off
|
||||||
+ + offsetof(struct ipt_entry, ip.flags),
|
+ + offsetof(struct ipt_entry, ip.flags),
|
||||||
|
@ -87,7 +88,6 @@
|
||||||
+ ret = -EFAULT;
|
+ ret = -EFAULT;
|
||||||
+ goto free_counters;
|
+ goto free_counters;
|
||||||
+ }
|
+ }
|
||||||
+
|
|
||||||
for (i = sizeof(struct ipt_entry);
|
for (i = sizeof(struct ipt_entry);
|
||||||
i < e->target_offset;
|
i < e->target_offset;
|
||||||
i += m->u.match_size) {
|
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
|
|
||||||
--- a/mm/memory.c
|
--- a/mm/memory.c
|
||||||
+++ b/mm/memory.c
|
+++ b/mm/memory.c
|
||||||
@@ -1404,6 +1404,7 @@ void zap_page_range(struct vm_area_struc
|
@@ -1413,6 +1413,7 @@ void zap_page_range(struct vm_area_struc
|
||||||
mmu_notifier_invalidate_range_end(mm, start, end);
|
mmu_notifier_invalidate_range_end(mm, start, end);
|
||||||
tlb_finish_mmu(&tlb, start, end);
|
tlb_finish_mmu(&tlb, start, end);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
|
|
||||||
index 2f45f00..8226a88 100644
|
|
||||||
--- a/sound/soc/codecs/Kconfig
|
--- a/sound/soc/codecs/Kconfig
|
||||||
+++ b/sound/soc/codecs/Kconfig
|
+++ b/sound/soc/codecs/Kconfig
|
||||||
@@ -125,6 +125,7 @@ config SND_SOC_ALL_CODECS
|
@@ -125,6 +125,7 @@ config SND_SOC_ALL_CODECS
|
||||||
|
@ -20,8 +18,6 @@ index 2f45f00..8226a88 100644
|
||||||
# Amp
|
# Amp
|
||||||
config SND_SOC_LM4857
|
config SND_SOC_LM4857
|
||||||
tristate
|
tristate
|
||||||
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
|
|
||||||
index b9e41c9..e3b6654 100644
|
|
||||||
--- a/sound/soc/codecs/Makefile
|
--- a/sound/soc/codecs/Makefile
|
||||||
+++ b/sound/soc/codecs/Makefile
|
+++ b/sound/soc/codecs/Makefile
|
||||||
@@ -118,6 +118,7 @@ snd-soc-wm9705-objs := wm9705.o
|
@@ -118,6 +118,7 @@ snd-soc-wm9705-objs := wm9705.o
|
||||||
|
@ -32,7 +28,7 @@ index b9e41c9..e3b6654 100644
|
||||||
|
|
||||||
# Amp
|
# Amp
|
||||||
snd-soc-max9877-objs := max9877.o
|
snd-soc-max9877-objs := max9877.o
|
||||||
@@ -242,6 +243,7 @@ obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
|
@@ -242,6 +243,7 @@ obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-
|
||||||
obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
|
obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
|
||||||
obj-$(CONFIG_SND_SOC_WM_ADSP) += snd-soc-wm-adsp.o
|
obj-$(CONFIG_SND_SOC_WM_ADSP) += snd-soc-wm-adsp.o
|
||||||
obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
|
obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
|
||||||
|
@ -40,9 +36,6 @@ index b9e41c9..e3b6654 100644
|
||||||
|
|
||||||
# Amp
|
# Amp
|
||||||
obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o
|
obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o
|
||||||
diff --git a/sound/soc/codecs/mxs-builtin-codec.c b/sound/soc/codecs/mxs-builtin-codec.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..144b225
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/sound/soc/codecs/mxs-builtin-codec.c
|
+++ b/sound/soc/codecs/mxs-builtin-codec.c
|
||||||
@@ -0,0 +1,1128 @@
|
@@ -0,0 +1,1128 @@
|
||||||
|
@ -1174,9 +1167,6 @@ index 0000000..144b225
|
||||||
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Codec Driver");
|
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Codec Driver");
|
||||||
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
|
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
diff --git a/sound/soc/codecs/mxs-builtin-codec.h b/sound/soc/codecs/mxs-builtin-codec.h
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..75dee0b
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/sound/soc/codecs/mxs-builtin-codec.h
|
+++ b/sound/soc/codecs/mxs-builtin-codec.h
|
||||||
@@ -0,0 +1,825 @@
|
@@ -0,0 +1,825 @@
|
||||||
|
@ -2005,8 +1995,6 @@ index 0000000..75dee0b
|
||||||
+#define BV_AUDIOIN_ADCVOL_SELECT__MIC 0x00
|
+#define BV_AUDIOIN_ADCVOL_SELECT__MIC 0x00
|
||||||
+
|
+
|
||||||
+#endif /* __MXS_ADC_CODEC_H */
|
+#endif /* __MXS_ADC_CODEC_H */
|
||||||
diff --git a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
|
|
||||||
index 78d321c..9b8dd7d 100644
|
|
||||||
--- a/sound/soc/mxs/Kconfig
|
--- a/sound/soc/mxs/Kconfig
|
||||||
+++ b/sound/soc/mxs/Kconfig
|
+++ b/sound/soc/mxs/Kconfig
|
||||||
@@ -18,3 +18,13 @@ config SND_SOC_MXS_SGTL5000
|
@@ -18,3 +18,13 @@ config SND_SOC_MXS_SGTL5000
|
||||||
|
@ -2023,11 +2011,9 @@ index 78d321c..9b8dd7d 100644
|
||||||
+ help
|
+ help
|
||||||
+ Say Y or M if you want to add support for codecs attached to
|
+ Say Y or M if you want to add support for codecs attached to
|
||||||
+ the MXS SAIF interface.
|
+ the MXS SAIF interface.
|
||||||
diff --git a/sound/soc/mxs/Makefile b/sound/soc/mxs/Makefile
|
|
||||||
index 565b5b5..cd0cf16 100644
|
|
||||||
--- a/sound/soc/mxs/Makefile
|
--- a/sound/soc/mxs/Makefile
|
||||||
+++ b/sound/soc/mxs/Makefile
|
+++ b/sound/soc/mxs/Makefile
|
||||||
@@ -8,3 +8,12 @@ obj-$(CONFIG_SND_MXS_SOC) += snd-soc-mxs.o snd-soc-mxs-pcm.o
|
@@ -8,3 +8,12 @@ obj-$(CONFIG_SND_MXS_SOC) += snd-soc-mxs
|
||||||
snd-soc-mxs-sgtl5000-objs := mxs-sgtl5000.o
|
snd-soc-mxs-sgtl5000-objs := mxs-sgtl5000.o
|
||||||
|
|
||||||
obj-$(CONFIG_SND_SOC_MXS_SGTL5000) += snd-soc-mxs-sgtl5000.o
|
obj-$(CONFIG_SND_SOC_MXS_SGTL5000) += snd-soc-mxs-sgtl5000.o
|
||||||
|
@ -2040,9 +2026,6 @@ index 565b5b5..cd0cf16 100644
|
||||||
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-pcm.o
|
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-pcm.o
|
||||||
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-dai.o
|
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-dai.o
|
||||||
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-audio.o
|
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-audio.o
|
||||||
diff --git a/sound/soc/mxs/mxs-builtin-audio.c b/sound/soc/mxs/mxs-builtin-audio.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..088863e
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/sound/soc/mxs/mxs-builtin-audio.c
|
+++ b/sound/soc/mxs/mxs-builtin-audio.c
|
||||||
@@ -0,0 +1,120 @@
|
@@ -0,0 +1,120 @@
|
||||||
|
@ -2166,9 +2149,6 @@ index 0000000..088863e
|
||||||
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Machine Driver");
|
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Machine Driver");
|
||||||
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
|
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
diff --git a/sound/soc/mxs/mxs-builtin-dai.c b/sound/soc/mxs/mxs-builtin-dai.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..d12bde7
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/sound/soc/mxs/mxs-builtin-dai.c
|
+++ b/sound/soc/mxs/mxs-builtin-dai.c
|
||||||
@@ -0,0 +1,588 @@
|
@@ -0,0 +1,588 @@
|
||||||
|
@ -2760,9 +2740,6 @@ index 0000000..d12bde7
|
||||||
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Codec DAI Driver");
|
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Codec DAI Driver");
|
||||||
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
|
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
diff --git a/sound/soc/mxs/mxs-builtin-pcm.c b/sound/soc/mxs/mxs-builtin-pcm.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..9f155df
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/sound/soc/mxs/mxs-builtin-pcm.c
|
+++ b/sound/soc/mxs/mxs-builtin-pcm.c
|
||||||
@@ -0,0 +1,69 @@
|
@@ -0,0 +1,69 @@
|
||||||
|
@ -2835,9 +2812,6 @@ index 0000000..9f155df
|
||||||
+EXPORT_SYMBOL_GPL(mxs_adc_pcm_platform_unregister);
|
+EXPORT_SYMBOL_GPL(mxs_adc_pcm_platform_unregister);
|
||||||
+
|
+
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
diff --git a/sound/soc/mxs/mxs-builtin-pcm.h b/sound/soc/mxs/mxs-builtin-pcm.h
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..2fba109
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/sound/soc/mxs/mxs-builtin-pcm.h
|
+++ b/sound/soc/mxs/mxs-builtin-pcm.h
|
||||||
@@ -0,0 +1,25 @@
|
@@ -0,0 +1,25 @@
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
diff -ruN linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts linux-3.10.snd/arch/arm/boot/dts/imx23-olinuxino.dts
|
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
|
||||||
--- linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-01 00:13:29.000000000 +0200
|
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
|
||||||
+++ linux-3.10.snd/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-30 14:43:31.000000000 +0200
|
|
||||||
@@ -84,6 +84,25 @@
|
@@ -84,6 +84,25 @@
|
||||||
usbphy0: usbphy@8007c000 {
|
usbphy0: usbphy@8007c000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
|
|
||||||
index dffb855..3e11215 100644
|
|
||||||
--- a/drivers/crypto/Kconfig
|
--- a/drivers/crypto/Kconfig
|
||||||
+++ b/drivers/crypto/Kconfig
|
+++ b/drivers/crypto/Kconfig
|
||||||
@@ -286,6 +286,16 @@ config CRYPTO_DEV_SAHARA
|
@@ -287,6 +287,16 @@ config CRYPTO_DEV_SAHARA
|
||||||
This option enables support for the SAHARA HW crypto accelerator
|
This option enables support for the SAHARA HW crypto accelerator
|
||||||
found in some Freescale i.MX chips.
|
found in some Freescale i.MX chips.
|
||||||
|
|
||||||
+config CRYPTO_DEV_DCP
|
+config CRYPTO_DEV_DCP
|
||||||
+ tristate "Support for the DCP engine"
|
+ tristate "Support for the DCP engine"
|
||||||
|
@ -17,13 +15,11 @@ index dffb855..3e11215 100644
|
||||||
+ capabilities of the DCP co-processor
|
+ capabilities of the DCP co-processor
|
||||||
+
|
+
|
||||||
config CRYPTO_DEV_S5P
|
config CRYPTO_DEV_S5P
|
||||||
tristate "Support for Samsung S5PV210 crypto accelerator"
|
tristate "Support for Samsung S5PV210 crypto accelerator"
|
||||||
depends on ARCH_S5PV210
|
depends on ARCH_S5PV210
|
||||||
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
|
|
||||||
index 38ce13d..b4946dd 100644
|
|
||||||
--- a/drivers/crypto/Makefile
|
--- a/drivers/crypto/Makefile
|
||||||
+++ b/drivers/crypto/Makefile
|
+++ b/drivers/crypto/Makefile
|
||||||
@@ -13,6 +13,7 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o
|
@@ -13,6 +13,7 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += om
|
||||||
obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
|
obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
|
||||||
obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o
|
obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o
|
||||||
obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahara.o
|
obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahara.o
|
||||||
|
@ -31,9 +27,6 @@ index 38ce13d..b4946dd 100644
|
||||||
obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o
|
obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o
|
||||||
obj-$(CONFIG_CRYPTO_DEV_TEGRA_AES) += tegra-aes.o
|
obj-$(CONFIG_CRYPTO_DEV_TEGRA_AES) += tegra-aes.o
|
||||||
obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
|
obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
|
||||||
diff --git a/drivers/crypto/dcp.c b/drivers/crypto/dcp.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..eea194c
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/drivers/crypto/dcp.c
|
+++ b/drivers/crypto/dcp.c
|
||||||
@@ -0,0 +1,925 @@
|
@@ -0,0 +1,925 @@
|
||||||
|
@ -962,5 +955,3 @@ index 0000000..eea194c
|
||||||
+MODULE_AUTHOR("Tobias Rauter <tobias.rau...@gmail.com>");
|
+MODULE_AUTHOR("Tobias Rauter <tobias.rau...@gmail.com>");
|
||||||
+MODULE_DESCRIPTION("Freescale DCP Crypto Driver");
|
+MODULE_DESCRIPTION("Freescale DCP Crypto Driver");
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
diff -ruN linux-3.10/arch/arm/boot/dts/imx23.dtsi linux-3.10.dcp/arch/arm/boot/dts/imx23.dtsi
|
--- a/arch/arm/boot/dts/imx23.dtsi
|
||||||
--- linux-3.10/arch/arm/boot/dts/imx23.dtsi 2013-07-01 00:13:29.000000000 +0200
|
+++ b/arch/arm/boot/dts/imx23.dtsi
|
||||||
+++ linux-3.10.dcp/arch/arm/boot/dts/imx23.dtsi 2013-08-03 11:15:59.000000000 +0200
|
@@ -337,6 +337,7 @@
|
||||||
@@ -333,6 +333,7 @@
|
|
||||||
|
|
||||||
dcp@80028000 {
|
dcp@80028000 {
|
||||||
reg = <0x80028000 0x2000>;
|
reg = <0x80028000 0x2000>;
|
||||||
|
@ -9,9 +8,8 @@ diff -ruN linux-3.10/arch/arm/boot/dts/imx23.dtsi linux-3.10.dcp/arch/arm/boot/d
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
diff -ruN linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts linux-3.10.dcp/arch/arm/boot/dts/imx23-olinuxino.dts
|
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
|
||||||
--- linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-01 00:13:29.000000000 +0200
|
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
|
||||||
+++ linux-3.10.dcp/arch/arm/boot/dts/imx23-olinuxino.dts 2013-08-02 12:30:07.000000000 +0200
|
|
||||||
@@ -66,6 +66,12 @@
|
@@ -66,6 +66,12 @@
|
||||||
pinctrl-0 = <&spi2_pins_a>;
|
pinctrl-0 = <&spi2_pins_a>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
diff -ruN linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts linux-3.10.new/arch/arm/boot/dts/imx23-olinuxino.dts
|
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
|
||||||
--- linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-08 23:35:34.000000000 +0200
|
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
|
||||||
+++ linux-3.10.new/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-08 23:35:44.000000000 +0200
|
@@ -109,6 +109,11 @@
|
||||||
@@ -90,6 +90,11 @@
|
dmas = <&dma_apbx 0>, <&dma_apbx 1>;
|
||||||
usbphy0: usbphy@8007c000 {
|
dma-names = "rx", "tx";
|
||||||
status = "okay";
|
|
||||||
};
|
};
|
||||||
+
|
+
|
||||||
+ lradc@80050000 {
|
+ lradc@80050000 {
|
||||||
|
|
|
@ -13,7 +13,7 @@ FEATURES:=audio display gpio pcie usb usbgadget squashfs targz
|
||||||
CFLAGS:=-Os -pipe -mtune=cortex-a9 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
|
CFLAGS:=-Os -pipe -mtune=cortex-a9 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
|
||||||
MAINTAINER:=Luka Perkov <luka@openwrt.org>
|
MAINTAINER:=Luka Perkov <luka@openwrt.org>
|
||||||
|
|
||||||
LINUX_VERSION:=3.10.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
|
|
@ -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.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
|
|
@ -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.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
DEVICE_TYPE:=developerboard
|
DEVICE_TYPE:=developerboard
|
||||||
|
|
||||||
|
|
|
@ -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.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 pci usb
|
||||||
CFLAGS:=-Os -pipe -march=octeon -fno-caller-saves
|
CFLAGS:=-Os -pipe -march=octeon -fno-caller-saves
|
||||||
MAINTAINER:=John Crispin <blogic@openwrt.org>
|
MAINTAINER:=John Crispin <blogic@openwrt.org>
|
||||||
|
|
||||||
LINUX_VERSION:=3.10
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
|
|
@ -24,11 +24,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
||||||
arch/mips/cavium-octeon/octeon-platform.c | 5 +++--
|
arch/mips/cavium-octeon/octeon-platform.c | 5 +++--
|
||||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
|
|
||||||
index 7b746e7..1830874 100644
|
|
||||||
--- a/arch/mips/cavium-octeon/octeon-platform.c
|
--- a/arch/mips/cavium-octeon/octeon-platform.c
|
||||||
+++ b/arch/mips/cavium-octeon/octeon-platform.c
|
+++ b/arch/mips/cavium-octeon/octeon-platform.c
|
||||||
@@ -334,9 +334,10 @@ static void __init octeon_fdt_pip_iface(int pip, int idx, u64 *pmac)
|
@@ -334,9 +334,10 @@ static void __init octeon_fdt_pip_iface(
|
||||||
char name_buffer[20];
|
char name_buffer[20];
|
||||||
int iface;
|
int iface;
|
||||||
int p;
|
int p;
|
||||||
|
@ -41,6 +39,3 @@ index 7b746e7..1830874 100644
|
||||||
|
|
||||||
snprintf(name_buffer, sizeof(name_buffer), "interface@%d", idx);
|
snprintf(name_buffer, sizeof(name_buffer), "interface@%d", idx);
|
||||||
iface = fdt_subnode_offset(initial_boot_params, pip, name_buffer);
|
iface = fdt_subnode_offset(initial_boot_params, pip, name_buffer);
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -19,11 +19,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
||||||
arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 ++
|
arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 ++
|
||||||
2 files changed, 15 insertions(+)
|
2 files changed, 15 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
|
||||||
index 7c64977..0a1283c 100644
|
|
||||||
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
||||||
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
||||||
@@ -181,6 +181,11 @@ int cvmx_helper_board_get_mii_address(int ipd_port)
|
@@ -181,6 +181,11 @@ int cvmx_helper_board_get_mii_address(in
|
||||||
return ipd_port - 16 + 4;
|
return ipd_port - 16 + 4;
|
||||||
else
|
else
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -35,7 +33,7 @@ index 7c64977..0a1283c 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Some unknown board. Somebody forgot to update this function... */
|
/* Some unknown board. Somebody forgot to update this function... */
|
||||||
@@ -706,6 +711,14 @@ int __cvmx_helper_board_hardware_enable(int interface)
|
@@ -706,6 +711,14 @@ int __cvmx_helper_board_hardware_enable(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -50,8 +48,6 @@ index 7c64977..0a1283c 100644
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
||||||
index 284fa8d..7b7818d 100644
|
|
||||||
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
||||||
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
||||||
@@ -227,6 +227,7 @@ enum cvmx_board_types_enum {
|
@@ -227,6 +227,7 @@ enum cvmx_board_types_enum {
|
||||||
|
@ -62,7 +58,7 @@ index 284fa8d..7b7818d 100644
|
||||||
CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
|
CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
|
||||||
|
|
||||||
/* The remaining range is reserved for future use. */
|
/* The remaining range is reserved for future use. */
|
||||||
@@ -325,6 +326,7 @@ static inline const char *cvmx_board_type_to_string(enum
|
@@ -325,6 +326,7 @@ static inline const char *cvmx_board_typ
|
||||||
|
|
||||||
/* Customer private range */
|
/* Customer private range */
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
|
||||||
|
@ -70,6 +66,3 @@ index 284fa8d..7b7818d 100644
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
|
||||||
}
|
}
|
||||||
return "Unsupported Board";
|
return "Unsupported Board";
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
|
|
|
@ -60,8 +60,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
create mode 100644 drivers/staging/octeon-usb/cvmx-usbnx-defs.h
|
create mode 100644 drivers/staging/octeon-usb/cvmx-usbnx-defs.h
|
||||||
create mode 100644 drivers/staging/octeon-usb/octeon-hcd.c
|
create mode 100644 drivers/staging/octeon-usb/octeon-hcd.c
|
||||||
|
|
||||||
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
|
|
||||||
index 4464f26..f64b662 100644
|
|
||||||
--- a/drivers/staging/Kconfig
|
--- a/drivers/staging/Kconfig
|
||||||
+++ b/drivers/staging/Kconfig
|
+++ b/drivers/staging/Kconfig
|
||||||
@@ -62,6 +62,8 @@ source "drivers/staging/line6/Kconfig"
|
@@ -62,6 +62,8 @@ source "drivers/staging/line6/Kconfig"
|
||||||
|
@ -73,8 +71,6 @@ index 4464f26..f64b662 100644
|
||||||
source "drivers/staging/serqt_usb2/Kconfig"
|
source "drivers/staging/serqt_usb2/Kconfig"
|
||||||
|
|
||||||
source "drivers/staging/vt6655/Kconfig"
|
source "drivers/staging/vt6655/Kconfig"
|
||||||
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
|
|
||||||
index f689b9d..1fb58a1 100644
|
|
||||||
--- a/drivers/staging/Makefile
|
--- a/drivers/staging/Makefile
|
||||||
+++ b/drivers/staging/Makefile
|
+++ b/drivers/staging/Makefile
|
||||||
@@ -25,6 +25,7 @@ obj-$(CONFIG_LINE6_USB) += line6/
|
@@ -25,6 +25,7 @@ obj-$(CONFIG_LINE6_USB) += line6/
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
Index: linux-3.10/drivers/staging/octeon-usb/octeon-hcd.c
|
--- a/drivers/staging/octeon-usb/octeon-hcd.c
|
||||||
===================================================================
|
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
|
||||||
--- linux-3.10.orig/drivers/staging/octeon-usb/octeon-hcd.c 2013-08-03 16:11:44.269610286 +0200
|
@@ -673,8 +673,9 @@ static const struct hc_driver octeon_hc_
|
||||||
+++ linux-3.10/drivers/staging/octeon-usb/octeon-hcd.c 2013-08-04 13:18:54.011421971 +0200
|
|
||||||
@@ -673,8 +673,9 @@
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -13,7 +11,7 @@ Index: linux-3.10/drivers/staging/octeon-usb/octeon-hcd.c
|
||||||
int status;
|
int status;
|
||||||
int usb_num = to_platform_device(dev)->id;
|
int usb_num = to_platform_device(dev)->id;
|
||||||
int irq = platform_get_irq(to_platform_device(dev), 0);
|
int irq = platform_get_irq(to_platform_device(dev), 0);
|
||||||
@@ -728,8 +729,9 @@
|
@@ -728,8 +729,9 @@ static int octeon_usb_driver_probe(struc
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,7 +22,7 @@ Index: linux-3.10/drivers/staging/octeon-usb/octeon-hcd.c
|
||||||
int status;
|
int status;
|
||||||
struct usb_hcd *hcd = dev_get_drvdata(dev);
|
struct usb_hcd *hcd = dev_get_drvdata(dev);
|
||||||
struct octeon_hcd *priv = hcd_to_octeon(hcd);
|
struct octeon_hcd *priv = hcd_to_octeon(hcd);
|
||||||
@@ -748,30 +750,35 @@
|
@@ -748,30 +750,35 @@ static int octeon_usb_driver_remove(stru
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -72,7 +70,7 @@ Index: linux-3.10/drivers/staging/octeon-usb/octeon-hcd.c
|
||||||
/*
|
/*
|
||||||
* Only cn52XX and cn56XX have DWC_OTG USB hardware and the
|
* Only cn52XX and cn56XX have DWC_OTG USB hardware and the
|
||||||
* IOB priority registers. Under heavy network load USB
|
* IOB priority registers. Under heavy network load USB
|
||||||
@@ -792,37 +799,14 @@
|
@@ -792,37 +799,14 @@ static int __init octeon_usb_module_init
|
||||||
cvmx_write_csr(CVMX_IOB_N2C_L2C_PRI_CNT, pri_cnt.u64);
|
cvmx_write_csr(CVMX_IOB_N2C_L2C_PRI_CNT, pri_cnt.u64);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 mt7620a
|
||||||
CFLAGS:=-Os -pipe -mno-branch-likely
|
CFLAGS:=-Os -pipe -mno-branch-likely
|
||||||
FEATURES:=squashfs gpio
|
FEATURES:=squashfs gpio
|
||||||
|
|
||||||
LINUX_VERSION:=3.10.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
DEFAULT_PACKAGES+=\
|
DEFAULT_PACKAGES+=\
|
||||||
|
|
|
@ -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
|
||||||
@@ -926,10 +926,13 @@ static int m25p_probe(struct spi_device
|
@@ -922,10 +922,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
|
||||||
@@ -1005,6 +1008,8 @@ static int m25p_probe(struct spi_device
|
@@ -1001,6 +1004,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;
|
||||||
|
|
|
@ -21,7 +21,7 @@ Cc: linux-gpio@vger.kernel.org
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -443,6 +443,7 @@ config RALINK
|
@@ -444,6 +444,7 @@ config RALINK
|
||||||
select SYS_HAS_EARLY_PRINTK
|
select SYS_HAS_EARLY_PRINTK
|
||||||
select HAVE_MACH_CLKDEV
|
select HAVE_MACH_CLKDEV
|
||||||
select CLKDEV_LOOKUP
|
select CLKDEV_LOOKUP
|
||||||
|
|
|
@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -373,6 +373,7 @@ config MACH_VR41XX
|
@@ -374,6 +374,7 @@ config MACH_VR41XX
|
||||||
select CSRC_R4K
|
select CSRC_R4K
|
||||||
select SYS_HAS_CPU_VR41XX
|
select SYS_HAS_CPU_VR41XX
|
||||||
select ARCH_REQUIRE_GPIOLIB
|
select ARCH_REQUIRE_GPIOLIB
|
||||||
|
|
|
@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk
|
||||||
CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp
|
CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp
|
||||||
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
|
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
|
||||||
|
|
||||||
LINUX_VERSION:=3.10.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
DEVICE_TYPE:=developerboard
|
DEVICE_TYPE:=developerboard
|
||||||
|
|
||||||
|
|
|
@ -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.4
|
LINUX_VERSION:=3.10.9
|
||||||
|
|
||||||
DEVICE_TYPE=other
|
DEVICE_TYPE=other
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue