diff options
Diffstat (limited to 'target/linux/ramips')
4 files changed, 27 insertions, 69 deletions
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 4eaf0caec8..b78a00174c 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 CFLAGS:=-Os -pipe -fno-caller-saves -mno-branch-likely FEATURES:=squashfs gpio -LINUX_VERSION:=3.8.6 +LINUX_VERSION:=3.8.7 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/ramips/patches-3.8/0107-MIPS-ralink-adds-support-for-RT2880-SoC-family.patch b/target/linux/ramips/patches-3.8/0107-MIPS-ralink-adds-support-for-RT2880-SoC-family.patch index 51a7f88f14..592f2af24c 100644 --- a/target/linux/ramips/patches-3.8/0107-MIPS-ralink-adds-support-for-RT2880-SoC-family.patch +++ b/target/linux/ramips/patches-3.8/0107-MIPS-ralink-adds-support-for-RT2880-SoC-family.patch @@ -19,11 +19,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 arch/mips/include/asm/mach-ralink/rt288x.h create mode 100644 arch/mips/ralink/rt288x.c -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 27a4bfa..c1997db 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1144,7 +1144,7 @@ config BOOT_ELF32 +@@ -1189,7 +1189,7 @@ config BOOT_ELF32 config MIPS_L1_CACHE_SHIFT int @@ -32,9 +30,6 @@ index 27a4bfa..c1997db 100644 default "6" if MIPS_CPU_SCACHE default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON default "5" -diff --git a/arch/mips/include/asm/mach-ralink/rt288x.h b/arch/mips/include/asm/mach-ralink/rt288x.h -new file mode 100644 -index 0000000..ad8b42d --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/rt288x.h @@ -0,0 +1,49 @@ @@ -87,8 +82,6 @@ index 0000000..ad8b42d +#define CLKCFG_SRAM_CS_N_WDT BIT(9) + +#endif -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index a0b0197..6723b94 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -6,6 +6,9 @@ choice @@ -101,23 +94,19 @@ index a0b0197..6723b94 100644 config SOC_RT305X bool "RT305x" select USB_ARCH_HAS_HCD -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index 939757f..6d826f2 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -8,6 +8,7 @@ - obj-y := prom.o of.o reset.o clk.o irq.o + obj-y := prom.o of.o reset.o clk.o irq.o pinmux.o +obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform -index 6babd65..3f49e51 100644 --- a/arch/mips/ralink/Platform +++ b/arch/mips/ralink/Platform -@@ -5,6 +5,11 @@ core-$(CONFIG_RALINK) += arch/mips/ralink/ +@@ -5,6 +5,11 @@ core-$(CONFIG_RALINK) += arch/mips/rali cflags-$(CONFIG_RALINK) += -I$(srctree)/arch/mips/include/asm/mach-ralink # @@ -129,9 +118,6 @@ index 6babd65..3f49e51 100644 # Ralink RT305x # load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000 -diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c -new file mode 100644 -index 0000000..8f3a0fa --- /dev/null +++ b/arch/mips/ralink/rt288x.c @@ -0,0 +1,143 @@ @@ -278,6 +264,3 @@ index 0000000..8f3a0fa + (id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK, + (id & CHIP_ID_REV_MASK)); +} --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.8/0120-NET-MIPS-add-ralink-SoC-ethernet-driver.patch b/target/linux/ramips/patches-3.8/0120-NET-MIPS-add-ralink-SoC-ethernet-driver.patch index 86f289be6a..b992650757 100644 --- a/target/linux/ramips/patches-3.8/0120-NET-MIPS-add-ralink-SoC-ethernet-driver.patch +++ b/target/linux/ramips/patches-3.8/0120-NET-MIPS-add-ralink-SoC-ethernet-driver.patch @@ -26,10 +26,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 drivers/net/ethernet/ramips/ramips_eth.h create mode 100644 drivers/net/ethernet/ramips/ramips_main.c -Index: linux-3.8.6/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.6/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h 2013-04-07 14:13:35.688091644 +0200 +--- /dev/null ++++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h @@ -0,0 +1,27 @@ +/* + * Ralink RT305x SoC platform device registration @@ -58,11 +56,9 @@ Index: linux-3.8.6/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h +}; + +#endif /* _RT305X_ESW_PLATFORM_H */ -Index: linux-3.8.6/arch/mips/ralink/rt305x.c -=================================================================== ---- linux-3.8.6.orig/arch/mips/ralink/rt305x.c 2013-04-07 14:13:35.580091641 +0200 -+++ linux-3.8.6/arch/mips/ralink/rt305x.c 2013-04-07 14:13:35.688091644 +0200 -@@ -182,6 +182,7 @@ +--- a/arch/mips/ralink/rt305x.c ++++ b/arch/mips/ralink/rt305x.c +@@ -182,6 +182,7 @@ void __init ralink_clk_init(void) } ralink_clk_add("cpu", cpu_rate); @@ -70,11 +66,9 @@ Index: linux-3.8.6/arch/mips/ralink/rt305x.c ralink_clk_add("10000b00.spi", sys_rate); ralink_clk_add("10000100.timer", wdt_rate); ralink_clk_add("10000120.watchdog", wdt_rate); -Index: linux-3.8.6/drivers/net/ethernet/Kconfig -=================================================================== ---- linux-3.8.6.orig/drivers/net/ethernet/Kconfig 2013-04-05 18:49:06.000000000 +0200 -+++ linux-3.8.6/drivers/net/ethernet/Kconfig 2013-04-07 14:13:35.688091644 +0200 -@@ -136,6 +136,7 @@ +--- a/drivers/net/ethernet/Kconfig ++++ b/drivers/net/ethernet/Kconfig +@@ -136,6 +136,7 @@ source "drivers/net/ethernet/packetengin source "drivers/net/ethernet/pasemi/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/racal/Kconfig" @@ -82,11 +76,9 @@ Index: linux-3.8.6/drivers/net/ethernet/Kconfig source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/rdc/Kconfig" -Index: linux-3.8.6/drivers/net/ethernet/Makefile -=================================================================== ---- linux-3.8.6.orig/drivers/net/ethernet/Makefile 2013-04-05 18:49:06.000000000 +0200 -+++ linux-3.8.6/drivers/net/ethernet/Makefile 2013-04-07 14:13:35.688091644 +0200 -@@ -54,6 +54,7 @@ +--- a/drivers/net/ethernet/Makefile ++++ b/drivers/net/ethernet/Makefile +@@ -54,6 +54,7 @@ obj-$(CONFIG_NET_PACKET_ENGINE) += packe obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ @@ -94,10 +86,8 @@ Index: linux-3.8.6/drivers/net/ethernet/Makefile obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_SH_ETH) += renesas/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ -Index: linux-3.8.6/drivers/net/ethernet/ramips/Kconfig -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.6/drivers/net/ethernet/ramips/Kconfig 2013-04-07 14:13:35.688091644 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/Kconfig @@ -0,0 +1,18 @@ +config NET_RAMIPS + tristate "Ralink RT288X/RT3X5X/RT3662/RT3883 ethernet driver" @@ -117,10 +107,8 @@ Index: linux-3.8.6/drivers/net/ethernet/ramips/Kconfig + depends on DEBUG_FS + +endif -Index: linux-3.8.6/drivers/net/ethernet/ramips/Makefile -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.6/drivers/net/ethernet/ramips/Makefile 2013-04-07 14:13:35.688091644 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/Makefile @@ -0,0 +1,9 @@ +# +# Makefile for the Ramips SoCs built-in ethernet macs @@ -131,10 +119,8 @@ Index: linux-3.8.6/drivers/net/ethernet/ramips/Makefile +ramips-$(CONFIG_NET_RAMIPS_DEBUG_FS) += ramips_debugfs.o + +obj-$(CONFIG_NET_RAMIPS) += ramips.o -Index: linux-3.8.6/drivers/net/ethernet/ramips/ramips_debugfs.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.6/drivers/net/ethernet/ramips/ramips_debugfs.c 2013-04-07 14:13:35.688091644 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/ramips_debugfs.c @@ -0,0 +1,127 @@ +/* + * Ralink SoC ethernet driver debugfs code @@ -263,10 +249,8 @@ Index: linux-3.8.6/drivers/net/ethernet/ramips/ramips_debugfs.c + debugfs_remove(raeth_debugfs_root); + raeth_debugfs_root = NULL; +} -Index: linux-3.8.6/drivers/net/ethernet/ramips/ramips_esw.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.6/drivers/net/ethernet/ramips/ramips_esw.c 2013-04-07 16:16:56.172408006 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/ramips_esw.c @@ -0,0 +1,1221 @@ +#include <linux/ioport.h> +#include <linux/switch.h> @@ -1489,10 +1473,8 @@ Index: linux-3.8.6/drivers/net/ethernet/ramips/ramips_esw.c +{ + platform_driver_unregister(&rt305x_esw_driver); +} -Index: linux-3.8.6/drivers/net/ethernet/ramips/ramips_eth.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.6/drivers/net/ethernet/ramips/ramips_eth.h 2013-04-07 14:13:35.688091644 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/ramips_eth.h @@ -0,0 +1,375 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -1869,10 +1851,8 @@ Index: linux-3.8.6/drivers/net/ethernet/ramips/ramips_eth.h +#endif /* CONFIG_NET_RAMIPS_DEBUG_FS */ + +#endif /* RAMIPS_ETH_H */ -Index: linux-3.8.6/drivers/net/ethernet/ramips/ramips_main.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.8.6/drivers/net/ethernet/ramips/ramips_main.c 2013-04-07 14:13:35.688091644 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ramips/ramips_main.c @@ -0,0 +1,1285 @@ +/* + * This program is free software; you can redistribute it and/or modify diff --git a/target/linux/ramips/patches-3.8/0133-MIPS-ralink-make-early_printk-work-on-RT2880.patch b/target/linux/ramips/patches-3.8/0133-MIPS-ralink-make-early_printk-work-on-RT2880.patch index 0f6e099cb9..71dad9e0c6 100644 --- a/target/linux/ramips/patches-3.8/0133-MIPS-ralink-make-early_printk-work-on-RT2880.patch +++ b/target/linux/ramips/patches-3.8/0133-MIPS-ralink-make-early_printk-work-on-RT2880.patch @@ -10,8 +10,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/ralink/early_printk.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/arch/mips/ralink/early_printk.c b/arch/mips/ralink/early_printk.c -index c4ae47e..b46d041 100644 --- a/arch/mips/ralink/early_printk.c +++ b/arch/mips/ralink/early_printk.c @@ -11,7 +11,11 @@ @@ -26,6 +24,3 @@ index c4ae47e..b46d041 100644 #define UART_REG_RX 0x00 #define UART_REG_TX 0x04 --- -1.7.10.4 - |