|
|
|
@ -54,8 +54,6 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr> |
|
|
|
|
create mode 100644 include/asm-mips/mach-bcm63xx/gpio.h
|
|
|
|
|
create mode 100644 include/asm-mips/mach-bcm63xx/war.h
|
|
|
|
|
|
|
|
|
|
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
|
|
|
|
|
index 1e06d23..88dfe21 100644
|
|
|
|
|
--- a/arch/mips/Kconfig
|
|
|
|
|
+++ b/arch/mips/Kconfig
|
|
|
|
|
@@ -59,6 +59,21 @@ config BCM47XX
|
|
|
|
@ -88,11 +86,9 @@ index 1e06d23..88dfe21 100644 |
|
|
|
|
source "arch/mips/jazz/Kconfig"
|
|
|
|
|
source "arch/mips/lasat/Kconfig"
|
|
|
|
|
source "arch/mips/pmc-sierra/Kconfig"
|
|
|
|
|
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
|
|
|
|
|
index 9aab51c..a45652e 100644
|
|
|
|
|
--- a/arch/mips/Makefile
|
|
|
|
|
+++ b/arch/mips/Makefile
|
|
|
|
|
@@ -533,6 +533,13 @@ cflags-$(CONFIG_BCM47XX) += -Iinclude/asm-mips/mach-bcm47xx
|
|
|
|
|
@@ -533,6 +533,13 @@ cflags-$(CONFIG_BCM47XX) += -Iinclude/as
|
|
|
|
|
load-$(CONFIG_BCM47XX) := 0xffffffff80001000
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
@ -106,9 +102,6 @@ index 9aab51c..a45652e 100644 |
|
|
|
|
# SNI RM
|
|
|
|
|
#
|
|
|
|
|
core-$(CONFIG_SNI_RM) += arch/mips/sni/
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..e6d2699
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/Kconfig
|
|
|
|
|
@@ -0,0 +1,9 @@
|
|
|
|
@ -121,17 +114,11 @@ index 0000000..e6d2699 |
|
|
|
|
+config BCM63XX_CPU_6358
|
|
|
|
|
+ bool "support 6358 CPU"
|
|
|
|
|
+endmenu
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/Makefile b/arch/mips/bcm63xx/Makefile
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..4fc0a1c
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/Makefile
|
|
|
|
|
@@ -0,0 +1,2 @@
|
|
|
|
|
+obj-y += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o
|
|
|
|
|
+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..ae1f41f
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/clk.c
|
|
|
|
|
@@ -0,0 +1,220 @@
|
|
|
|
@ -355,9 +342,6 @@ index 0000000..ae1f41f |
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+EXPORT_SYMBOL(clk_put);
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..0a403dd
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/cpu.c
|
|
|
|
|
@@ -0,0 +1,245 @@
|
|
|
|
@ -606,9 +590,6 @@ index 0000000..0a403dd |
|
|
|
|
+ printk(KERN_INFO "%uMB of RAM installed\n",
|
|
|
|
|
+ bcm63xx_memory_size >> 20);
|
|
|
|
|
+}
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/cs.c b/arch/mips/bcm63xx/cs.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..50d8190
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/cs.c
|
|
|
|
|
@@ -0,0 +1,144 @@
|
|
|
|
@ -756,9 +737,6 @@ index 0000000..50d8190 |
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+EXPORT_SYMBOL(bcm63xx_set_cs_status);
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/early_printk.c b/arch/mips/bcm63xx/early_printk.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..bf353c9
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/early_printk.c
|
|
|
|
|
@@ -0,0 +1,30 @@
|
|
|
|
@ -792,9 +770,6 @@ index 0000000..bf353c9 |
|
|
|
|
+ bcm_uart0_writel(c, UART_FIFO_REG);
|
|
|
|
|
+ wait_xfered();
|
|
|
|
|
+}
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..2c203a6
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/gpio.c
|
|
|
|
|
@@ -0,0 +1,98 @@
|
|
|
|
@ -896,9 +871,6 @@ index 0000000..2c203a6 |
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+EXPORT_SYMBOL(bcm63xx_gpio_set_direction);
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..a0c5cd1
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/irq.c
|
|
|
|
|
@@ -0,0 +1,253 @@
|
|
|
|
@ -1155,9 +1127,6 @@ index 0000000..a0c5cd1 |
|
|
|
|
+
|
|
|
|
|
+ setup_irq(IRQ_MIPS_BASE + 2, &cpu_ip2_cascade_action);
|
|
|
|
|
+}
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..f0b49e8
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/prom.c
|
|
|
|
|
@@ -0,0 +1,43 @@
|
|
|
|
@ -1204,9 +1173,6 @@ index 0000000..f0b49e8 |
|
|
|
|
+void __init prom_free_prom_memory(void)
|
|
|
|
|
+{
|
|
|
|
|
+}
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..55c51a9
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/setup.c
|
|
|
|
|
@@ -0,0 +1,108 @@
|
|
|
|
@ -1318,9 +1284,6 @@ index 0000000..55c51a9 |
|
|
|
|
+
|
|
|
|
|
+ set_io_port_base(0);
|
|
|
|
|
+}
|
|
|
|
|
diff --git a/arch/mips/bcm63xx/timer.c b/arch/mips/bcm63xx/timer.c
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..ba522bd
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/mips/bcm63xx/timer.c
|
|
|
|
|
@@ -0,0 +1,205 @@
|
|
|
|
@ -1529,8 +1492,6 @@ index 0000000..ba522bd |
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+arch_initcall(bcm63xx_timer_init);
|
|
|
|
|
diff --git a/include/asm-mips/fixmap.h b/include/asm-mips/fixmap.h
|
|
|
|
|
index 9cc8522..884c7a9 100644
|
|
|
|
|
--- a/include/asm-mips/fixmap.h
|
|
|
|
|
+++ b/include/asm-mips/fixmap.h
|
|
|
|
|
@@ -67,11 +67,15 @@ enum fixed_addresses {
|
|
|
|
@ -1549,9 +1510,6 @@ index 9cc8522..884c7a9 100644 |
|
|
|
|
#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
|
|
|
|
|
#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
|
|
|
|
|
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/bcm63xx_clk.h b/include/asm-mips/mach-bcm63xx/bcm63xx_clk.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..8fcf8df
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/bcm63xx_clk.h
|
|
|
|
|
@@ -0,0 +1,11 @@
|
|
|
|
@ -1566,9 +1524,6 @@ index 0000000..8fcf8df |
|
|
|
|
+};
|
|
|
|
|
+
|
|
|
|
|
+#endif /* ! BCM63XX_CLK_H_ */
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h b/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..29b61fd
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h
|
|
|
|
|
@@ -0,0 +1,314 @@
|
|
|
|
@ -1886,9 +1841,6 @@ index 0000000..29b61fd |
|
|
|
|
+unsigned int bcm63xx_get_memory_size(void);
|
|
|
|
|
+
|
|
|
|
|
+#endif /* !BCM63XX_CPU_H_ */
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/bcm63xx_cs.h b/include/asm-mips/mach-bcm63xx/bcm63xx_cs.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..b1821c8
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/bcm63xx_cs.h
|
|
|
|
|
@@ -0,0 +1,10 @@
|
|
|
|
@ -1902,9 +1854,6 @@ index 0000000..b1821c8 |
|
|
|
|
+int bcm63xx_set_cs_status(unsigned int cs, int enable);
|
|
|
|
|
+
|
|
|
|
|
+#endif /* !BCM63XX_CS_H */
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h b/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..31145df
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
|
|
|
|
|
@@ -0,0 +1,14 @@
|
|
|
|
@ -1922,9 +1871,6 @@ index 0000000..31145df |
|
|
|
|
+#define GPIO_DIR_IN 0x1
|
|
|
|
|
+
|
|
|
|
|
+#endif /* !BCM63XX_GPIO_H */
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/bcm63xx_io.h b/include/asm-mips/mach-bcm63xx/bcm63xx_io.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..1aef06f
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/bcm63xx_io.h
|
|
|
|
|
@@ -0,0 +1,93 @@
|
|
|
|
@ -2021,9 +1967,6 @@ index 0000000..1aef06f |
|
|
|
|
+#define bcm_ddr_writel(v,o) bcm_rset_writel(RSET_DDR, (v), (o))
|
|
|
|
|
+
|
|
|
|
|
+#endif /* ! BCM63XX_IO_H_ */
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/bcm63xx_irq.h b/include/asm-mips/mach-bcm63xx/bcm63xx_irq.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..5f95577
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/bcm63xx_irq.h
|
|
|
|
|
@@ -0,0 +1,15 @@
|
|
|
|
@ -2042,9 +1985,6 @@ index 0000000..5f95577 |
|
|
|
|
+#define IRQ_EXT_3 (IRQ_EXT_BASE + 3)
|
|
|
|
|
+
|
|
|
|
|
+#endif /* ! BCM63XX_IRQ_H_ */
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h b/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..b5562b1
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h
|
|
|
|
|
@@ -0,0 +1,728 @@
|
|
|
|
@ -2776,9 +2716,6 @@ index 0000000..b5562b1 |
|
|
|
|
+
|
|
|
|
|
+#endif /* BCM63XX_REGS_H_ */
|
|
|
|
|
+
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/bcm63xx_timer.h b/include/asm-mips/mach-bcm63xx/bcm63xx_timer.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..c0fce83
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/bcm63xx_timer.h
|
|
|
|
|
@@ -0,0 +1,11 @@
|
|
|
|
@ -2793,9 +2730,6 @@ index 0000000..c0fce83 |
|
|
|
|
+unsigned int bcm63xx_timer_countdown(unsigned int countdown_us);
|
|
|
|
|
+
|
|
|
|
|
+#endif /* !BCM63XX_TIMER_H_ */
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/cpu-feature-overrides.h b/include/asm-mips/mach-bcm63xx/cpu-feature-overrides.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..1a5c4b1
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/cpu-feature-overrides.h
|
|
|
|
|
@@ -0,0 +1,51 @@
|
|
|
|
@ -2850,9 +2784,6 @@ index 0000000..1a5c4b1 |
|
|
|
|
+#define cpu_scache_line_size() 0
|
|
|
|
|
+
|
|
|
|
|
+#endif /* __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H */
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/gpio.h b/include/asm-mips/mach-bcm63xx/gpio.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..dd2c0f3
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/gpio.h
|
|
|
|
|
@@ -0,0 +1,52 @@
|
|
|
|
@ -2908,9 +2839,6 @@ index 0000000..dd2c0f3 |
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+#endif /* __ASM_MIPS_MACH_BCM63XX_GPIO_H */
|
|
|
|
|
diff --git a/include/asm-mips/mach-bcm63xx/war.h b/include/asm-mips/mach-bcm63xx/war.h
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..8e3f3fd
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/include/asm-mips/mach-bcm63xx/war.h
|
|
|
|
|
@@ -0,0 +1,25 @@
|
|
|
|
@ -2939,6 +2867,3 @@ index 0000000..8e3f3fd |
|
|
|
|
+#define MIPS34K_MISSED_ITLB_WAR 0
|
|
|
|
|
+
|
|
|
|
|
+#endif /* __ASM_MIPS_MACH_BCM63XX_WAR_H */
|
|
|
|
|
--
|
|
|
|
|
1.5.4.3
|
|
|
|
|
|
|
|
|
|