kernel: update linux 3.9 to 3.9.8
Includes memory allocation fixes as well as several networking fixes. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37103
This commit is contained in:
@@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 mt7620a
|
||||
CFLAGS:=-Os -pipe -fno-caller-saves -mno-branch-likely
|
||||
FEATURES:=squashfs gpio
|
||||
|
||||
LINUX_VERSION:=3.9.6
|
||||
LINUX_VERSION:=3.9.8
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
DEFAULT_PACKAGES+=\
|
||||
|
||||
@@ -17,8 +17,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5164/
|
||||
arch/mips/kernel/prom.c | 31 +++++++++++++++++++++++++++++++
|
||||
5 files changed, 35 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/include/asm/mips_machine.h b/arch/mips/include/asm/mips_machine.h
|
||||
index 363bb35..9d00aeb 100644
|
||||
--- a/arch/mips/include/asm/mips_machine.h
|
||||
+++ b/arch/mips/include/asm/mips_machine.h
|
||||
@@ -42,13 +42,9 @@ extern long __mips_machines_end;
|
||||
@@ -35,11 +33,9 @@ index 363bb35..9d00aeb 100644
|
||||
#endif /* CONFIG_MIPS_MACHINE */
|
||||
|
||||
#endif /* __ASM_MIPS_MACHINE_H */
|
||||
diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
|
||||
index 8808bf5..1e7e096 100644
|
||||
--- a/arch/mips/include/asm/prom.h
|
||||
+++ b/arch/mips/include/asm/prom.h
|
||||
@@ -48,4 +48,7 @@ extern void __dt_setup_arch(struct boot_param_header *bph);
|
||||
@@ -48,4 +48,7 @@ extern void __dt_setup_arch(struct boot_
|
||||
static inline void device_tree_init(void) { }
|
||||
#endif /* CONFIG_OF */
|
||||
|
||||
@@ -47,8 +43,6 @@ index 8808bf5..1e7e096 100644
|
||||
+extern void mips_set_machine_name(const char *name);
|
||||
+
|
||||
#endif /* __ASM_PROM_H */
|
||||
diff --git a/arch/mips/kernel/mips_machine.c b/arch/mips/kernel/mips_machine.c
|
||||
index 411a058..6dc5866 100644
|
||||
--- a/arch/mips/kernel/mips_machine.c
|
||||
+++ b/arch/mips/kernel/mips_machine.c
|
||||
@@ -13,7 +13,6 @@
|
||||
@@ -59,7 +53,7 @@ index 411a058..6dc5866 100644
|
||||
|
||||
#define for_each_machine(mach) \
|
||||
for ((mach) = (struct mips_machine *)&__mips_machines_start; \
|
||||
@@ -21,25 +20,6 @@ static char *mips_machine_name = "Unknown";
|
||||
@@ -21,25 +20,6 @@ static char *mips_machine_name = "Unknow
|
||||
(unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
|
||||
(mach)++)
|
||||
|
||||
@@ -93,8 +87,6 @@ index 411a058..6dc5866 100644
|
||||
|
||||
if (mips_machine->mach_setup)
|
||||
mips_machine->mach_setup();
|
||||
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
|
||||
index 7a54f74..1dd137b 100644
|
||||
--- a/arch/mips/kernel/proc.c
|
||||
+++ b/arch/mips/kernel/proc.c
|
||||
@@ -12,7 +12,7 @@
|
||||
@@ -106,8 +98,6 @@ index 7a54f74..1dd137b 100644
|
||||
|
||||
unsigned int vced_count, vcei_count;
|
||||
|
||||
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
|
||||
index 028f6f8..b68e53b 100644
|
||||
--- a/arch/mips/kernel/prom.c
|
||||
+++ b/arch/mips/kernel/prom.c
|
||||
@@ -23,6 +23,22 @@
|
||||
@@ -133,7 +123,7 @@ index 028f6f8..b68e53b 100644
|
||||
int __init early_init_dt_scan_memory_arch(unsigned long node,
|
||||
const char *uname, int depth,
|
||||
void *data)
|
||||
@@ -50,6 +66,18 @@ void __init early_init_dt_setup_initrd_arch(unsigned long start,
|
||||
@@ -50,6 +66,18 @@ void __init early_init_dt_setup_initrd_a
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -152,7 +142,7 @@ index 028f6f8..b68e53b 100644
|
||||
void __init early_init_devtree(void *params)
|
||||
{
|
||||
/* Setup flat device-tree pointer */
|
||||
@@ -65,6 +93,9 @@ void __init early_init_devtree(void *params)
|
||||
@@ -65,6 +93,9 @@ void __init early_init_devtree(void *par
|
||||
/* Scan memory nodes */
|
||||
of_scan_flat_dt(early_init_dt_scan_root, NULL);
|
||||
of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL);
|
||||
@@ -162,6 +152,3 @@ index 028f6f8..b68e53b 100644
|
||||
}
|
||||
|
||||
void __init __dt_setup_arch(struct boot_param_header *bph)
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5165/
|
||||
arch/mips/ralink/irq.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
|
||||
index 6d054c5..d9807d0 100644
|
||||
--- a/arch/mips/ralink/irq.c
|
||||
+++ b/arch/mips/ralink/irq.c
|
||||
@@ -31,6 +31,7 @@
|
||||
@@ -35,6 +33,3 @@ index 6d054c5..d9807d0 100644
|
||||
else if (pending & STATUSF_IP2)
|
||||
do_IRQ(RALINK_CPU_IRQ_INTC);
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5166/
|
||||
arch/mips/include/asm/mach-ralink/rt305x.h | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/rt305x.h b/arch/mips/include/asm/mach-ralink/rt305x.h
|
||||
index 7d344f2..e36c3c5 100644
|
||||
--- a/arch/mips/include/asm/mach-ralink/rt305x.h
|
||||
+++ b/arch/mips/include/asm/mach-ralink/rt305x.h
|
||||
@@ -136,4 +136,17 @@ static inline int soc_is_rt5350(void)
|
||||
@@ -35,6 +33,3 @@ index 7d344f2..e36c3c5 100644
|
||||
+#define RT3352_SYSCFG1_USB0_HOST_MODE BIT(10)
|
||||
+
|
||||
#endif
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5167/
|
||||
arch/mips/ralink/rt305x.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
|
||||
index 0a4bbdc..5d49a54 100644
|
||||
--- a/arch/mips/ralink/rt305x.c
|
||||
+++ b/arch/mips/ralink/rt305x.c
|
||||
@@ -124,6 +124,8 @@ struct ralink_pinmux gpio_pinmux = {
|
||||
@@ -47,6 +45,3 @@ index 0a4bbdc..5d49a54 100644
|
||||
}
|
||||
|
||||
void __init ralink_of_remap(void)
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,11 +12,9 @@ Patchwork: http://patchwork.linux-mips.org/patch/5168/
|
||||
arch/mips/ralink/irq.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
|
||||
index d9807d0..320b1f1 100644
|
||||
--- a/arch/mips/ralink/irq.c
|
||||
+++ b/arch/mips/ralink/irq.c
|
||||
@@ -166,6 +166,7 @@ static int __init intc_of_init(struct device_node *node,
|
||||
@@ -166,6 +166,7 @@ static int __init intc_of_init(struct de
|
||||
irq_set_chained_handler(irq, ralink_intc_irq_handler);
|
||||
irq_set_handler_data(irq, domain);
|
||||
|
||||
@@ -24,6 +22,3 @@ index d9807d0..320b1f1 100644
|
||||
cp0_perfcount_irq = irq_create_mapping(domain, 9);
|
||||
|
||||
return 0;
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5169/
|
||||
arch/mips/include/asm/mach-ralink/rt305x.h | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/rt305x.h b/arch/mips/include/asm/mach-ralink/rt305x.h
|
||||
index e36c3c5..80cda8a 100644
|
||||
--- a/arch/mips/include/asm/mach-ralink/rt305x.h
|
||||
+++ b/arch/mips/include/asm/mach-ralink/rt305x.h
|
||||
@@ -97,6 +97,14 @@ static inline int soc_is_rt5350(void)
|
||||
@@ -32,6 +30,3 @@ index e36c3c5..80cda8a 100644
|
||||
/* multi function gpio pins */
|
||||
#define RT305X_GPIO_I2C_SD 1
|
||||
#define RT305X_GPIO_I2C_SCLK 2
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5170/
|
||||
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 @@
|
||||
@@ -28,6 +26,3 @@ index c4ae47e..b46d041 100644
|
||||
|
||||
#define UART_REG_RX 0x00
|
||||
#define UART_REG_TX 0x04
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5171/
|
||||
arch/mips/ralink/rt305x.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
|
||||
index 3009903..f4b19c6 100644
|
||||
--- a/arch/mips/ralink/common.h
|
||||
+++ b/arch/mips/ralink/common.h
|
||||
@@ -24,7 +24,7 @@ struct ralink_pinmux {
|
||||
@@ -25,8 +23,6 @@ index 3009903..f4b19c6 100644
|
||||
|
||||
struct ralink_soc_info {
|
||||
unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
|
||||
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
|
||||
index 5d49a54..f1a6c33 100644
|
||||
--- a/arch/mips/ralink/rt305x.c
|
||||
+++ b/arch/mips/ralink/rt305x.c
|
||||
@@ -114,7 +114,7 @@ void rt305x_wdt_reset(void)
|
||||
@@ -38,6 +34,3 @@ index 5d49a54..f1a6c33 100644
|
||||
.mode = mode_mux,
|
||||
.uart = uart_mux,
|
||||
.uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5172/
|
||||
arch/mips/ralink/rt305x.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
|
||||
index f1a6c33..5b42078 100644
|
||||
--- a/arch/mips/ralink/rt305x.c
|
||||
+++ b/arch/mips/ralink/rt305x.c
|
||||
@@ -22,7 +22,7 @@
|
||||
@@ -44,6 +42,3 @@ index f1a6c33..5b42078 100644
|
||||
{
|
||||
u32 t;
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5173/
|
||||
arch/mips/ralink/common.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
|
||||
index f4b19c6..bebd149 100644
|
||||
--- a/arch/mips/ralink/common.h
|
||||
+++ b/arch/mips/ralink/common.h
|
||||
@@ -23,6 +23,9 @@ struct ralink_pinmux {
|
||||
@@ -26,6 +24,3 @@ index f4b19c6..bebd149 100644
|
||||
};
|
||||
extern struct ralink_pinmux rt_gpio_pinmux;
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5744/
|
||||
arch/mips/ralink/rt305x.c | 5 +++--
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
|
||||
index bebd149..299119b 100644
|
||||
--- a/arch/mips/ralink/common.h
|
||||
+++ b/arch/mips/ralink/common.h
|
||||
@@ -22,6 +22,7 @@ struct ralink_pinmux {
|
||||
@@ -24,11 +22,9 @@ index bebd149..299119b 100644
|
||||
void (*wdt_reset)(void);
|
||||
struct ralink_pinmux_grp *pci;
|
||||
int pci_shift;
|
||||
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
|
||||
index 5b42078..6aa3cb1 100644
|
||||
--- a/arch/mips/ralink/rt305x.c
|
||||
+++ b/arch/mips/ralink/rt305x.c
|
||||
@@ -91,12 +91,12 @@ static struct ralink_pinmux_grp uart_mux[] = {
|
||||
@@ -91,12 +91,12 @@ static struct ralink_pinmux_grp uart_mux
|
||||
.name = "gpio uartf",
|
||||
.mask = RT305X_GPIO_MODE_GPIO_UARTF,
|
||||
.gpio_first = RT305X_GPIO_7,
|
||||
@@ -51,6 +47,3 @@ index 5b42078..6aa3cb1 100644
|
||||
.wdt_reset = rt305x_wdt_reset,
|
||||
};
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -21,11 +21,9 @@ Patchwork: http://patchwork.linux-mips.org/patch/5176/
|
||||
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 51244bf..e4da4f8 100644
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -1152,7 +1152,7 @@ config BOOT_ELF32
|
||||
@@ -1164,7 +1164,7 @@ config BOOT_ELF32
|
||||
|
||||
config MIPS_L1_CACHE_SHIFT
|
||||
int
|
||||
@@ -34,9 +32,6 @@ index 51244bf..e4da4f8 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 @@
|
||||
@@ -89,8 +84,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
|
||||
@@ -103,8 +96,6 @@ 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 @@
|
||||
@@ -115,11 +106,9 @@ index 939757f..6d826f2 100644
|
||||
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
|
||||
|
||||
#
|
||||
@@ -131,9 +120,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..1e0788e
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/rt288x.c
|
||||
@@ -0,0 +1,139 @@
|
||||
@@ -276,6 +262,3 @@ index 0000000..1e0788e
|
||||
+ (id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
|
||||
+ (id & CHIP_ID_REV_MASK));
|
||||
+}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -20,9 +20,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5185/
|
||||
create mode 100644 arch/mips/include/asm/mach-ralink/rt3883.h
|
||||
create mode 100644 arch/mips/ralink/rt3883.c
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/rt3883.h b/arch/mips/include/asm/mach-ralink/rt3883.h
|
||||
new file mode 100644
|
||||
index 0000000..b91c6c1
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-ralink/rt3883.h
|
||||
@@ -0,0 +1,247 @@
|
||||
@@ -273,8 +270,6 @@ index 0000000..b91c6c1
|
||||
+#define RT3883_FLASH_CFG_WIDTH_32BIT 0x2
|
||||
+
|
||||
+#endif /* _RT3883_REGS_H_ */
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index 6723b94..ce57d3e 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -15,6 +15,11 @@ choice
|
||||
@@ -289,8 +284,6 @@ index 6723b94..ce57d3e 100644
|
||||
endchoice
|
||||
|
||||
choice
|
||||
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
|
||||
index 6d826f2..ba9669c 100644
|
||||
--- a/arch/mips/ralink/Makefile
|
||||
+++ b/arch/mips/ralink/Makefile
|
||||
@@ -10,6 +10,7 @@ obj-y := prom.o of.o reset.o clk.o irq.o
|
||||
@@ -301,11 +294,9 @@ index 6d826f2..ba9669c 100644
|
||||
|
||||
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
||||
|
||||
diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform
|
||||
index 3f49e51..f67c08d 100644
|
||||
--- a/arch/mips/ralink/Platform
|
||||
+++ b/arch/mips/ralink/Platform
|
||||
@@ -13,3 +13,8 @@ load-$(CONFIG_SOC_RT288X) += 0xffffffff88000000
|
||||
@@ -13,3 +13,8 @@ load-$(CONFIG_SOC_RT288X) += 0xffffffff8
|
||||
# Ralink RT305x
|
||||
#
|
||||
load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000
|
||||
@@ -314,9 +305,6 @@ index 3f49e51..f67c08d 100644
|
||||
+# Ralink RT3883
|
||||
+#
|
||||
+load-$(CONFIG_SOC_RT3883) += 0xffffffff80000000
|
||||
diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c
|
||||
new file mode 100644
|
||||
index 0000000..2d90aa9
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/rt3883.c
|
||||
@@ -0,0 +1,242 @@
|
||||
@@ -562,6 +550,3 @@ index 0000000..2d90aa9
|
||||
+ (id >> RT3883_REVID_VER_ID_SHIFT) & RT3883_REVID_VER_ID_MASK,
|
||||
+ (id & RT3883_REVID_ECO_ID_MASK));
|
||||
+}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -20,9 +20,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5177/
|
||||
create mode 100644 arch/mips/include/asm/mach-ralink/mt7620.h
|
||||
create mode 100644 arch/mips/ralink/mt7620.c
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h
|
||||
new file mode 100644
|
||||
index 0000000..b272649
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-ralink/mt7620.h
|
||||
@@ -0,0 +1,76 @@
|
||||
@@ -102,8 +99,6 @@ index 0000000..b272649
|
||||
+#define MT7620_GPIO_MODE_WDT BIT(22)
|
||||
+
|
||||
+#endif
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index ce57d3e..86f6c77 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -20,6 +20,9 @@ choice
|
||||
@@ -116,8 +111,6 @@ index ce57d3e..86f6c77 100644
|
||||
endchoice
|
||||
|
||||
choice
|
||||
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
|
||||
index ba9669c..38cf1a8 100644
|
||||
--- a/arch/mips/ralink/Makefile
|
||||
+++ b/arch/mips/ralink/Makefile
|
||||
@@ -11,6 +11,7 @@ obj-y := prom.o of.o reset.o clk.o irq.o
|
||||
@@ -128,11 +121,9 @@ index ba9669c..38cf1a8 100644
|
||||
|
||||
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
||||
|
||||
diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform
|
||||
index f67c08d..b2cbf16 100644
|
||||
--- a/arch/mips/ralink/Platform
|
||||
+++ b/arch/mips/ralink/Platform
|
||||
@@ -18,3 +18,8 @@ load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000
|
||||
@@ -18,3 +18,8 @@ load-$(CONFIG_SOC_RT305X) += 0xffffffff8
|
||||
# Ralink RT3883
|
||||
#
|
||||
load-$(CONFIG_SOC_RT3883) += 0xffffffff80000000
|
||||
@@ -141,9 +132,6 @@ index f67c08d..b2cbf16 100644
|
||||
+# Ralink MT7620
|
||||
+#
|
||||
+load-$(CONFIG_SOC_MT7620) += 0xffffffff80000000
|
||||
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
|
||||
new file mode 100644
|
||||
index 0000000..eb00ab8
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/mt7620.c
|
||||
@@ -0,0 +1,214 @@
|
||||
@@ -361,6 +349,3 @@ index 0000000..eb00ab8
|
||||
+ cfg0 = __raw_readl(sysc + SYSC_REG_SYSTEM_CONFIG0);
|
||||
+ dram_type = (cfg0 >> SYSCFG0_DRAM_TYPE_SHIFT) & SYSCFG0_DRAM_TYPE_MASK;
|
||||
+}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -18,9 +18,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5175/
|
||||
create mode 100644 arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h
|
||||
create mode 100644 arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h
|
||||
new file mode 100644
|
||||
index 0000000..72fc106
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h
|
||||
@@ -0,0 +1,56 @@
|
||||
@@ -80,9 +77,6 @@ index 0000000..72fc106
|
||||
+#define cpu_icache_line_size() 16
|
||||
+
|
||||
+#endif /* _RT288X_CPU_FEATURE_OVERRIDES_H */
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h
|
||||
new file mode 100644
|
||||
index 0000000..917c286
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h
|
||||
@@ -0,0 +1,56 @@
|
||||
@@ -142,9 +136,6 @@ index 0000000..917c286
|
||||
+#define cpu_icache_line_size() 32
|
||||
+
|
||||
+#endif /* _RT305X_CPU_FEATURE_OVERRIDES_H */
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h
|
||||
new file mode 100644
|
||||
index 0000000..181fbf4
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h
|
||||
@@ -0,0 +1,55 @@
|
||||
@@ -203,11 +194,9 @@ index 0000000..181fbf4
|
||||
+#define cpu_icache_line_size() 32
|
||||
+
|
||||
+#endif /* _RT3883_CPU_FEATURE_OVERRIDES_H */
|
||||
diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform
|
||||
index b2cbf16..cda4b66 100644
|
||||
--- a/arch/mips/ralink/Platform
|
||||
+++ b/arch/mips/ralink/Platform
|
||||
@@ -8,16 +8,19 @@ cflags-$(CONFIG_RALINK) += -I$(srctree)/arch/mips/include/asm/mach-ralink
|
||||
@@ -8,16 +8,19 @@ cflags-$(CONFIG_RALINK) += -I$(srctree)
|
||||
# Ralink RT288x
|
||||
#
|
||||
load-$(CONFIG_SOC_RT288X) += 0xffffffff88000000
|
||||
@@ -227,6 +216,3 @@ index b2cbf16..cda4b66 100644
|
||||
|
||||
#
|
||||
# Ralink MT7620
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -9,8 +9,6 @@ Acked-by: Grant Likely <grant.likely@secretlab.ca>
|
||||
Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
|
||||
index 19e1ef7..6527412 100644
|
||||
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
|
||||
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
|
||||
@@ -41,6 +41,7 @@ onnn ON Semiconductor Corp.
|
||||
@@ -21,6 +19,3 @@ index 19e1ef7..6527412 100644
|
||||
ramtron Ramtron International
|
||||
realtek Realtek Semiconductor Corp.
|
||||
renesas Renesas Electronics Corporation
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -15,9 +15,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5187/
|
||||
1 file changed, 18 insertions(+)
|
||||
create mode 100644 Documentation/devicetree/bindings/mips/ralink.txt
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/mips/ralink.txt b/Documentation/devicetree/bindings/mips/ralink.txt
|
||||
new file mode 100644
|
||||
index 0000000..59b6a35
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/mips/ralink.txt
|
||||
@@ -0,0 +1,18 @@
|
||||
@@ -39,6 +36,3 @@ index 0000000..59b6a35
|
||||
+ ralink,mt7620a-soc
|
||||
+ ralink,mt7620n-soc
|
||||
+
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -15,8 +15,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5186/
|
||||
arch/mips/ralink/dts/rt3052_eval.dts | 10 ++-----
|
||||
2 files changed, 4 insertions(+), 58 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi
|
||||
index 069d066..ef7da1e 100644
|
||||
--- a/arch/mips/ralink/dts/rt3050.dtsi
|
||||
+++ b/arch/mips/ralink/dts/rt3050.dtsi
|
||||
@@ -1,7 +1,7 @@
|
||||
@@ -106,8 +104,6 @@ index 069d066..ef7da1e 100644
|
||||
uartlite@c00 {
|
||||
compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
|
||||
reg = <0xc00 0x100>;
|
||||
diff --git a/arch/mips/ralink/dts/rt3052_eval.dts b/arch/mips/ralink/dts/rt3052_eval.dts
|
||||
index 148a590..df17f5f 100644
|
||||
--- a/arch/mips/ralink/dts/rt3052_eval.dts
|
||||
+++ b/arch/mips/ralink/dts/rt3052_eval.dts
|
||||
@@ -3,8 +3,6 @@
|
||||
@@ -134,6 +130,3 @@ index 148a590..df17f5f 100644
|
||||
};
|
||||
|
||||
cfi@1f000000 {
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -17,8 +17,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5188/
|
||||
create mode 100644 arch/mips/ralink/dts/rt2880.dtsi
|
||||
create mode 100644 arch/mips/ralink/dts/rt2880_eval.dts
|
||||
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index 86f6c77..2f6fbb8 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -34,6 +34,10 @@ choice
|
||||
@@ -32,16 +30,11 @@ index 86f6c77..2f6fbb8 100644
|
||||
config DTB_RT305X_EVAL
|
||||
bool "RT305x eval kit"
|
||||
depends on SOC_RT305X
|
||||
diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
|
||||
index 1a69fb3..f635a01 100644
|
||||
--- a/arch/mips/ralink/dts/Makefile
|
||||
+++ b/arch/mips/ralink/dts/Makefile
|
||||
@@ -1 +1,2 @@
|
||||
+obj-$(CONFIG_DTB_RT2880_EVAL) := rt2880_eval.dtb.o
|
||||
obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
|
||||
diff --git a/arch/mips/ralink/dts/rt2880.dtsi b/arch/mips/ralink/dts/rt2880.dtsi
|
||||
new file mode 100644
|
||||
index 0000000..182afde
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/dts/rt2880.dtsi
|
||||
@@ -0,0 +1,58 @@
|
||||
@@ -103,9 +96,6 @@ index 0000000..182afde
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
diff --git a/arch/mips/ralink/dts/rt2880_eval.dts b/arch/mips/ralink/dts/rt2880_eval.dts
|
||||
new file mode 100644
|
||||
index 0000000..322d700
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/dts/rt2880_eval.dts
|
||||
@@ -0,0 +1,46 @@
|
||||
@@ -155,6 +145,3 @@ index 0000000..322d700
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -17,8 +17,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5189/
|
||||
create mode 100644 arch/mips/ralink/dts/rt3883.dtsi
|
||||
create mode 100644 arch/mips/ralink/dts/rt3883_eval.dts
|
||||
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index 2f6fbb8..493411f 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -42,6 +42,10 @@ choice
|
||||
@@ -32,17 +30,12 @@ index 2f6fbb8..493411f 100644
|
||||
endchoice
|
||||
|
||||
endif
|
||||
diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
|
||||
index f635a01..040a986 100644
|
||||
--- a/arch/mips/ralink/dts/Makefile
|
||||
+++ b/arch/mips/ralink/dts/Makefile
|
||||
@@ -1,2 +1,3 @@
|
||||
obj-$(CONFIG_DTB_RT2880_EVAL) := rt2880_eval.dtb.o
|
||||
obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
|
||||
+obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o
|
||||
diff --git a/arch/mips/ralink/dts/rt3883.dtsi b/arch/mips/ralink/dts/rt3883.dtsi
|
||||
new file mode 100644
|
||||
index 0000000..3b131dd
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/dts/rt3883.dtsi
|
||||
@@ -0,0 +1,58 @@
|
||||
@@ -104,9 +97,6 @@ index 0000000..3b131dd
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
diff --git a/arch/mips/ralink/dts/rt3883_eval.dts b/arch/mips/ralink/dts/rt3883_eval.dts
|
||||
new file mode 100644
|
||||
index 0000000..2fa6b33
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/dts/rt3883_eval.dts
|
||||
@@ -0,0 +1,16 @@
|
||||
@@ -126,6 +116,3 @@ index 0000000..2fa6b33
|
||||
+ bootargs = "console=ttyS0,57600";
|
||||
+ };
|
||||
+};
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -17,8 +17,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5190/
|
||||
create mode 100644 arch/mips/ralink/dts/mt7620a.dtsi
|
||||
create mode 100644 arch/mips/ralink/dts/mt7620a_eval.dts
|
||||
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index 493411f..026e823 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -46,6 +46,10 @@ choice
|
||||
@@ -32,8 +30,6 @@ index 493411f..026e823 100644
|
||||
endchoice
|
||||
|
||||
endif
|
||||
diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
|
||||
index 040a986..18194fa 100644
|
||||
--- a/arch/mips/ralink/dts/Makefile
|
||||
+++ b/arch/mips/ralink/dts/Makefile
|
||||
@@ -1,3 +1,4 @@
|
||||
@@ -41,9 +37,6 @@ index 040a986..18194fa 100644
|
||||
obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
|
||||
obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o
|
||||
+obj-$(CONFIG_DTB_MT7620A_EVAL) := mt7620a_eval.dtb.o
|
||||
diff --git a/arch/mips/ralink/dts/mt7620a.dtsi b/arch/mips/ralink/dts/mt7620a.dtsi
|
||||
new file mode 100644
|
||||
index 0000000..08bf24f
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/dts/mt7620a.dtsi
|
||||
@@ -0,0 +1,58 @@
|
||||
@@ -105,9 +98,6 @@ index 0000000..08bf24f
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
diff --git a/arch/mips/ralink/dts/mt7620a_eval.dts b/arch/mips/ralink/dts/mt7620a_eval.dts
|
||||
new file mode 100644
|
||||
index 0000000..35eb874
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/dts/mt7620a_eval.dts
|
||||
@@ -0,0 +1,16 @@
|
||||
@@ -127,6 +117,3 @@ index 0000000..35eb874
|
||||
+ bootargs = "console=ttyS0,57600";
|
||||
+ };
|
||||
+};
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5178/
|
||||
arch/mips/kernel/setup.c | 20 ++++++++++++++++++++
|
||||
2 files changed, 21 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
|
||||
index b71dd5b..4d2cdea 100644
|
||||
--- a/arch/mips/include/asm/bootinfo.h
|
||||
+++ b/arch/mips/include/asm/bootinfo.h
|
||||
@@ -104,6 +104,7 @@ struct boot_mem_map {
|
||||
@@ -25,8 +23,6 @@ index b71dd5b..4d2cdea 100644
|
||||
|
||||
extern void prom_init(void);
|
||||
extern void prom_free_prom_memory(void);
|
||||
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
|
||||
index 4c774d5..7325793 100644
|
||||
--- a/arch/mips/kernel/setup.c
|
||||
+++ b/arch/mips/kernel/setup.c
|
||||
@@ -23,6 +23,7 @@
|
||||
@@ -37,7 +33,7 @@ index 4c774d5..7325793 100644
|
||||
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/bootinfo.h>
|
||||
@@ -122,6 +123,25 @@ void __init add_memory_region(phys_t start, phys_t size, long type)
|
||||
@@ -122,6 +123,25 @@ void __init add_memory_region(phys_t sta
|
||||
boot_mem_map.nr_map++;
|
||||
}
|
||||
|
||||
@@ -63,6 +59,3 @@ index 4c774d5..7325793 100644
|
||||
static void __init print_memory_map(void)
|
||||
{
|
||||
int i;
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,11 +13,9 @@ Patchwork: http://patchwork.linux-mips.org/patch/5179/
|
||||
arch/mips/ralink/common.h | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
|
||||
index 299119b..83144c3 100644
|
||||
--- a/arch/mips/ralink/common.h
|
||||
+++ b/arch/mips/ralink/common.h
|
||||
@@ -33,6 +33,11 @@ extern struct ralink_pinmux rt_gpio_pinmux;
|
||||
@@ -33,6 +33,11 @@ extern struct ralink_pinmux rt_gpio_pinm
|
||||
struct ralink_soc_info {
|
||||
unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
|
||||
unsigned char *compatible;
|
||||
@@ -29,6 +27,3 @@ index 299119b..83144c3 100644
|
||||
};
|
||||
extern struct ralink_soc_info soc_info;
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -15,8 +15,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5180/
|
||||
arch/mips/ralink/rt305x.c | 45 ++++++++++++++++++++++++++++
|
||||
2 files changed, 51 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/rt305x.h b/arch/mips/include/asm/mach-ralink/rt305x.h
|
||||
index 80cda8a..069bf37 100644
|
||||
--- a/arch/mips/include/asm/mach-ralink/rt305x.h
|
||||
+++ b/arch/mips/include/asm/mach-ralink/rt305x.h
|
||||
@@ -157,4 +157,10 @@ static inline int soc_is_rt5350(void)
|
||||
@@ -30,8 +28,6 @@ index 80cda8a..069bf37 100644
|
||||
+#define RT3352_MEM_SIZE_MAX 256
|
||||
+
|
||||
#endif
|
||||
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
|
||||
index 6aa3cb1..ca7ee3a 100644
|
||||
--- a/arch/mips/ralink/rt305x.c
|
||||
+++ b/arch/mips/ralink/rt305x.c
|
||||
@@ -122,6 +122,40 @@ struct ralink_pinmux rt_gpio_pinmux = {
|
||||
@@ -75,7 +71,7 @@ index 6aa3cb1..ca7ee3a 100644
|
||||
void __init ralink_clk_init(void)
|
||||
{
|
||||
unsigned long cpu_rate, sys_rate, wdt_rate, uart_rate;
|
||||
@@ -252,4 +286,15 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
|
||||
@@ -252,4 +286,15 @@ void prom_soc_init(struct ralink_soc_inf
|
||||
name,
|
||||
(id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
|
||||
(id & CHIP_ID_REV_MASK));
|
||||
@@ -91,6 +87,3 @@ index 6aa3cb1..ca7ee3a 100644
|
||||
+ soc_info->mem_size_max = RT3352_MEM_SIZE_MAX;
|
||||
+ }
|
||||
}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5181/
|
||||
arch/mips/ralink/rt288x.c | 4 ++++
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/rt288x.h b/arch/mips/include/asm/mach-ralink/rt288x.h
|
||||
index ad8b42d..03ad716 100644
|
||||
--- a/arch/mips/include/asm/mach-ralink/rt288x.h
|
||||
+++ b/arch/mips/include/asm/mach-ralink/rt288x.h
|
||||
@@ -46,4 +46,8 @@
|
||||
@@ -25,11 +23,9 @@ index ad8b42d..03ad716 100644
|
||||
+#define RT2880_MEM_SIZE_MAX 128
|
||||
+
|
||||
#endif
|
||||
diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c
|
||||
index 1e0788e..f87de1a 100644
|
||||
--- a/arch/mips/ralink/rt288x.c
|
||||
+++ b/arch/mips/ralink/rt288x.c
|
||||
@@ -136,4 +136,8 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
|
||||
@@ -136,4 +136,8 @@ void prom_soc_init(struct ralink_soc_inf
|
||||
name,
|
||||
(id >> CHIP_ID_ID_SHIFT) & CHIP_ID_ID_MASK,
|
||||
(id & CHIP_ID_REV_MASK));
|
||||
@@ -38,6 +34,3 @@ index 1e0788e..f87de1a 100644
|
||||
+ soc_info->mem_size_min = RT2880_MEM_SIZE_MIN;
|
||||
+ soc_info->mem_size_max = RT2880_MEM_SIZE_MAX;
|
||||
}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5182/
|
||||
arch/mips/ralink/rt3883.c | 4 ++++
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/rt3883.h b/arch/mips/include/asm/mach-ralink/rt3883.h
|
||||
index b91c6c1..058382f 100644
|
||||
--- a/arch/mips/include/asm/mach-ralink/rt3883.h
|
||||
+++ b/arch/mips/include/asm/mach-ralink/rt3883.h
|
||||
@@ -152,6 +152,7 @@
|
||||
@@ -33,11 +31,9 @@ index b91c6c1..058382f 100644
|
||||
+#define RT3883_MEM_SIZE_MAX 256
|
||||
+
|
||||
#endif /* _RT3883_REGS_H_ */
|
||||
diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c
|
||||
index 2d90aa9..afbf2ce 100644
|
||||
--- a/arch/mips/ralink/rt3883.c
|
||||
+++ b/arch/mips/ralink/rt3883.c
|
||||
@@ -239,4 +239,8 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
|
||||
@@ -239,4 +239,8 @@ void prom_soc_init(struct ralink_soc_inf
|
||||
name,
|
||||
(id >> RT3883_REVID_VER_ID_SHIFT) & RT3883_REVID_VER_ID_MASK,
|
||||
(id & RT3883_REVID_ECO_ID_MASK));
|
||||
@@ -46,6 +42,3 @@ index 2d90aa9..afbf2ce 100644
|
||||
+ soc_info->mem_size_min = RT3883_MEM_SIZE_MIN;
|
||||
+ soc_info->mem_size_max = RT3883_MEM_SIZE_MAX;
|
||||
}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5183/
|
||||
arch/mips/ralink/mt7620.c | 20 ++++++++++++++++++++
|
||||
2 files changed, 28 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h
|
||||
index b272649..9809972 100644
|
||||
--- a/arch/mips/include/asm/mach-ralink/mt7620.h
|
||||
+++ b/arch/mips/include/asm/mach-ralink/mt7620.h
|
||||
@@ -50,6 +50,14 @@
|
||||
@@ -31,11 +29,9 @@ index b272649..9809972 100644
|
||||
#define MT7620_GPIO_MODE_I2C BIT(0)
|
||||
#define MT7620_GPIO_MODE_UART0_SHIFT 2
|
||||
#define MT7620_GPIO_MODE_UART0_MASK 0x7
|
||||
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
|
||||
index eb00ab8..98ddb93 100644
|
||||
--- a/arch/mips/ralink/mt7620.c
|
||||
+++ b/arch/mips/ralink/mt7620.c
|
||||
@@ -211,4 +211,24 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
|
||||
@@ -211,4 +211,24 @@ void prom_soc_init(struct ralink_soc_inf
|
||||
|
||||
cfg0 = __raw_readl(sysc + SYSC_REG_SYSTEM_CONFIG0);
|
||||
dram_type = (cfg0 >> SYSCFG0_DRAM_TYPE_SHIFT) & SYSCFG0_DRAM_TYPE_MASK;
|
||||
@@ -60,6 +56,3 @@ index eb00ab8..98ddb93 100644
|
||||
+ }
|
||||
+ soc_info->mem_base = MT7620_DRAM_BASE;
|
||||
}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5184/
|
||||
arch/mips/ralink/of.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
|
||||
index 4165e70..fb15695 100644
|
||||
--- a/arch/mips/ralink/of.c
|
||||
+++ b/arch/mips/ralink/of.c
|
||||
@@ -11,6 +11,7 @@
|
||||
@@ -40,6 +38,3 @@ index 4165e70..fb15695 100644
|
||||
}
|
||||
|
||||
static int __init plat_of_setup(void)
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -11,13 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
1 file changed, 1 insertion(+)
|
||||
create mode 100644 dummy
|
||||
|
||||
diff --git a/dummy b/dummy
|
||||
new file mode 100644
|
||||
index 0000000..421376d
|
||||
--- /dev/null
|
||||
+++ b/dummy
|
||||
@@ -0,0 +1 @@
|
||||
+dummy
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -16,8 +16,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
4 files changed, 82 insertions(+), 1 deletion(-)
|
||||
create mode 100644 arch/mips/ralink/pinmux.c
|
||||
|
||||
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
|
||||
index 38cf1a8..341b4de 100644
|
||||
--- a/arch/mips/ralink/Makefile
|
||||
+++ b/arch/mips/ralink/Makefile
|
||||
@@ -6,7 +6,7 @@
|
||||
@@ -29,19 +27,15 @@ index 38cf1a8..341b4de 100644
|
||||
|
||||
obj-$(CONFIG_SOC_RT288X) += rt288x.o
|
||||
obj-$(CONFIG_SOC_RT305X) += rt305x.o
|
||||
diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
|
||||
index 83144c3..f113fd6 100644
|
||||
--- a/arch/mips/ralink/common.h
|
||||
+++ b/arch/mips/ralink/common.h
|
||||
@@ -50,4 +50,6 @@ extern void prom_soc_init(struct ralink_soc_info *soc_info);
|
||||
@@ -50,4 +50,6 @@ extern void prom_soc_init(struct ralink_
|
||||
|
||||
__iomem void *plat_of_remap_node(const char *node);
|
||||
|
||||
+void ralink_pinmux(void);
|
||||
+
|
||||
#endif /* _RALINK_COMMON_H__ */
|
||||
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
|
||||
index fb15695..f916774 100644
|
||||
--- a/arch/mips/ralink/of.c
|
||||
+++ b/arch/mips/ralink/of.c
|
||||
@@ -110,6 +110,8 @@ static int __init plat_of_setup(void)
|
||||
@@ -53,9 +47,6 @@ index fb15695..f916774 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/arch/mips/ralink/pinmux.c b/arch/mips/ralink/pinmux.c
|
||||
new file mode 100644
|
||||
index 0000000..1720216
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/pinmux.c
|
||||
@@ -0,0 +1,77 @@
|
||||
@@ -136,6 +127,3 @@ index 0000000..1720216
|
||||
+
|
||||
+ rt_sysc_w32(mode, SYSC_REG_GPIO_MODE);
|
||||
+}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
2 files changed, 193 insertions(+), 1 deletion(-)
|
||||
create mode 100644 arch/mips/ralink/timer.c
|
||||
|
||||
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
|
||||
index 341b4de..cae7d88 100644
|
||||
--- a/arch/mips/ralink/Makefile
|
||||
+++ b/arch/mips/ralink/Makefile
|
||||
@@ -6,7 +6,7 @@
|
||||
@@ -25,9 +23,6 @@ index 341b4de..cae7d88 100644
|
||||
|
||||
obj-$(CONFIG_SOC_RT288X) += rt288x.o
|
||||
obj-$(CONFIG_SOC_RT305X) += rt305x.o
|
||||
diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c
|
||||
new file mode 100644
|
||||
index 0000000..0a6856c
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/timer.c
|
||||
@@ -0,0 +1,192 @@
|
||||
@@ -223,6 +218,3 @@ index 0000000..0a6856c
|
||||
+MODULE_DESCRIPTION("Ralink RT2880 timer");
|
||||
+MODULE_AUTHOR("John Crispin <blogic@openwrt.org");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -8,11 +8,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
arch/mips/include/asm/mach-ralink/ralink_regs.h | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/ralink_regs.h b/arch/mips/include/asm/mach-ralink/ralink_regs.h
|
||||
index 5a508f9..bd93014 100644
|
||||
--- a/arch/mips/include/asm/mach-ralink/ralink_regs.h
|
||||
+++ b/arch/mips/include/asm/mach-ralink/ralink_regs.h
|
||||
@@ -26,6 +26,13 @@ static inline u32 rt_sysc_r32(unsigned reg)
|
||||
@@ -26,6 +26,13 @@ static inline u32 rt_sysc_r32(unsigned r
|
||||
return __raw_readl(rt_sysc_membase + reg);
|
||||
}
|
||||
|
||||
@@ -26,6 +24,3 @@ index 5a508f9..bd93014 100644
|
||||
static inline void rt_memc_w32(u32 val, unsigned reg)
|
||||
{
|
||||
__raw_writel(val, rt_memc_membase + reg);
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -10,11 +10,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
arch/mips/ralink/mt7620.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
|
||||
index 98ddb93..28350d0 100644
|
||||
--- a/arch/mips/ralink/mt7620.c
|
||||
+++ b/arch/mips/ralink/mt7620.c
|
||||
@@ -214,16 +214,19 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
|
||||
@@ -214,16 +214,19 @@ void prom_soc_init(struct ralink_soc_inf
|
||||
|
||||
switch (dram_type) {
|
||||
case SYSCFG0_DRAM_TYPE_SDRAM:
|
||||
@@ -34,6 +32,3 @@ index 98ddb93..28350d0 100644
|
||||
soc_info->mem_size_min = MT7620_DDR2_SIZE_MIN;
|
||||
soc_info->mem_size_max = MT7620_DDR2_SIZE_MAX;
|
||||
break;
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -10,8 +10,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
arch/mips/ralink/mt7620.c | 26 ++++++++++++++++++++++++++
|
||||
1 file changed, 26 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
|
||||
index 28350d0..69729a5 100644
|
||||
--- a/arch/mips/ralink/mt7620.c
|
||||
+++ b/arch/mips/ralink/mt7620.c
|
||||
@@ -20,6 +20,22 @@
|
||||
@@ -37,7 +35,7 @@ index 28350d0..69729a5 100644
|
||||
/* does the board have sdram or ddram */
|
||||
static int dram_type;
|
||||
|
||||
@@ -187,6 +203,8 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
|
||||
@@ -187,6 +203,8 @@ void prom_soc_init(struct ralink_soc_inf
|
||||
u32 n1;
|
||||
u32 rev;
|
||||
u32 cfg0;
|
||||
@@ -46,7 +44,7 @@ index 28350d0..69729a5 100644
|
||||
|
||||
n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
|
||||
n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
|
||||
@@ -234,4 +252,12 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
|
||||
@@ -234,4 +252,12 @@ void prom_soc_init(struct ralink_soc_inf
|
||||
BUG();
|
||||
}
|
||||
soc_info->mem_base = MT7620_DRAM_BASE;
|
||||
@@ -59,6 +57,3 @@ index 28350d0..69729a5 100644
|
||||
+ pr_info("Digital PMU set to %s control\n",
|
||||
+ (pmu1 & DIG_SW_SEL) ? ("sw") : ("hw"));
|
||||
}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
2 files changed, 50 insertions(+)
|
||||
create mode 100644 arch/mips/ralink/bootrom.c
|
||||
|
||||
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
|
||||
index cae7d88..5fa6129 100644
|
||||
--- a/arch/mips/ralink/Makefile
|
||||
+++ b/arch/mips/ralink/Makefile
|
||||
@@ -15,4 +15,6 @@ obj-$(CONFIG_SOC_MT7620) += mt7620.o
|
||||
@@ -24,9 +22,6 @@ index cae7d88..5fa6129 100644
|
||||
+obj-$(CONFIG_DEBUG_FS) += bootrom.o
|
||||
+
|
||||
obj-y += dts/
|
||||
diff --git a/arch/mips/ralink/bootrom.c b/arch/mips/ralink/bootrom.c
|
||||
new file mode 100644
|
||||
index 0000000..f926f6f
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/bootrom.c
|
||||
@@ -0,0 +1,48 @@
|
||||
@@ -78,6 +73,3 @@ index 0000000..f926f6f
|
||||
+}
|
||||
+
|
||||
+postcore_initcall(bootrom_setup);
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
arch/mips/ralink/of.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
|
||||
index f916774..b25c1f2 100644
|
||||
--- a/arch/mips/ralink/of.c
|
||||
+++ b/arch/mips/ralink/of.c
|
||||
@@ -88,7 +88,7 @@ void __init plat_mem_setup(void)
|
||||
@@ -24,6 +22,3 @@ index f916774..b25c1f2 100644
|
||||
BOOT_MEM_RAM);
|
||||
else
|
||||
detect_memory_region(soc_info.mem_base,
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -9,11 +9,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
arch/mips/kernel/cevt-r4k.c | 39 ++++++++++++++++++++++++++-------------
|
||||
1 file changed, 26 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
|
||||
index 07b847d..d5d94e5 100644
|
||||
--- a/arch/mips/kernel/cevt-r4k.c
|
||||
+++ b/arch/mips/kernel/cevt-r4k.c
|
||||
@@ -39,12 +39,6 @@ static int mips_next_event(unsigned long delta,
|
||||
@@ -39,12 +39,6 @@ static int mips_next_event(unsigned long
|
||||
|
||||
#endif /* CONFIG_MIPS_MT_SMTC */
|
||||
|
||||
@@ -26,7 +24,7 @@ index 07b847d..d5d94e5 100644
|
||||
DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device);
|
||||
int cp0_timer_irq_installed;
|
||||
|
||||
@@ -89,6 +83,32 @@ struct irqaction c0_compare_irqaction = {
|
||||
@@ -89,6 +83,32 @@ struct irqaction c0_compare_irqaction =
|
||||
.name = "timer",
|
||||
};
|
||||
|
||||
@@ -73,6 +71,3 @@ index 07b847d..d5d94e5 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -10,8 +10,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
2 files changed, 88 insertions(+), 1 deletion(-)
|
||||
create mode 100644 arch/mips/ralink/ill_acc.c
|
||||
|
||||
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
|
||||
index 5fa6129..55a5bfc 100644
|
||||
--- a/arch/mips/ralink/Makefile
|
||||
+++ b/arch/mips/ralink/Makefile
|
||||
@@ -6,7 +6,7 @@
|
||||
@@ -23,9 +21,6 @@ index 5fa6129..55a5bfc 100644
|
||||
|
||||
obj-$(CONFIG_SOC_RT288X) += rt288x.o
|
||||
obj-$(CONFIG_SOC_RT305X) += rt305x.o
|
||||
diff --git a/arch/mips/ralink/ill_acc.c b/arch/mips/ralink/ill_acc.c
|
||||
new file mode 100644
|
||||
index 0000000..4a3f696
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/ill_acc.c
|
||||
@@ -0,0 +1,87 @@
|
||||
@@ -116,6 +111,3 @@ index 0000000..4a3f696
|
||||
+}
|
||||
+
|
||||
+arch_initcall(ill_acc_of_setup);
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
arch/mips/ralink/of.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
|
||||
index b25c1f2..8efb02b 100644
|
||||
--- a/arch/mips/ralink/of.c
|
||||
+++ b/arch/mips/ralink/of.c
|
||||
@@ -74,7 +74,7 @@ void __init device_tree_init(void)
|
||||
@@ -24,6 +22,3 @@ index b25c1f2..8efb02b 100644
|
||||
}
|
||||
|
||||
void __init plat_mem_setup(void)
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -8,8 +8,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
arch/mips/ralink/mt7620.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
|
||||
index 69729a5..08c96db6 100644
|
||||
--- a/arch/mips/ralink/mt7620.c
|
||||
+++ b/arch/mips/ralink/mt7620.c
|
||||
@@ -183,6 +183,7 @@ void __init ralink_clk_init(void)
|
||||
@@ -20,6 +18,3 @@ index 69729a5..08c96db6 100644
|
||||
ralink_clk_add("10000c00.uartlite", 40000000);
|
||||
}
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -21,8 +21,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
create mode 100644 arch/mips/ralink/dts/rt5350.dtsi
|
||||
create mode 100644 arch/mips/ralink/dts/rt5350_eval.dts
|
||||
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index 026e823..38540a4 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -42,6 +42,10 @@ choice
|
||||
@@ -47,8 +45,6 @@ index 026e823..38540a4 100644
|
||||
endchoice
|
||||
|
||||
endif
|
||||
diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
|
||||
index 18194fa..0bd12b5 100644
|
||||
--- a/arch/mips/ralink/dts/Makefile
|
||||
+++ b/arch/mips/ralink/dts/Makefile
|
||||
@@ -1,4 +1,6 @@
|
||||
@@ -58,8 +54,6 @@ index 18194fa..0bd12b5 100644
|
||||
obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o
|
||||
obj-$(CONFIG_DTB_MT7620A_EVAL) := mt7620a_eval.dtb.o
|
||||
+obj-$(CONFIG_DTB_MT7620A_MT7610E_EVAL) := mt7620a_mt7610e_eval.dtb.o
|
||||
diff --git a/arch/mips/ralink/dts/mt7620a.dtsi b/arch/mips/ralink/dts/mt7620a.dtsi
|
||||
index 08bf24f..104abfb 100644
|
||||
--- a/arch/mips/ralink/dts/mt7620a.dtsi
|
||||
+++ b/arch/mips/ralink/dts/mt7620a.dtsi
|
||||
@@ -25,14 +25,36 @@
|
||||
@@ -331,8 +325,6 @@ index 08bf24f..104abfb 100644
|
||||
+ status = "disabled";
|
||||
};
|
||||
};
|
||||
diff --git a/arch/mips/ralink/dts/mt7620a_eval.dts b/arch/mips/ralink/dts/mt7620a_eval.dts
|
||||
index 35eb874..b56f449 100644
|
||||
--- a/arch/mips/ralink/dts/mt7620a_eval.dts
|
||||
+++ b/arch/mips/ralink/dts/mt7620a_eval.dts
|
||||
@@ -13,4 +13,115 @@
|
||||
@@ -451,9 +443,6 @@ index 35eb874..b56f449 100644
|
||||
+ };
|
||||
+ };
|
||||
};
|
||||
diff --git a/arch/mips/ralink/dts/mt7620a_mt7610e_eval.dts b/arch/mips/ralink/dts/mt7620a_mt7610e_eval.dts
|
||||
new file mode 100644
|
||||
index 0000000..0d7755b
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/dts/mt7620a_mt7610e_eval.dts
|
||||
@@ -0,0 +1,99 @@
|
||||
@@ -556,8 +545,6 @@ index 0000000..0d7755b
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
diff --git a/arch/mips/ralink/dts/rt2880.dtsi b/arch/mips/ralink/dts/rt2880.dtsi
|
||||
index 182afde..2a34b8d 100644
|
||||
--- a/arch/mips/ralink/dts/rt2880.dtsi
|
||||
+++ b/arch/mips/ralink/dts/rt2880.dtsi
|
||||
@@ -55,4 +55,21 @@
|
||||
@@ -582,8 +569,6 @@ index 182afde..2a34b8d 100644
|
||||
+ };
|
||||
+ };
|
||||
};
|
||||
diff --git a/arch/mips/ralink/dts/rt2880_eval.dts b/arch/mips/ralink/dts/rt2880_eval.dts
|
||||
index 322d700..58a1edf 100644
|
||||
--- a/arch/mips/ralink/dts/rt2880_eval.dts
|
||||
+++ b/arch/mips/ralink/dts/rt2880_eval.dts
|
||||
@@ -43,4 +43,10 @@
|
||||
@@ -597,8 +582,6 @@ index 322d700..58a1edf 100644
|
||||
+ ralink,fixed-link = <1000 1 1 1>;
|
||||
+ };
|
||||
};
|
||||
diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi
|
||||
index ef7da1e..b1ac940 100644
|
||||
--- a/arch/mips/ralink/dts/rt3050.dtsi
|
||||
+++ b/arch/mips/ralink/dts/rt3050.dtsi
|
||||
@@ -1,7 +1,7 @@
|
||||
@@ -651,8 +634,6 @@ index ef7da1e..b1ac940 100644
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
};
|
||||
diff --git a/arch/mips/ralink/dts/rt3052_eval.dts b/arch/mips/ralink/dts/rt3052_eval.dts
|
||||
index df17f5f..df02957 100644
|
||||
--- a/arch/mips/ralink/dts/rt3052_eval.dts
|
||||
+++ b/arch/mips/ralink/dts/rt3052_eval.dts
|
||||
@@ -3,7 +3,7 @@
|
||||
@@ -693,9 +674,6 @@ index df17f5f..df02957 100644
|
||||
+ ralink,portmap = <0x2f>;
|
||||
+ };
|
||||
};
|
||||
diff --git a/arch/mips/ralink/dts/rt5350.dtsi b/arch/mips/ralink/dts/rt5350.dtsi
|
||||
new file mode 100644
|
||||
index 0000000..3d6b3bc
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/dts/rt5350.dtsi
|
||||
@@ -0,0 +1,227 @@
|
||||
@@ -926,9 +904,6 @@ index 0000000..3d6b3bc
|
||||
+ interrupts = <18>;
|
||||
+ };
|
||||
+};
|
||||
diff --git a/arch/mips/ralink/dts/rt5350_eval.dts b/arch/mips/ralink/dts/rt5350_eval.dts
|
||||
new file mode 100644
|
||||
index 0000000..ab92043
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/ralink/dts/rt5350_eval.dts
|
||||
@@ -0,0 +1,69 @@
|
||||
@@ -1001,6 +976,3 @@ index 0000000..ab92043
|
||||
+ ralink,portmap = <0x2f>;
|
||||
+ };
|
||||
+};
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -17,11 +17,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
drivers/clocksource/vt8500_timer.c | 14 +-------------
|
||||
4 files changed, 5 insertions(+), 39 deletions(-)
|
||||
|
||||
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c
|
||||
index 50c68fe..766611d 100644
|
||||
--- a/drivers/clocksource/bcm2835_timer.c
|
||||
+++ b/drivers/clocksource/bcm2835_timer.c
|
||||
@@ -95,23 +95,13 @@ static irqreturn_t bcm2835_time_interrupt(int irq, void *dev_id)
|
||||
@@ -95,23 +95,13 @@ static irqreturn_t bcm2835_time_interrup
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,8 +44,6 @@ index 50c68fe..766611d 100644
|
||||
base = of_iomap(node, 0);
|
||||
if (!base)
|
||||
panic("Can't remap registers");
|
||||
diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c
|
||||
index bdabdaa..3ef11fb 100644
|
||||
--- a/drivers/clocksource/clksrc-of.c
|
||||
+++ b/drivers/clocksource/clksrc-of.c
|
||||
@@ -26,10 +26,10 @@ void __init clocksource_of_init(void)
|
||||
@@ -63,11 +59,9 @@ index bdabdaa..3ef11fb 100644
|
||||
+ init_func(np);
|
||||
}
|
||||
}
|
||||
diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c
|
||||
index 0bde03f..e698d8e 100644
|
||||
--- a/drivers/clocksource/tegra20_timer.c
|
||||
+++ b/drivers/clocksource/tegra20_timer.c
|
||||
@@ -154,29 +154,17 @@ static struct irqaction tegra_timer_irq = {
|
||||
@@ -154,29 +154,17 @@ static struct irqaction tegra_timer_irq
|
||||
.dev_id = &tegra_clockevent,
|
||||
};
|
||||
|
||||
@@ -98,8 +92,6 @@ index 0bde03f..e698d8e 100644
|
||||
timer_reg_base = of_iomap(np, 0);
|
||||
if (!timer_reg_base) {
|
||||
pr_err("Can't map timer registers\n");
|
||||
diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c
|
||||
index 8efc86b..2422552 100644
|
||||
--- a/drivers/clocksource/vt8500_timer.c
|
||||
+++ b/drivers/clocksource/vt8500_timer.c
|
||||
@@ -129,22 +129,10 @@ static struct irqaction irq = {
|
||||
@@ -126,6 +118,3 @@ index 8efc86b..2422552 100644
|
||||
regbase = of_iomap(np, 0);
|
||||
if (!regbase) {
|
||||
pr_err("%s: Missing iobase description in Device Tree\n",
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -15,8 +15,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
6 files changed, 173 insertions(+)
|
||||
create mode 100644 drivers/clocksource/cevt-rt3352.c
|
||||
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index 38540a4..3fe032c 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -14,6 +14,7 @@ choice
|
||||
@@ -35,8 +33,6 @@ index 38540a4..3fe032c 100644
|
||||
|
||||
endchoice
|
||||
|
||||
diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c
|
||||
index 8dfa22f..bba0cdf 100644
|
||||
--- a/arch/mips/ralink/clk.c
|
||||
+++ b/arch/mips/ralink/clk.c
|
||||
@@ -69,4 +69,5 @@ void __init plat_time_init(void)
|
||||
@@ -45,8 +41,6 @@ index 8dfa22f..bba0cdf 100644
|
||||
clk_put(clk);
|
||||
+ clocksource_of_init();
|
||||
}
|
||||
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
|
||||
index e507ab7..1216c16 100644
|
||||
--- a/drivers/clocksource/Kconfig
|
||||
+++ b/drivers/clocksource/Kconfig
|
||||
@@ -7,6 +7,12 @@ config CLKSRC_I8253
|
||||
@@ -62,8 +56,6 @@ index e507ab7..1216c16 100644
|
||||
config I8253_LOCK
|
||||
bool
|
||||
|
||||
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
|
||||
index 4d8283a..db47a4e 100644
|
||||
--- a/drivers/clocksource/Makefile
|
||||
+++ b/drivers/clocksource/Makefile
|
||||
@@ -10,6 +10,7 @@ obj-$(CONFIG_SH_TIMER_TMU) += sh_tmu.o
|
||||
@@ -74,9 +66,6 @@ index 4d8283a..db47a4e 100644
|
||||
obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o
|
||||
obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o
|
||||
obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nomadik-mtu.o
|
||||
diff --git a/drivers/clocksource/cevt-rt3352.c b/drivers/clocksource/cevt-rt3352.c
|
||||
new file mode 100644
|
||||
index 0000000..bd50edd
|
||||
--- /dev/null
|
||||
+++ b/drivers/clocksource/cevt-rt3352.c
|
||||
@@ -0,0 +1,162 @@
|
||||
@@ -242,8 +231,6 @@ index 0000000..bd50edd
|
||||
+}
|
||||
+
|
||||
+CLOCKSOURCE_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init);
|
||||
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
|
||||
index 27cfda4..08ed5e1 100644
|
||||
--- a/include/linux/clocksource.h
|
||||
+++ b/include/linux/clocksource.h
|
||||
@@ -340,6 +340,7 @@ extern void clocksource_of_init(void);
|
||||
@@ -254,6 +241,3 @@ index 27cfda4..08ed5e1 100644
|
||||
#define CLOCKSOURCE_OF_DECLARE(name, compat, fn)
|
||||
#endif
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -17,8 +17,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
create mode 100644 arch/mips/include/asm/mach-ralink/gpio.h
|
||||
create mode 100644 drivers/gpio/gpio-ralink.c
|
||||
|
||||
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
|
||||
index e4da4f8..b237c50 100644
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -443,6 +443,7 @@ config RALINK
|
||||
@@ -29,9 +27,6 @@ index e4da4f8..b237c50 100644
|
||||
|
||||
config SGI_IP22
|
||||
bool "SGI IP22 (Indy/Indigo2)"
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/gpio.h b/arch/mips/include/asm/mach-ralink/gpio.h
|
||||
new file mode 100644
|
||||
index 0000000..f68ee16
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-ralink/gpio.h
|
||||
@@ -0,0 +1,24 @@
|
||||
@@ -59,8 +54,6 @@ index 0000000..f68ee16
|
||||
+#define gpio_to_irq __gpio_to_irq
|
||||
+
|
||||
+#endif /* __ASM_MACH_RALINK_GPIO_H */
|
||||
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
|
||||
index 93aaadf..29add97 100644
|
||||
--- a/drivers/gpio/Kconfig
|
||||
+++ b/drivers/gpio/Kconfig
|
||||
@@ -204,6 +204,12 @@ config GPIO_PXA
|
||||
@@ -76,11 +69,9 @@ index 93aaadf..29add97 100644
|
||||
config GPIO_SPEAR_SPICS
|
||||
bool "ST SPEAr13xx SPI Chip Select as GPIO support"
|
||||
depends on PLAT_SPEAR
|
||||
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
|
||||
index 22e07bc..f7b6603 100644
|
||||
--- a/drivers/gpio/Makefile
|
||||
+++ b/drivers/gpio/Makefile
|
||||
@@ -55,6 +55,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o
|
||||
@@ -55,6 +55,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf85
|
||||
obj-$(CONFIG_GPIO_PCH) += gpio-pch.o
|
||||
obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
|
||||
obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
|
||||
@@ -88,9 +79,6 @@ index 22e07bc..f7b6603 100644
|
||||
obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o
|
||||
obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
|
||||
obj-$(CONFIG_PLAT_SAMSUNG) += gpio-samsung.o
|
||||
diff --git a/drivers/gpio/gpio-ralink.c b/drivers/gpio/gpio-ralink.c
|
||||
new file mode 100644
|
||||
index 0000000..12984f1
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpio/gpio-ralink.c
|
||||
@@ -0,0 +1,326 @@
|
||||
@@ -420,6 +408,3 @@ index 0000000..12984f1
|
||||
+}
|
||||
+
|
||||
+subsys_initcall(ralink_gpio_init);
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
3 files changed, 482 insertions(+)
|
||||
create mode 100644 drivers/spi/spi-ralink.c
|
||||
|
||||
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
|
||||
index 2be0de9..a7de751 100644
|
||||
--- a/drivers/spi/Kconfig
|
||||
+++ b/drivers/spi/Kconfig
|
||||
@@ -327,6 +327,12 @@ config SPI_RSPI
|
||||
@@ -336,6 +336,12 @@ config SPI_RSPI
|
||||
help
|
||||
SPI driver for Renesas RSPI blocks.
|
||||
|
||||
@@ -30,11 +28,9 @@ index 2be0de9..a7de751 100644
|
||||
config SPI_S3C24XX
|
||||
tristate "Samsung S3C24XX series SPI"
|
||||
depends on ARCH_S3C24XX
|
||||
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
|
||||
index e53c309..a4b3c5b 100644
|
||||
--- a/drivers/spi/Makefile
|
||||
+++ b/drivers/spi/Makefile
|
||||
@@ -53,6 +53,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA) += spi-pxa2xx-dma.o
|
||||
@@ -54,6 +54,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_
|
||||
obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx-platform.o
|
||||
obj-$(CONFIG_SPI_PXA2XX_PCI) += spi-pxa2xx-pci.o
|
||||
obj-$(CONFIG_SPI_RSPI) += spi-rspi.o
|
||||
@@ -42,9 +38,6 @@ index e53c309..a4b3c5b 100644
|
||||
obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o
|
||||
spi-s3c24xx-hw-y := spi-s3c24xx.o
|
||||
spi-s3c24xx-hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi-s3c24xx-fiq.o
|
||||
diff --git a/drivers/spi/spi-ralink.c b/drivers/spi/spi-ralink.c
|
||||
new file mode 100644
|
||||
index 0000000..b07cbaa
|
||||
--- /dev/null
|
||||
+++ b/drivers/spi/spi-ralink.c
|
||||
@@ -0,0 +1,475 @@
|
||||
@@ -523,6 +516,3 @@ index 0000000..b07cbaa
|
||||
+MODULE_AUTHOR("Sergiy <piratfm@gmail.com>");
|
||||
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -11,11 +11,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
drivers/tty/serial/of_serial.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
|
||||
index b025d54..42f8550 100644
|
||||
--- a/drivers/tty/serial/of_serial.c
|
||||
+++ b/drivers/tty/serial/of_serial.c
|
||||
@@ -98,7 +98,10 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
|
||||
@@ -98,7 +98,10 @@ static int of_platform_serial_setup(stru
|
||||
port->regshift = prop;
|
||||
|
||||
port->irq = irq_of_parse_and_map(np, 0);
|
||||
@@ -27,6 +25,3 @@ index b025d54..42f8550 100644
|
||||
if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {
|
||||
switch (prop) {
|
||||
case 1:
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -10,8 +10,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
drivers/tty/serial/8250/Kconfig | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
|
||||
index 80fe91e..f6d6820 100644
|
||||
--- a/drivers/tty/serial/8250/Kconfig
|
||||
+++ b/drivers/tty/serial/8250/Kconfig
|
||||
@@ -296,7 +296,7 @@ config SERIAL_8250_EM
|
||||
@@ -23,6 +21,3 @@ index 80fe91e..f6d6820 100644
|
||||
help
|
||||
If you have a Ralink RT288x/RT305x SoC based board and want to use the
|
||||
serial port, say Y to this option. The driver can handle up to 2 serial
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
create mode 100644 drivers/mmc/host/mt6575_sd.h
|
||||
create mode 100644 drivers/mmc/host/sdhci-mt7620.c
|
||||
|
||||
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
|
||||
index d88219e..aa47e64 100644
|
||||
--- a/drivers/mmc/host/Kconfig
|
||||
+++ b/drivers/mmc/host/Kconfig
|
||||
@@ -249,6 +249,17 @@ config MMC_SDHCI_BCM2835
|
||||
@@ -35,11 +33,9 @@ index d88219e..aa47e64 100644
|
||||
config MMC_OMAP
|
||||
tristate "TI OMAP Multimedia Card Interface support"
|
||||
depends on ARCH_OMAP
|
||||
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
|
||||
index c380e3c..3b81db4 100644
|
||||
--- a/drivers/mmc/host/Makefile
|
||||
+++ b/drivers/mmc/host/Makefile
|
||||
@@ -60,6 +60,7 @@ obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-tegra.o
|
||||
@@ -61,6 +61,7 @@ obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-
|
||||
obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o
|
||||
obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o
|
||||
obj-$(CONFIG_MMC_SDHCI_BCM2835) += sdhci-bcm2835.o
|
||||
@@ -47,9 +43,6 @@ index c380e3c..3b81db4 100644
|
||||
|
||||
ifeq ($(CONFIG_CB710_DEBUG),y)
|
||||
CFLAGS-cb710-mmc += -DDEBUG
|
||||
diff --git a/drivers/mmc/host/mt6575_sd.h b/drivers/mmc/host/mt6575_sd.h
|
||||
new file mode 100644
|
||||
index 0000000..406382c
|
||||
--- /dev/null
|
||||
+++ b/drivers/mmc/host/mt6575_sd.h
|
||||
@@ -0,0 +1,1068 @@
|
||||
@@ -1121,9 +1114,6 @@ index 0000000..406382c
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
diff --git a/drivers/mmc/host/sdhci-mt7620.c b/drivers/mmc/host/sdhci-mt7620.c
|
||||
new file mode 100644
|
||||
index 0000000..a3cb5e4
|
||||
--- /dev/null
|
||||
+++ b/drivers/mmc/host/sdhci-mt7620.c
|
||||
@@ -0,0 +1,2314 @@
|
||||
@@ -3441,6 +3431,3 @@ index 0000000..a3cb5e4
|
||||
+MODULE_AUTHOR("Infinity Chen <infinity.chen@mediatek.com>");
|
||||
+
|
||||
+EXPORT_SYMBOL(msdc_6575_host);
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
create mode 100644 drivers/dma/ralink_gdma.c
|
||||
create mode 100644 drivers/dma/ralink_gdma.h
|
||||
|
||||
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
|
||||
index aeaea32..751cdc4 100644
|
||||
--- a/drivers/dma/Kconfig
|
||||
+++ b/drivers/dma/Kconfig
|
||||
@@ -322,6 +322,13 @@ config MMP_PDMA
|
||||
@@ -31,8 +29,6 @@ index aeaea32..751cdc4 100644
|
||||
config DMA_ENGINE
|
||||
bool
|
||||
|
||||
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
|
||||
index 488e3ff..f69e07e 100644
|
||||
--- a/drivers/dma/Makefile
|
||||
+++ b/drivers/dma/Makefile
|
||||
@@ -37,3 +37,4 @@ obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o
|
||||
@@ -40,9 +36,6 @@ index 488e3ff..f69e07e 100644
|
||||
obj-$(CONFIG_DMA_OMAP) += omap-dma.o
|
||||
obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o
|
||||
+obj-$(CONFIG_RALINK_GDMA) += ralink_gdma.o
|
||||
diff --git a/drivers/dma/ralink_gdma.c b/drivers/dma/ralink_gdma.c
|
||||
new file mode 100644
|
||||
index 0000000..be7c317
|
||||
--- /dev/null
|
||||
+++ b/drivers/dma/ralink_gdma.c
|
||||
@@ -0,0 +1,229 @@
|
||||
@@ -275,9 +268,6 @@ index 0000000..be7c317
|
||||
+MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
|
||||
+MODULE_DESCRIPTION("DMA engine driver for Ralink DMA engine");
|
||||
+MODULE_LICENSE("GPL");
|
||||
diff --git a/drivers/dma/ralink_gdma.h b/drivers/dma/ralink_gdma.h
|
||||
new file mode 100644
|
||||
index 0000000..73e1948
|
||||
--- /dev/null
|
||||
+++ b/drivers/dma/ralink_gdma.h
|
||||
@@ -0,0 +1,55 @@
|
||||
@@ -336,6 +326,3 @@ index 0000000..73e1948
|
||||
+#define RT_DMA_DONEINT (RALINK_GDMA_BASE + 0x204)
|
||||
+
|
||||
+#endif
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
3 files changed, 283 insertions(+)
|
||||
create mode 100644 arch/mips/pci/pci-rt2880.c
|
||||
|
||||
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
|
||||
index 2cb1d31..77974ba 100644
|
||||
--- a/arch/mips/pci/Makefile
|
||||
+++ b/arch/mips/pci/Makefile
|
||||
@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1480.o pci-bcm1480ht.o
|
||||
@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1
|
||||
obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o
|
||||
obj-$(CONFIG_LANTIQ) += fixup-lantiq.o
|
||||
obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o
|
||||
@@ -25,9 +23,6 @@ index 2cb1d31..77974ba 100644
|
||||
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
|
||||
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
|
||||
obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
|
||||
diff --git a/arch/mips/pci/pci-rt2880.c b/arch/mips/pci/pci-rt2880.c
|
||||
new file mode 100644
|
||||
index 0000000..e2c4730
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/pci/pci-rt2880.c
|
||||
@@ -0,0 +1,281 @@
|
||||
@@ -312,8 +307,6 @@ index 0000000..e2c4730
|
||||
+}
|
||||
+
|
||||
+arch_initcall(pcibios_init);
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index 3fe032c..c0ac93a 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -8,6 +8,7 @@ choice
|
||||
@@ -324,6 +317,3 @@ index 3fe032c..c0ac93a 100644
|
||||
|
||||
config SOC_RT305X
|
||||
bool "RT305x"
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
3 files changed, 642 insertions(+)
|
||||
create mode 100644 arch/mips/pci/pci-rt3883.c
|
||||
|
||||
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
|
||||
index 77974ba..3cbfd9b 100644
|
||||
--- a/arch/mips/pci/Makefile
|
||||
+++ b/arch/mips/pci/Makefile
|
||||
@@ -42,6 +42,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o
|
||||
@@ -42,6 +42,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops
|
||||
obj-$(CONFIG_LANTIQ) += fixup-lantiq.o
|
||||
obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o
|
||||
obj-$(CONFIG_SOC_RT2880) += pci-rt2880.o
|
||||
@@ -25,9 +23,6 @@ index 77974ba..3cbfd9b 100644
|
||||
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
|
||||
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
|
||||
obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
|
||||
diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
|
||||
new file mode 100644
|
||||
index 0000000..212c90b
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/pci/pci-rt3883.c
|
||||
@@ -0,0 +1,640 @@
|
||||
@@ -671,8 +666,6 @@ index 0000000..212c90b
|
||||
+}
|
||||
+
|
||||
+postcore_initcall(rt3883_pci_init);
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index c0ac93a..2fbe93c 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -21,6 +21,7 @@ choice
|
||||
@@ -683,6 +676,3 @@ index c0ac93a..2fbe93c 100644
|
||||
|
||||
config SOC_MT7620
|
||||
bool "MT7620"
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
3 files changed, 365 insertions(+)
|
||||
create mode 100644 arch/mips/pci/pci-mt7620a.c
|
||||
|
||||
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
|
||||
index 3cbfd9b..025d3a7 100644
|
||||
--- a/arch/mips/pci/Makefile
|
||||
+++ b/arch/mips/pci/Makefile
|
||||
@@ -43,6 +43,7 @@ obj-$(CONFIG_LANTIQ) += fixup-lantiq.o
|
||||
@@ -23,9 +21,6 @@ index 3cbfd9b..025d3a7 100644
|
||||
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
|
||||
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
|
||||
obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
|
||||
diff --git a/arch/mips/pci/pci-mt7620a.c b/arch/mips/pci/pci-mt7620a.c
|
||||
new file mode 100644
|
||||
index 0000000..271763c
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/pci/pci-mt7620a.c
|
||||
@@ -0,0 +1,363 @@
|
||||
@@ -392,8 +387,6 @@ index 0000000..271763c
|
||||
+}
|
||||
+
|
||||
+arch_initcall(mt7620a_pci_init);
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index 2fbe93c..c8d5b6c 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -26,6 +26,7 @@ choice
|
||||
@@ -404,6 +397,3 @@ index 2fbe93c..c8d5b6c 100644
|
||||
|
||||
endchoice
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
4 files changed, 217 insertions(+)
|
||||
create mode 100644 drivers/watchdog/rt2880_wdt.c
|
||||
|
||||
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
|
||||
index 08c96db6..4956d96 100644
|
||||
--- a/arch/mips/ralink/mt7620.c
|
||||
+++ b/arch/mips/ralink/mt7620.c
|
||||
@@ -182,6 +182,7 @@ void __init ralink_clk_init(void)
|
||||
@@ -26,8 +24,6 @@ index 08c96db6..4956d96 100644
|
||||
ralink_clk_add("10000500.uart", 40000000);
|
||||
ralink_clk_add("10000b00.spi", 40000000);
|
||||
ralink_clk_add("10000c00.uartlite", 40000000);
|
||||
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
|
||||
index e89fc31..5e34760 100644
|
||||
--- a/drivers/watchdog/Kconfig
|
||||
+++ b/drivers/watchdog/Kconfig
|
||||
@@ -1104,6 +1104,13 @@ config LANTIQ_WDT
|
||||
@@ -44,8 +40,6 @@ index e89fc31..5e34760 100644
|
||||
# PARISC Architecture
|
||||
|
||||
# POWERPC Architecture
|
||||
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
|
||||
index a300b94..2681e3d 100644
|
||||
--- a/drivers/watchdog/Makefile
|
||||
+++ b/drivers/watchdog/Makefile
|
||||
@@ -134,6 +134,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
|
||||
@@ -56,9 +50,6 @@ index a300b94..2681e3d 100644
|
||||
|
||||
# PARISC Architecture
|
||||
|
||||
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c
|
||||
new file mode 100644
|
||||
index 0000000..3df65a4
|
||||
--- /dev/null
|
||||
+++ b/drivers/watchdog/rt2880_wdt.c
|
||||
@@ -0,0 +1,207 @@
|
||||
@@ -269,6 +260,3 @@ index 0000000..3df65a4
|
||||
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org");
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,9 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-ralink.txt
|
||||
create mode 100644 drivers/i2c/busses/i2c-ralink.c
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/i2c/i2c-ralink.txt b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt
|
||||
new file mode 100644
|
||||
index 0000000..8fa8ac3
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt
|
||||
@@ -0,0 +1,27 @@
|
||||
@@ -46,8 +43,6 @@ index 0000000..8fa8ac3
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
|
||||
index adfee98..ec925ae 100644
|
||||
--- a/drivers/i2c/busses/Kconfig
|
||||
+++ b/drivers/i2c/busses/Kconfig
|
||||
@@ -628,6 +628,10 @@ config I2C_PXA_SLAVE
|
||||
@@ -61,8 +56,6 @@ index adfee98..ec925ae 100644
|
||||
config HAVE_S3C2410_I2C
|
||||
bool
|
||||
help
|
||||
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
|
||||
index 8f4fc23..7e39a13 100644
|
||||
--- a/drivers/i2c/busses/Makefile
|
||||
+++ b/drivers/i2c/busses/Makefile
|
||||
@@ -62,6 +62,7 @@ obj-$(CONFIG_I2C_PNX) += i2c-pnx.o
|
||||
@@ -73,9 +66,6 @@ index 8f4fc23..7e39a13 100644
|
||||
obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o
|
||||
obj-$(CONFIG_I2C_S6000) += i2c-s6000.o
|
||||
obj-$(CONFIG_I2C_SH7760) += i2c-sh7760.o
|
||||
diff --git a/drivers/i2c/busses/i2c-ralink.c b/drivers/i2c/busses/i2c-ralink.c
|
||||
new file mode 100644
|
||||
index 0000000..b5abf0f
|
||||
--- /dev/null
|
||||
+++ b/drivers/i2c/busses/i2c-ralink.c
|
||||
@@ -0,0 +1,274 @@
|
||||
@@ -353,6 +343,3 @@ index 0000000..b5abf0f
|
||||
+MODULE_DESCRIPTION("Ralink I2c host driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS("platform:Ralink-I2C");
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -34,9 +34,6 @@ Reviewed-by: Pavel Machek <pavel@ucw.cz>
|
||||
create mode 100644 include/linux/reset-controller.h
|
||||
create mode 100644 include/linux/reset.h
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/reset/reset.txt b/Documentation/devicetree/bindings/reset/reset.txt
|
||||
new file mode 100644
|
||||
index 0000000..31db6ff
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/reset/reset.txt
|
||||
@@ -0,0 +1,75 @@
|
||||
@@ -115,22 +112,18 @@ index 0000000..31db6ff
|
||||
+This represents a bus that controls the reset signal of each of four sub-
|
||||
+ordinate devices. Consider for example a bus that fails to operate unless no
|
||||
+child device has reset asserted.
|
||||
diff --git a/drivers/Kconfig b/drivers/Kconfig
|
||||
index 202fa6d..847f8e3 100644
|
||||
--- a/drivers/Kconfig
|
||||
+++ b/drivers/Kconfig
|
||||
@@ -162,4 +162,6 @@ source "drivers/irqchip/Kconfig"
|
||||
@@ -164,4 +164,6 @@ source "drivers/irqchip/Kconfig"
|
||||
|
||||
source "drivers/ipack/Kconfig"
|
||||
|
||||
+source "drivers/reset/Kconfig"
|
||||
+
|
||||
endmenu
|
||||
diff --git a/drivers/Makefile b/drivers/Makefile
|
||||
index dce39a9..1a64c4c 100644
|
||||
--- a/drivers/Makefile
|
||||
+++ b/drivers/Makefile
|
||||
@@ -37,6 +37,9 @@ obj-$(CONFIG_XEN) += xen/
|
||||
@@ -38,6 +38,9 @@ obj-$(CONFIG_XEN) += xen/
|
||||
# regulators early, since some subsystems rely on them to initialize
|
||||
obj-$(CONFIG_REGULATOR) += regulator/
|
||||
|
||||
@@ -140,9 +133,6 @@ index dce39a9..1a64c4c 100644
|
||||
# tty/ comes before char/ so that the VT console is the boot-time
|
||||
# default.
|
||||
obj-y += tty/
|
||||
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
|
||||
new file mode 100644
|
||||
index 0000000..c9d04f7
|
||||
--- /dev/null
|
||||
+++ b/drivers/reset/Kconfig
|
||||
@@ -0,0 +1,13 @@
|
||||
@@ -159,16 +149,10 @@ index 0000000..c9d04f7
|
||||
+ via GPIOs or SoC-internal reset controller modules.
|
||||
+
|
||||
+ If unsure, say no.
|
||||
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
|
||||
new file mode 100644
|
||||
index 0000000..1e2d83f
|
||||
--- /dev/null
|
||||
+++ b/drivers/reset/Makefile
|
||||
@@ -0,0 +1 @@
|
||||
+obj-$(CONFIG_RESET_CONTROLLER) += core.o
|
||||
diff --git a/drivers/reset/core.c b/drivers/reset/core.c
|
||||
new file mode 100644
|
||||
index 0000000..d1b6089
|
||||
--- /dev/null
|
||||
+++ b/drivers/reset/core.c
|
||||
@@ -0,0 +1,297 @@
|
||||
@@ -469,9 +453,6 @@ index 0000000..d1b6089
|
||||
+ return ret;
|
||||
+}
|
||||
+EXPORT_SYMBOL_GPL(device_reset);
|
||||
diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h
|
||||
new file mode 100644
|
||||
index 0000000..2f61311
|
||||
--- /dev/null
|
||||
+++ b/include/linux/reset-controller.h
|
||||
@@ -0,0 +1,51 @@
|
||||
@@ -526,9 +507,6 @@ index 0000000..2f61311
|
||||
+void reset_controller_unregister(struct reset_controller_dev *rcdev);
|
||||
+
|
||||
+#endif
|
||||
diff --git a/include/linux/reset.h b/include/linux/reset.h
|
||||
new file mode 100644
|
||||
index 0000000..6082247
|
||||
--- /dev/null
|
||||
+++ b/include/linux/reset.h
|
||||
@@ -0,0 +1,17 @@
|
||||
@@ -549,6 +527,3 @@ index 0000000..6082247
|
||||
+int device_reset(struct device *dev);
|
||||
+
|
||||
+#endif
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
arch/mips/ralink/reset.c | 1 +
|
||||
3 files changed, 61 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
|
||||
index b237c50..cfc7153 100644
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -444,6 +444,7 @@ config RALINK
|
||||
@@ -24,8 +22,6 @@ index b237c50..cfc7153 100644
|
||||
|
||||
config SGI_IP22
|
||||
bool "SGI IP22 (Indy/Indigo2)"
|
||||
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
|
||||
index 8efb02b..2faf478 100644
|
||||
--- a/arch/mips/ralink/of.c
|
||||
+++ b/arch/mips/ralink/of.c
|
||||
@@ -14,16 +14,22 @@
|
||||
@@ -118,8 +114,6 @@ index 8efb02b..2faf478 100644
|
||||
ralink_pinmux();
|
||||
|
||||
return 0;
|
||||
diff --git a/arch/mips/ralink/reset.c b/arch/mips/ralink/reset.c
|
||||
index 22120e5..6c15f4f 100644
|
||||
--- a/arch/mips/ralink/reset.c
|
||||
+++ b/arch/mips/ralink/reset.c
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -130,6 +124,3 @@ index 22120e5..6c15f4f 100644
|
||||
|
||||
#include <asm/reboot.h>
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
include/linux/of_net.h | 1 +
|
||||
2 files changed, 38 insertions(+)
|
||||
|
||||
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
|
||||
index ffab033..15f4a71 100644
|
||||
--- a/drivers/of/of_net.c
|
||||
+++ b/drivers/of/of_net.c
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -26,7 +24,7 @@ index ffab033..15f4a71 100644
|
||||
|
||||
/**
|
||||
* It maps 'enum phy_interface_t' found in include/linux/phy.h
|
||||
@@ -92,3 +93,39 @@ const void *of_get_mac_address(struct device_node *np)
|
||||
@@ -92,3 +93,39 @@ const void *of_get_mac_address(struct de
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(of_get_mac_address);
|
||||
@@ -66,8 +64,6 @@ index ffab033..15f4a71 100644
|
||||
+ return ret;
|
||||
+}
|
||||
+EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
|
||||
diff --git a/include/linux/of_net.h b/include/linux/of_net.h
|
||||
index f474641..9d3304f 100644
|
||||
--- a/include/linux/of_net.h
|
||||
+++ b/include/linux/of_net.h
|
||||
@@ -11,6 +11,7 @@
|
||||
@@ -78,6 +74,3 @@ index f474641..9d3304f 100644
|
||||
#endif
|
||||
|
||||
#endif /* __LINUX_OF_NET_H */
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -9,11 +9,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
include/linux/phy.h | 2 +-
|
||||
2 files changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
|
||||
index ef9ea92..27f9b45 100644
|
||||
--- a/drivers/net/phy/phy.c
|
||||
+++ b/drivers/net/phy/phy.c
|
||||
@@ -800,7 +800,8 @@ void phy_state_machine(struct work_struct *work)
|
||||
@@ -847,7 +847,8 @@ void phy_state_machine(struct work_struc
|
||||
* negotiation for now */
|
||||
if (!phydev->link) {
|
||||
phydev->state = PHY_NOLINK;
|
||||
@@ -23,7 +21,7 @@ index ef9ea92..27f9b45 100644
|
||||
phydev->adjust_link(phydev->attached_dev);
|
||||
break;
|
||||
}
|
||||
@@ -891,7 +892,8 @@ void phy_state_machine(struct work_struct *work)
|
||||
@@ -938,7 +939,8 @@ void phy_state_machine(struct work_struc
|
||||
netif_carrier_on(phydev->attached_dev);
|
||||
} else {
|
||||
phydev->state = PHY_NOLINK;
|
||||
@@ -33,7 +31,7 @@ index ef9ea92..27f9b45 100644
|
||||
}
|
||||
|
||||
phydev->adjust_link(phydev->attached_dev);
|
||||
@@ -903,7 +905,8 @@ void phy_state_machine(struct work_struct *work)
|
||||
@@ -950,7 +952,8 @@ void phy_state_machine(struct work_struc
|
||||
case PHY_HALTED:
|
||||
if (phydev->link) {
|
||||
phydev->link = 0;
|
||||
@@ -43,8 +41,6 @@ index ef9ea92..27f9b45 100644
|
||||
phydev->adjust_link(phydev->attached_dev);
|
||||
}
|
||||
break;
|
||||
diff --git a/include/linux/phy.h b/include/linux/phy.h
|
||||
index 33999ad..9c54bc9 100644
|
||||
--- a/include/linux/phy.h
|
||||
+++ b/include/linux/phy.h
|
||||
@@ -298,7 +298,7 @@ struct phy_device {
|
||||
@@ -56,6 +52,3 @@ index 33999ad..9c54bc9 100644
|
||||
enum phy_state state;
|
||||
|
||||
u32 dev_flags;
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -47,9 +47,6 @@ 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_rt3883.c
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
|
||||
new file mode 100644
|
||||
index 0000000..2098c5c
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
|
||||
@@ -0,0 +1,27 @@
|
||||
@@ -80,8 +77,6 @@ index 0000000..2098c5c
|
||||
+};
|
||||
+
|
||||
+#endif /* _RT305X_ESW_PLATFORM_H */
|
||||
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
|
||||
index ca7ee3a..1a6b458 100644
|
||||
--- a/arch/mips/ralink/rt305x.c
|
||||
+++ b/arch/mips/ralink/rt305x.c
|
||||
@@ -221,6 +221,7 @@ void __init ralink_clk_init(void)
|
||||
@@ -92,8 +87,6 @@ index ca7ee3a..1a6b458 100644
|
||||
ralink_clk_add("10000b00.spi", sys_rate);
|
||||
ralink_clk_add("10000100.timer", wdt_rate);
|
||||
ralink_clk_add("10000120.watchdog", wdt_rate);
|
||||
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
|
||||
index ed956e0..0b3caa1 100644
|
||||
--- a/drivers/net/ethernet/Kconfig
|
||||
+++ b/drivers/net/ethernet/Kconfig
|
||||
@@ -135,6 +135,7 @@ config ETHOC
|
||||
@@ -104,8 +97,6 @@ index ed956e0..0b3caa1 100644
|
||||
source "drivers/net/ethernet/realtek/Kconfig"
|
||||
source "drivers/net/ethernet/renesas/Kconfig"
|
||||
source "drivers/net/ethernet/rdc/Kconfig"
|
||||
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
|
||||
index 8268d85..508c494 100644
|
||||
--- a/drivers/net/ethernet/Makefile
|
||||
+++ b/drivers/net/ethernet/Makefile
|
||||
@@ -53,6 +53,7 @@ obj-$(CONFIG_ETHOC) += ethoc.o
|
||||
@@ -116,9 +107,6 @@ index 8268d85..508c494 100644
|
||||
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
|
||||
obj-$(CONFIG_SH_ETH) += renesas/
|
||||
obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
|
||||
diff --git a/drivers/net/ethernet/ralink/Kconfig b/drivers/net/ethernet/ralink/Kconfig
|
||||
new file mode 100644
|
||||
index 0000000..ca2c9ad
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/Kconfig
|
||||
@@ -0,0 +1,31 @@
|
||||
@@ -153,9 +141,6 @@ index 0000000..ca2c9ad
|
||||
+ select PHYLIB
|
||||
+ select SWCONFIG
|
||||
+endif
|
||||
diff --git a/drivers/net/ethernet/ralink/Makefile b/drivers/net/ethernet/ralink/Makefile
|
||||
new file mode 100644
|
||||
index 0000000..a38fa21
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/Makefile
|
||||
@@ -0,0 +1,18 @@
|
||||
@@ -177,9 +162,6 @@ index 0000000..a38fa21
|
||||
+ralink-eth-$(CONFIG_SOC_MT7620) += soc_mt7620.o
|
||||
+
|
||||
+obj-$(CONFIG_NET_RALINK) += ralink-eth.o
|
||||
diff --git a/drivers/net/ethernet/ralink/esw_rt3052.c b/drivers/net/ethernet/ralink/esw_rt3052.c
|
||||
new file mode 100644
|
||||
index 0000000..b937062
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/esw_rt3052.c
|
||||
@@ -0,0 +1,1463 @@
|
||||
@@ -1646,9 +1628,6 @@ index 0000000..b937062
|
||||
+{
|
||||
+ platform_driver_unregister(&esw_driver);
|
||||
+}
|
||||
diff --git a/drivers/net/ethernet/ralink/esw_rt3052.h b/drivers/net/ethernet/ralink/esw_rt3052.h
|
||||
new file mode 100644
|
||||
index 0000000..2ced3dff
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/esw_rt3052.h
|
||||
@@ -0,0 +1,32 @@
|
||||
@@ -1684,9 +1663,6 @@ index 0000000..2ced3dff
|
||||
+
|
||||
+#endif
|
||||
+#endif
|
||||
diff --git a/drivers/net/ethernet/ralink/gsw_mt7620a.c b/drivers/net/ethernet/ralink/gsw_mt7620a.c
|
||||
new file mode 100644
|
||||
index 0000000..9fa6a54
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/gsw_mt7620a.c
|
||||
@@ -0,0 +1,1027 @@
|
||||
@@ -2717,9 +2693,6 @@ index 0000000..9fa6a54
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
diff --git a/drivers/net/ethernet/ralink/gsw_mt7620a.h b/drivers/net/ethernet/ralink/gsw_mt7620a.h
|
||||
new file mode 100644
|
||||
index 0000000..fd4add5
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/gsw_mt7620a.h
|
||||
@@ -0,0 +1,29 @@
|
||||
@@ -2752,9 +2725,6 @@ index 0000000..fd4add5
|
||||
+extern int mt7620a_has_carrier(struct fe_priv *priv);
|
||||
+
|
||||
+#endif
|
||||
diff --git a/drivers/net/ethernet/ralink/mdio.c b/drivers/net/ethernet/ralink/mdio.c
|
||||
new file mode 100644
|
||||
index 0000000..b265c75
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/mdio.c
|
||||
@@ -0,0 +1,245 @@
|
||||
@@ -3003,9 +2973,6 @@ index 0000000..b265c75
|
||||
+ of_node_put(priv->mii_bus->dev.of_node);
|
||||
+ kfree(priv->mii_bus);
|
||||
+}
|
||||
diff --git a/drivers/net/ethernet/ralink/mdio.h b/drivers/net/ethernet/ralink/mdio.h
|
||||
new file mode 100644
|
||||
index 0000000..c3910a0
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/mdio.h
|
||||
@@ -0,0 +1,29 @@
|
||||
@@ -3038,9 +3005,6 @@ index 0000000..c3910a0
|
||||
+static inline void fe_mdio_cleanup(struct fe_priv *priv) {}
|
||||
+#endif
|
||||
+#endif
|
||||
diff --git a/drivers/net/ethernet/ralink/mdio_rt2880.c b/drivers/net/ethernet/ralink/mdio_rt2880.c
|
||||
new file mode 100644
|
||||
index 0000000..701c7b6
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/mdio_rt2880.c
|
||||
@@ -0,0 +1,232 @@
|
||||
@@ -3276,9 +3240,6 @@ index 0000000..701c7b6
|
||||
+
|
||||
+ return;
|
||||
+}
|
||||
diff --git a/drivers/net/ethernet/ralink/mdio_rt2880.h b/drivers/net/ethernet/ralink/mdio_rt2880.h
|
||||
new file mode 100644
|
||||
index 0000000..51e3633
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/mdio_rt2880.h
|
||||
@@ -0,0 +1,26 @@
|
||||
@@ -3308,9 +3269,6 @@ index 0000000..51e3633
|
||||
+void rt2880_port_init(struct fe_priv *priv, struct device_node *np);
|
||||
+
|
||||
+#endif
|
||||
diff --git a/drivers/net/ethernet/ralink/ralink_soc_eth.c b/drivers/net/ethernet/ralink/ralink_soc_eth.c
|
||||
new file mode 100644
|
||||
index 0000000..d75c669
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c
|
||||
@@ -0,0 +1,746 @@
|
||||
@@ -4060,9 +4018,6 @@ index 0000000..d75c669
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
|
||||
+MODULE_DESCRIPTION("Ethernet driver for Ralink SoC");
|
||||
diff --git a/drivers/net/ethernet/ralink/ralink_soc_eth.h b/drivers/net/ethernet/ralink/ralink_soc_eth.h
|
||||
new file mode 100644
|
||||
index 0000000..85bc881
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/ralink_soc_eth.h
|
||||
@@ -0,0 +1,374 @@
|
||||
@@ -4440,9 +4395,6 @@ index 0000000..85bc881
|
||||
+u32 fe_r32(unsigned reg);
|
||||
+
|
||||
+#endif /* FE_ETH_H */
|
||||
diff --git a/drivers/net/ethernet/ralink/soc_mt7620.c b/drivers/net/ethernet/ralink/soc_mt7620.c
|
||||
new file mode 100644
|
||||
index 0000000..55e303f
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/soc_mt7620.c
|
||||
@@ -0,0 +1,111 @@
|
||||
@@ -4557,9 +4509,6 @@ index 0000000..55e303f
|
||||
+};
|
||||
+
|
||||
+MODULE_DEVICE_TABLE(of, of_fe_match);
|
||||
diff --git a/drivers/net/ethernet/ralink/soc_rt2880.c b/drivers/net/ethernet/ralink/soc_rt2880.c
|
||||
new file mode 100644
|
||||
index 0000000..1110947
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/soc_rt2880.c
|
||||
@@ -0,0 +1,51 @@
|
||||
@@ -4614,9 +4563,6 @@ index 0000000..1110947
|
||||
+};
|
||||
+
|
||||
+MODULE_DEVICE_TABLE(of, of_fe_match);
|
||||
diff --git a/drivers/net/ethernet/ralink/soc_rt305x.c b/drivers/net/ethernet/ralink/soc_rt305x.c
|
||||
new file mode 100644
|
||||
index 0000000..482ca1f
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/soc_rt305x.c
|
||||
@@ -0,0 +1,113 @@
|
||||
@@ -4733,9 +4679,6 @@ index 0000000..482ca1f
|
||||
+};
|
||||
+
|
||||
+MODULE_DEVICE_TABLE(of, of_fe_match);
|
||||
diff --git a/drivers/net/ethernet/ralink/soc_rt3883.c b/drivers/net/ethernet/ralink/soc_rt3883.c
|
||||
new file mode 100644
|
||||
index 0000000..c660529
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/ralink/soc_rt3883.c
|
||||
@@ -0,0 +1,60 @@
|
||||
@@ -4799,6 +4742,3 @@ index 0000000..c660529
|
||||
+
|
||||
+MODULE_DEVICE_TABLE(of, of_fe_match);
|
||||
+
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -11,11 +11,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
3 files changed, 200 insertions(+)
|
||||
create mode 100644 drivers/usb/phy/ralink-phy.c
|
||||
|
||||
Index: linux-3.9.6/drivers/usb/phy/Kconfig
|
||||
===================================================================
|
||||
--- linux-3.9.6.orig/drivers/usb/phy/Kconfig 2013-06-13 19:52:08.000000000 +0200
|
||||
+++ linux-3.9.6/drivers/usb/phy/Kconfig 2013-06-23 16:37:57.544772712 +0200
|
||||
@@ -74,3 +74,11 @@
|
||||
--- a/drivers/usb/phy/Kconfig
|
||||
+++ b/drivers/usb/phy/Kconfig
|
||||
@@ -74,3 +74,11 @@ config SAMSUNG_USBPHY
|
||||
help
|
||||
Enable this to support Samsung USB phy controller for samsung
|
||||
SoCs.
|
||||
@@ -27,19 +25,15 @@ Index: linux-3.9.6/drivers/usb/phy/Kconfig
|
||||
+ help
|
||||
+ Enable this to support ralink USB phy controller for ralink
|
||||
+ SoCs.
|
||||
Index: linux-3.9.6/drivers/usb/phy/Makefile
|
||||
===================================================================
|
||||
--- linux-3.9.6.orig/drivers/usb/phy/Makefile 2013-06-13 19:52:08.000000000 +0200
|
||||
+++ linux-3.9.6/drivers/usb/phy/Makefile 2013-06-23 16:37:57.544772712 +0200
|
||||
@@ -12,3 +12,4 @@
|
||||
--- a/drivers/usb/phy/Makefile
|
||||
+++ b/drivers/usb/phy/Makefile
|
||||
@@ -12,3 +12,4 @@ obj-$(CONFIG_MV_U3D_PHY) += mv_u3d_phy.
|
||||
obj-$(CONFIG_USB_EHCI_TEGRA) += tegra_usb_phy.o
|
||||
obj-$(CONFIG_USB_RCAR_PHY) += rcar-phy.o
|
||||
obj-$(CONFIG_SAMSUNG_USBPHY) += samsung-usbphy.o
|
||||
+obj-$(CONFIG_RALINK_USBPHY) += ralink-phy.o
|
||||
Index: linux-3.9.6/drivers/usb/phy/ralink-phy.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-3.9.6/drivers/usb/phy/ralink-phy.c 2013-06-24 13:55:19.932135036 +0200
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/phy/ralink-phy.c
|
||||
@@ -0,0 +1,191 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
|
||||
|
||||
@@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
drivers/usb/host/ohci-platform.c | 37 +++++++++++++++++++++++++++-----
|
||||
4 files changed, 74 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
|
||||
index c8d5b6c..7cd1188 100644
|
||||
--- a/arch/mips/ralink/Kconfig
|
||||
+++ b/arch/mips/ralink/Kconfig
|
||||
@@ -27,6 +27,8 @@ choice
|
||||
@@ -26,8 +24,6 @@ index c8d5b6c..7cd1188 100644
|
||||
|
||||
endchoice
|
||||
|
||||
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
|
||||
index 8f5ebce..b766256 100644
|
||||
--- a/drivers/usb/Makefile
|
||||
+++ b/drivers/usb/Makefile
|
||||
@@ -12,6 +12,8 @@ obj-$(CONFIG_USB_DWC3) += dwc3/
|
||||
@@ -47,8 +43,6 @@ index 8f5ebce..b766256 100644
|
||||
obj-$(CONFIG_EARLY_PRINTK_DBGP) += early/
|
||||
|
||||
obj-$(CONFIG_USB_ATM) += atm/
|
||||
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
|
||||
index ca75063..ae32410 100644
|
||||
--- a/drivers/usb/host/ehci-platform.c
|
||||
+++ b/drivers/usb/host/ehci-platform.c
|
||||
@@ -18,14 +18,18 @@
|
||||
@@ -70,7 +64,7 @@ index ca75063..ae32410 100644
|
||||
#include <linux/usb/ehci_pdriver.h>
|
||||
|
||||
#include "ehci.h"
|
||||
@@ -62,22 +66,32 @@ static const struct ehci_driver_overrides platform_overrides __initdata = {
|
||||
@@ -63,22 +67,32 @@ static const struct ehci_driver_override
|
||||
.reset = ehci_platform_reset,
|
||||
};
|
||||
|
||||
@@ -109,7 +103,7 @@ index ca75063..ae32410 100644
|
||||
irq = platform_get_irq(dev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(&dev->dev, "no irq provided");
|
||||
@@ -105,6 +119,15 @@ static int ehci_platform_probe(struct platform_device *dev)
|
||||
@@ -106,6 +120,15 @@ static int ehci_platform_probe(struct pl
|
||||
hcd->rsrc_start = res_mem->start;
|
||||
hcd->rsrc_len = resource_size(res_mem);
|
||||
|
||||
@@ -125,7 +119,7 @@ index ca75063..ae32410 100644
|
||||
hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
|
||||
if (IS_ERR(hcd->regs)) {
|
||||
err = PTR_ERR(hcd->regs);
|
||||
@@ -139,6 +162,9 @@ static int ehci_platform_remove(struct platform_device *dev)
|
||||
@@ -140,6 +163,9 @@ static int ehci_platform_remove(struct p
|
||||
if (pdata->power_off)
|
||||
pdata->power_off(dev);
|
||||
|
||||
@@ -135,7 +129,7 @@ index ca75063..ae32410 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -183,6 +209,11 @@ static int ehci_platform_resume(struct device *dev)
|
||||
@@ -184,6 +210,11 @@ static int ehci_platform_resume(struct d
|
||||
#define ehci_platform_resume NULL
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
@@ -147,7 +141,7 @@ index ca75063..ae32410 100644
|
||||
static const struct platform_device_id ehci_platform_table[] = {
|
||||
{ "ehci-platform", 0 },
|
||||
{ }
|
||||
@@ -203,6 +234,7 @@ static struct platform_driver ehci_platform_driver = {
|
||||
@@ -204,6 +235,7 @@ static struct platform_driver ehci_platf
|
||||
.owner = THIS_MODULE,
|
||||
.name = "ehci-platform",
|
||||
.pm = &ehci_platform_pm_ops,
|
||||
@@ -155,8 +149,6 @@ index ca75063..ae32410 100644
|
||||
}
|
||||
};
|
||||
|
||||
diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
|
||||
index c3e7287..dd9bac6 100644
|
||||
--- a/drivers/usb/host/ohci-platform.c
|
||||
+++ b/drivers/usb/host/ohci-platform.c
|
||||
@@ -16,6 +16,10 @@
|
||||
@@ -170,7 +162,7 @@ index c3e7287..dd9bac6 100644
|
||||
|
||||
static int ohci_platform_reset(struct usb_hcd *hcd)
|
||||
{
|
||||
@@ -88,14 +92,22 @@ static int ohci_platform_probe(struct platform_device *dev)
|
||||
@@ -88,14 +92,22 @@ static int ohci_platform_probe(struct pl
|
||||
{
|
||||
struct usb_hcd *hcd;
|
||||
struct resource *res_mem;
|
||||
@@ -198,7 +190,7 @@ index c3e7287..dd9bac6 100644
|
||||
|
||||
if (usb_disabled())
|
||||
return -ENODEV;
|
||||
@@ -128,6 +140,12 @@ static int ohci_platform_probe(struct platform_device *dev)
|
||||
@@ -128,6 +140,12 @@ static int ohci_platform_probe(struct pl
|
||||
hcd->rsrc_start = res_mem->start;
|
||||
hcd->rsrc_len = resource_size(res_mem);
|
||||
|
||||
@@ -211,7 +203,7 @@ index c3e7287..dd9bac6 100644
|
||||
hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
|
||||
if (IS_ERR(hcd->regs)) {
|
||||
err = PTR_ERR(hcd->regs);
|
||||
@@ -162,6 +180,9 @@ static int ohci_platform_remove(struct platform_device *dev)
|
||||
@@ -162,6 +180,9 @@ static int ohci_platform_remove(struct p
|
||||
if (pdata->power_off)
|
||||
pdata->power_off(dev);
|
||||
|
||||
@@ -221,7 +213,7 @@ index c3e7287..dd9bac6 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -201,6 +222,11 @@ static int ohci_platform_resume(struct device *dev)
|
||||
@@ -201,6 +222,11 @@ static int ohci_platform_resume(struct d
|
||||
#define ohci_platform_resume NULL
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
@@ -233,13 +225,10 @@ index c3e7287..dd9bac6 100644
|
||||
static const struct platform_device_id ohci_platform_table[] = {
|
||||
{ "ohci-platform", 0 },
|
||||
{ }
|
||||
@@ -221,5 +247,6 @@ static struct platform_driver ohci_platform_driver = {
|
||||
@@ -221,5 +247,6 @@ static struct platform_driver ohci_platf
|
||||
.owner = THIS_MODULE,
|
||||
.name = "ohci-platform",
|
||||
.pm = &ohci_platform_pm_ops,
|
||||
+ .of_match_table = of_match_ptr(ralink_ohci_ids),
|
||||
}
|
||||
};
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
create mode 100644 drivers/usb/gadget/rt_udc.h
|
||||
create mode 100644 drivers/usb/gadget/rt_udc_pdma.c
|
||||
|
||||
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
|
||||
index c7525b1..6f0e293 100644
|
||||
--- a/drivers/usb/gadget/Kconfig
|
||||
+++ b/drivers/usb/gadget/Kconfig
|
||||
@@ -336,6 +336,14 @@ config USB_MV_U3D
|
||||
@@ -32,8 +30,6 @@ index c7525b1..6f0e293 100644
|
||||
#
|
||||
# Controllers available in both integrated and discrete versions
|
||||
#
|
||||
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
|
||||
index 82fb225..f78a3b2 100644
|
||||
--- a/drivers/usb/gadget/Makefile
|
||||
+++ b/drivers/usb/gadget/Makefile
|
||||
@@ -34,6 +34,7 @@ obj-$(CONFIG_USB_MV_UDC) += mv_udc.o
|
||||
@@ -44,9 +40,6 @@ index 82fb225..f78a3b2 100644
|
||||
|
||||
# USB Functions
|
||||
obj-$(CONFIG_USB_F_ACM) += f_acm.o
|
||||
diff --git a/drivers/usb/gadget/rt_udc.h b/drivers/usb/gadget/rt_udc.h
|
||||
new file mode 100644
|
||||
index 0000000..088e0d9
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/gadget/rt_udc.h
|
||||
@@ -0,0 +1,417 @@
|
||||
@@ -467,9 +460,6 @@ index 0000000..088e0d9
|
||||
+#endif /* DEBUG */
|
||||
+
|
||||
+#endif /* __LINUX_USB_GADGET_RT_UDC_H */
|
||||
diff --git a/drivers/usb/gadget/rt_udc_pdma.c b/drivers/usb/gadget/rt_udc_pdma.c
|
||||
new file mode 100644
|
||||
index 0000000..d5b89a2
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/gadget/rt_udc_pdma.c
|
||||
@@ -0,0 +1,2547 @@
|
||||
@@ -3020,6 +3010,3 @@ index 0000000..d5b89a2
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS("platform:rt_udc");
|
||||
+
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
arch/mips/ralink/mt7620.c | 8 ++++++++
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h
|
||||
index 9809972..d469c69 100644
|
||||
--- a/arch/mips/include/asm/mach-ralink/mt7620.h
|
||||
+++ b/arch/mips/include/asm/mach-ralink/mt7620.h
|
||||
@@ -20,6 +20,7 @@
|
||||
@@ -24,8 +22,6 @@ index 9809972..d469c69 100644
|
||||
#define SYSC_REG_CPLL_CONFIG0 0x54
|
||||
#define SYSC_REG_CPLL_CONFIG1 0x58
|
||||
|
||||
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
|
||||
index 4956d96..d76eb85 100644
|
||||
--- a/arch/mips/ralink/mt7620.c
|
||||
+++ b/arch/mips/ralink/mt7620.c
|
||||
@@ -186,6 +186,14 @@ void __init ralink_clk_init(void)
|
||||
@@ -43,6 +39,3 @@ index 4956d96..d76eb85 100644
|
||||
}
|
||||
|
||||
void __init ralink_of_remap(void)
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -20,11 +20,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
scripts/Makefile.lib | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
|
||||
index 07125e6..e13fff1 100644
|
||||
--- a/scripts/Makefile.lib
|
||||
+++ b/scripts/Makefile.lib
|
||||
@@ -251,7 +251,7 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
|
||||
@@ -251,7 +251,7 @@ cmd_gzip = (cat $(filter-out FORCE,$^) |
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
# Generate an assembly file to wrap the output of the device tree compiler
|
||||
@@ -33,6 +31,3 @@ index 07125e6..e13fff1 100644
|
||||
cmd_dt_S_dtb= \
|
||||
( \
|
||||
echo '\#include <asm-generic/vmlinux.lds.h>'; \
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
include/linux/gpio.h | 26 ++++++++-
|
||||
5 files changed, 172 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/gpio/gpio.txt b/Documentation/devicetree/bindings/gpio/gpio.txt
|
||||
index a336287..c2a9024 100644
|
||||
--- a/Documentation/devicetree/bindings/gpio/gpio.txt
|
||||
+++ b/Documentation/devicetree/bindings/gpio/gpio.txt
|
||||
@@ -112,3 +112,63 @@ where,
|
||||
@@ -82,8 +80,6 @@ index a336287..c2a9024 100644
|
||||
+ gpio-export,output = <1>;
|
||||
+ };
|
||||
+};
|
||||
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
|
||||
index 5150df6..195491b 100644
|
||||
--- a/drivers/gpio/gpiolib-of.c
|
||||
+++ b/drivers/gpio/gpiolib-of.c
|
||||
@@ -21,6 +21,8 @@
|
||||
@@ -95,7 +91,7 @@ index 5150df6..195491b 100644
|
||||
|
||||
/* Private data structure for of_gpiochip_find_and_xlate */
|
||||
struct gg_data {
|
||||
@@ -253,3 +255,69 @@ void of_gpiochip_remove(struct gpio_chip *chip)
|
||||
@@ -253,3 +255,69 @@ void of_gpiochip_remove(struct gpio_chip
|
||||
if (chip->of_node)
|
||||
of_node_put(chip->of_node);
|
||||
}
|
||||
@@ -165,11 +161,9 @@ index 5150df6..195491b 100644
|
||||
+ return platform_driver_probe(&gpio_export_driver, of_gpio_export_probe);
|
||||
+}
|
||||
+device_initcall(of_gpio_export_init);
|
||||
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
|
||||
index c2534d6..8697c82 100644
|
||||
--- a/drivers/gpio/gpiolib.c
|
||||
+++ b/drivers/gpio/gpiolib.c
|
||||
@@ -96,7 +96,7 @@ static int gpiod_get_value(const struct gpio_desc *desc);
|
||||
@@ -96,7 +96,7 @@ static int gpiod_get_value(const struct
|
||||
static void gpiod_set_value(struct gpio_desc *desc, int value);
|
||||
static int gpiod_cansleep(const struct gpio_desc *desc);
|
||||
static int gpiod_to_irq(const struct gpio_desc *desc);
|
||||
@@ -178,7 +172,7 @@ index c2534d6..8697c82 100644
|
||||
static int gpiod_export_link(struct device *dev, const char *name,
|
||||
struct gpio_desc *desc);
|
||||
static int gpiod_sysfs_set_active_low(struct gpio_desc *desc, int value);
|
||||
@@ -674,7 +674,7 @@ static ssize_t export_store(struct class *class,
|
||||
@@ -674,7 +674,7 @@ static ssize_t export_store(struct class
|
||||
status = -ENODEV;
|
||||
goto done;
|
||||
}
|
||||
@@ -208,7 +202,7 @@ index c2534d6..8697c82 100644
|
||||
{
|
||||
unsigned long flags;
|
||||
int status;
|
||||
@@ -783,6 +784,8 @@ static int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
|
||||
@@ -783,6 +784,8 @@ static int gpiod_export(struct gpio_desc
|
||||
goto fail_unlock;
|
||||
}
|
||||
|
||||
@@ -232,7 +226,7 @@ index c2534d6..8697c82 100644
|
||||
|
||||
static int match_export(struct device *dev, const void *data)
|
||||
{
|
||||
@@ -1092,7 +1095,7 @@ static inline void gpiochip_unexport(struct gpio_chip *chip)
|
||||
@@ -1092,7 +1095,7 @@ static inline void gpiochip_unexport(str
|
||||
}
|
||||
|
||||
static inline int gpiod_export(struct gpio_desc *desc,
|
||||
@@ -241,7 +235,7 @@ index c2534d6..8697c82 100644
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
@@ -1521,6 +1524,9 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
|
||||
@@ -1521,6 +1524,9 @@ int gpio_request_one(unsigned gpio, unsi
|
||||
if (flags & GPIOF_OPEN_SOURCE)
|
||||
set_bit(FLAG_OPEN_SOURCE, &desc->flags);
|
||||
|
||||
@@ -251,7 +245,7 @@ index c2534d6..8697c82 100644
|
||||
if (flags & GPIOF_DIR_IN)
|
||||
err = gpiod_direction_input(desc);
|
||||
else
|
||||
@@ -1531,7 +1537,7 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
|
||||
@@ -1531,7 +1537,7 @@ int gpio_request_one(unsigned gpio, unsi
|
||||
goto free_gpio;
|
||||
|
||||
if (flags & GPIOF_EXPORT) {
|
||||
@@ -260,11 +254,9 @@ index c2534d6..8697c82 100644
|
||||
if (err)
|
||||
goto free_gpio;
|
||||
}
|
||||
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
|
||||
index bde6469..3290572 100644
|
||||
--- a/include/asm-generic/gpio.h
|
||||
+++ b/include/asm-generic/gpio.h
|
||||
@@ -202,7 +202,8 @@ extern void gpio_free_array(const struct gpio *array, size_t num);
|
||||
@@ -202,7 +202,8 @@ extern void gpio_free_array(const struct
|
||||
* A sysfs interface can be exported by individual drivers if they want,
|
||||
* but more typically is configured entirely from userspace.
|
||||
*/
|
||||
@@ -284,8 +276,6 @@ index bde6469..3290572 100644
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
|
||||
index f6c7ae3..80a574a 100644
|
||||
--- a/include/linux/gpio.h
|
||||
+++ b/include/linux/gpio.h
|
||||
@@ -27,6 +27,9 @@
|
||||
@@ -298,7 +288,7 @@ index f6c7ae3..80a574a 100644
|
||||
/**
|
||||
* struct gpio - a structure describing a GPIO with configuration
|
||||
* @gpio: the GPIO number
|
||||
@@ -169,7 +172,8 @@ static inline void gpio_set_value_cansleep(unsigned gpio, int value)
|
||||
@@ -169,7 +172,8 @@ static inline void gpio_set_value_cansle
|
||||
WARN_ON(1);
|
||||
}
|
||||
|
||||
@@ -308,7 +298,7 @@ index f6c7ae3..80a574a 100644
|
||||
{
|
||||
/* GPIO can never have been requested or set as {in,out}put */
|
||||
WARN_ON(1);
|
||||
@@ -236,4 +240,24 @@ int devm_gpio_request_one(struct device *dev, unsigned gpio,
|
||||
@@ -236,4 +240,24 @@ int devm_gpio_request_one(struct device
|
||||
unsigned long flags, const char *label);
|
||||
void devm_gpio_free(struct device *dev, unsigned int gpio);
|
||||
|
||||
@@ -333,6 +323,3 @@ index f6c7ae3..80a574a 100644
|
||||
+}
|
||||
+
|
||||
#endif /* __LINUX_GPIO_H */
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
@@ -24,16 +24,16 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
NESTED(kernel_entry, 16, sp) # kernel entry point
|
||||
--- a/arch/mips/ralink/Makefile
|
||||
+++ b/arch/mips/ralink/Makefile
|
||||
@@ -15,4 +15,4 @@ obj-$(CONFIG_SOC_MT7620) += mt7620.o
|
||||
@@ -17,4 +17,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin
|
||||
|
||||
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
||||
obj-$(CONFIG_DEBUG_FS) += bootrom.o
|
||||
|
||||
-obj-y += dts/
|
||||
+#obj-y += dts/
|
||||
--- a/arch/mips/ralink/of.c
|
||||
+++ b/arch/mips/ralink/of.c
|
||||
@@ -77,6 +77,8 @@ void __init device_tree_init(void)
|
||||
free_bootmem(base, size);
|
||||
@@ -83,6 +83,8 @@ void __init device_tree_init(void)
|
||||
//free_bootmem(base, size);
|
||||
}
|
||||
|
||||
+extern struct boot_param_header __image_dtb;
|
||||
@@ -41,7 +41,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
void __init plat_mem_setup(void)
|
||||
{
|
||||
set_io_port_base(KSEG1);
|
||||
@@ -85,7 +87,7 @@ void __init plat_mem_setup(void)
|
||||
@@ -91,7 +93,7 @@ void __init plat_mem_setup(void)
|
||||
* Load the builtin devicetree. This causes the chosen node to be
|
||||
* parsed resulting in our memory appearing
|
||||
*/
|
||||
@@ -49,4 +49,4 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
+ __dt_setup_arch(&__image_dtb);
|
||||
|
||||
if (soc_info.mem_size)
|
||||
add_memory_region(soc_info.mem_base, soc_info.mem_size,
|
||||
add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
@@ -1939,7 +1939,7 @@ static int __xipram do_erase_chip(struct
|
||||
@@ -1957,7 +1957,7 @@ static int __xipram do_erase_chip(struct
|
||||
chip->erase_suspended = 0;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
break;
|
||||
|
||||
if (time_after(jiffies, timeo)) {
|
||||
@@ -2028,7 +2028,7 @@ static int __xipram do_erase_oneblock(st
|
||||
@@ -2046,7 +2046,7 @@ static int __xipram do_erase_oneblock(st
|
||||
chip->erase_suspended = 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
@@ -39,7 +39,7 @@
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <linux/mtd/xip.h>
|
||||
|
||||
#define AMD_BOOTLOC_BUG
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#define MAX_WORD_RETRIES 3
|
||||
|
||||
@@ -50,7 +50,9 @@
|
||||
@@ -52,7 +52,9 @@
|
||||
|
||||
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
|
||||
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
||||
@@ -19,7 +19,7 @@
|
||||
static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
|
||||
static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
|
||||
static void cfi_amdstd_sync (struct mtd_info *);
|
||||
@@ -186,6 +188,7 @@ static void fixup_amd_bootblock(struct m
|
||||
@@ -192,6 +194,7 @@ static void fixup_amd_bootblock(struct m
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
static void fixup_use_write_buffers(struct mtd_info *mtd)
|
||||
{
|
||||
struct map_info *map = mtd->priv;
|
||||
@@ -195,6 +198,7 @@ static void fixup_use_write_buffers(stru
|
||||
@@ -201,6 +204,7 @@ static void fixup_use_write_buffers(stru
|
||||
mtd->_write = cfi_amdstd_write_buffers;
|
||||
}
|
||||
}
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
/* Atmel chips don't use the same PRI format as AMD chips */
|
||||
static void fixup_convert_atmel_pri(struct mtd_info *mtd)
|
||||
@@ -1443,6 +1447,7 @@ static int cfi_amdstd_write_words(struct
|
||||
@@ -1461,6 +1465,7 @@ static int cfi_amdstd_write_words(struct
|
||||
/*
|
||||
* FIXME: interleaved mode not tested, and probably not supported!
|
||||
*/
|
||||
@@ -43,7 +43,7 @@
|
||||
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
|
||||
unsigned long adr, const u_char *buf,
|
||||
int len)
|
||||
@@ -1567,7 +1572,6 @@ static int __xipram do_write_buffer(stru
|
||||
@@ -1585,7 +1590,6 @@ static int __xipram do_write_buffer(stru
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
|
||||
size_t *retlen, const u_char *buf)
|
||||
{
|
||||
@@ -1642,6 +1646,7 @@ static int cfi_amdstd_write_buffers(stru
|
||||
@@ -1660,6 +1664,7 @@ static int cfi_amdstd_write_buffers(stru
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user