* [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype
@ 2008-07-13 10:51 Yoichi Yuasa
2008-07-13 10:54 ` [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() Yoichi Yuasa
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Yoichi Yuasa @ 2008-07-13 10:51 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yoichi_yuasa, Atsushi Nemoto, linux-mips
txx9_board_vec set directly without mips_machtype.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/txx9/generic/setup.c linux/arch/mips/txx9/generic/setup.c
--- linux-orig/arch/mips/txx9/generic/setup.c 2008-07-13 15:59:38.884682499 +0900
+++ linux/arch/mips/txx9/generic/setup.c 2008-07-13 16:00:06.436034688 +0900
@@ -99,19 +99,6 @@ extern struct txx9_board_vec rbtx4927_ve
extern struct txx9_board_vec rbtx4937_vec;
extern struct txx9_board_vec rbtx4938_vec;
-/* board definitions */
-static struct txx9_board_vec *board_vecs[] __initdata = {
-#ifdef CONFIG_TOSHIBA_JMR3927
- &jmr3927_vec,
-#endif
-#ifdef CONFIG_TOSHIBA_RBTX4927
- &rbtx4927_vec,
- &rbtx4937_vec,
-#endif
-#ifdef CONFIG_TOSHIBA_RBTX4938
- &rbtx4938_vec,
-#endif
-};
struct txx9_board_vec *txx9_board_vec __initdata;
static char txx9_system_type[32];
@@ -134,31 +121,26 @@ void __init prom_init_cmdline(void)
void __init prom_init(void)
{
- int i;
-
#ifdef CONFIG_CPU_TX39XX
- mips_machtype = MACH_TOSHIBA_JMR3927;
+ txx9_board_vec = &jmr3927_vec;
#endif
#ifdef CONFIG_CPU_TX49XX
switch (TX4938_REV_PCODE()) {
case 0x4927:
- mips_machtype = MACH_TOSHIBA_RBTX4927;
+ txx9_board_vec = &rbtx4927_vec;
break;
case 0x4937:
- mips_machtype = MACH_TOSHIBA_RBTX4937;
+ txx9_board_vec = &rbtx4937_vec;
break;
case 0x4938:
- mips_machtype = MACH_TOSHIBA_RBTX4938;
+ txx9_board_vec = &rbtx4938_vec;
break;
}
#endif
- for (i = 0; i < ARRAY_SIZE(board_vecs); i++) {
- if (board_vecs[i]->type == mips_machtype) {
- txx9_board_vec = board_vecs[i];
- strcpy(txx9_system_type, txx9_board_vec->system);
- return txx9_board_vec->prom_init();
- }
- }
+
+ strcpy(txx9_system_type, txx9_board_vec->system);
+
+ return txx9_board_vec->prom_init();
}
void __init prom_free_prom_memory(void)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init()
2008-07-13 10:51 [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype Yoichi Yuasa
@ 2008-07-13 10:54 ` Yoichi Yuasa
2008-07-13 11:01 ` [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() Yoichi Yuasa
2008-07-13 13:26 ` [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() Atsushi Nemoto
2008-07-13 13:17 ` [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype Atsushi Nemoto
2008-07-14 11:08 ` Ralf Baechle
2 siblings, 2 replies; 11+ messages in thread
From: Yoichi Yuasa @ 2008-07-13 10:54 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yoichi_yuasa, Atsushi Nemoto, linux-mips
txx9_cpu_clock setup move to rbtx4927_time_init().
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/txx9/rbtx4927/setup.c linux/arch/mips/txx9/rbtx4927/setup.c
--- linux-orig/arch/mips/txx9/rbtx4927/setup.c 2008-07-13 15:59:38.884682499 +0900
+++ linux/arch/mips/txx9/rbtx4927/setup.c 2008-07-13 16:36:03.473869625 +0900
@@ -252,55 +252,6 @@ static void __init rbtx4927_mem_setup(vo
set_io_port_base(KSEG1 + RBTX4927_ISA_IO_OFFSET);
#endif
- /*
- * ASSUMPTION: PCIDIVMODE is configured for PCI 33MHz or 66MHz.
- *
- * For TX4927:
- * PCIDIVMODE[12:11]'s initial value is given by S9[4:3] (ON:0, OFF:1).
- * CPU 166MHz: PCI 66MHz : PCIDIVMODE: 00 (1/2.5)
- * CPU 200MHz: PCI 66MHz : PCIDIVMODE: 01 (1/3)
- * CPU 166MHz: PCI 33MHz : PCIDIVMODE: 10 (1/5)
- * CPU 200MHz: PCI 33MHz : PCIDIVMODE: 11 (1/6)
- * i.e. S9[3]: ON (83MHz), OFF (100MHz)
- *
- * For TX4937:
- * PCIDIVMODE[12:11]'s initial value is given by S1[5:4] (ON:0, OFF:1)
- * PCIDIVMODE[10] is 0.
- * CPU 266MHz: PCI 33MHz : PCIDIVMODE: 000 (1/8)
- * CPU 266MHz: PCI 66MHz : PCIDIVMODE: 001 (1/4)
- * CPU 300MHz: PCI 33MHz : PCIDIVMODE: 010 (1/9)
- * CPU 300MHz: PCI 66MHz : PCIDIVMODE: 011 (1/4.5)
- * CPU 333MHz: PCI 33MHz : PCIDIVMODE: 100 (1/10)
- * CPU 333MHz: PCI 66MHz : PCIDIVMODE: 101 (1/5)
- *
- */
- if (mips_machtype == MACH_TOSHIBA_RBTX4937)
- switch ((unsigned long)__raw_readq(&tx4938_ccfgptr->ccfg) &
- TX4938_CCFG_PCIDIVMODE_MASK) {
- case TX4938_CCFG_PCIDIVMODE_8:
- case TX4938_CCFG_PCIDIVMODE_4:
- txx9_cpu_clock = 266666666; /* 266MHz */
- break;
- case TX4938_CCFG_PCIDIVMODE_9:
- case TX4938_CCFG_PCIDIVMODE_4_5:
- txx9_cpu_clock = 300000000; /* 300MHz */
- break;
- default:
- txx9_cpu_clock = 333333333; /* 333MHz */
- }
- else
- switch ((unsigned long)__raw_readq(&tx4927_ccfgptr->ccfg) &
- TX4927_CCFG_PCIDIVMODE_MASK) {
- case TX4927_CCFG_PCIDIVMODE_2_5:
- case TX4927_CCFG_PCIDIVMODE_5:
- txx9_cpu_clock = 166666666; /* 166MHz */
- break;
- default:
- txx9_cpu_clock = 200000000; /* 200MHz */
- }
- /* change default value to udelay/mdelay take reasonable time */
- loops_per_jiffy = txx9_cpu_clock / HZ / 2;
-
/* CCFG */
/* do reset on watchdog */
tx4927_ccfg_set(TX4927_CCFG_WR);
@@ -349,6 +300,55 @@ static void __init rbtx4927_mem_setup(vo
static void __init rbtx4927_time_init(void)
{
+ /*
+ * ASSUMPTION: PCIDIVMODE is configured for PCI 33MHz or 66MHz.
+ *
+ * For TX4927:
+ * PCIDIVMODE[12:11]'s initial value is given by S9[4:3] (ON:0, OFF:1).
+ * CPU 166MHz: PCI 66MHz : PCIDIVMODE: 00 (1/2.5)
+ * CPU 200MHz: PCI 66MHz : PCIDIVMODE: 01 (1/3)
+ * CPU 166MHz: PCI 33MHz : PCIDIVMODE: 10 (1/5)
+ * CPU 200MHz: PCI 33MHz : PCIDIVMODE: 11 (1/6)
+ * i.e. S9[3]: ON (83MHz), OFF (100MHz)
+ *
+ * For TX4937:
+ * PCIDIVMODE[12:11]'s initial value is given by S1[5:4] (ON:0, OFF:1)
+ * PCIDIVMODE[10] is 0.
+ * CPU 266MHz: PCI 33MHz : PCIDIVMODE: 000 (1/8)
+ * CPU 266MHz: PCI 66MHz : PCIDIVMODE: 001 (1/4)
+ * CPU 300MHz: PCI 33MHz : PCIDIVMODE: 010 (1/9)
+ * CPU 300MHz: PCI 66MHz : PCIDIVMODE: 011 (1/4.5)
+ * CPU 333MHz: PCI 33MHz : PCIDIVMODE: 100 (1/10)
+ * CPU 333MHz: PCI 66MHz : PCIDIVMODE: 101 (1/5)
+ */
+ if (mips_machtype == MACH_TOSHIBA_RBTX4937)
+ switch ((unsigned long)__raw_readq(&tx4938_ccfgptr->ccfg) &
+ TX4938_CCFG_PCIDIVMODE_MASK) {
+ case TX4938_CCFG_PCIDIVMODE_8:
+ case TX4938_CCFG_PCIDIVMODE_4:
+ txx9_cpu_clock = 266666666; /* 266MHz */
+ break;
+ case TX4938_CCFG_PCIDIVMODE_9:
+ case TX4938_CCFG_PCIDIVMODE_4_5:
+ txx9_cpu_clock = 300000000; /* 300MHz */
+ break;
+ default:
+ txx9_cpu_clock = 333333333; /* 333MHz */
+ }
+ else
+ switch ((unsigned long)__raw_readq(&tx4927_ccfgptr->ccfg) &
+ TX4927_CCFG_PCIDIVMODE_MASK) {
+ case TX4927_CCFG_PCIDIVMODE_2_5:
+ case TX4927_CCFG_PCIDIVMODE_5:
+ txx9_cpu_clock = 166666666; /* 166MHz */
+ break;
+ default:
+ txx9_cpu_clock = 200000000; /* 200MHz */
+ }
+
+ /* change default value to udelay/mdelay take reasonable time */
+ loops_per_jiffy = txx9_cpu_clock / HZ / 2;
+
mips_hpt_frequency = txx9_cpu_clock / 2;
if (____raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_TINTDIS)
txx9_clockevent_init(TX4927_TMR_REG(0) & 0xfffffffffULL,
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init()
2008-07-13 10:54 ` [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() Yoichi Yuasa
@ 2008-07-13 11:01 ` Yoichi Yuasa
2008-07-13 11:02 ` [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() Yoichi Yuasa
2008-07-13 13:28 ` [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() Atsushi Nemoto
2008-07-13 13:26 ` [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() Atsushi Nemoto
1 sibling, 2 replies; 11+ messages in thread
From: Yoichi Yuasa @ 2008-07-13 11:01 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yoichi_yuasa, Atsushi Nemoto, linux-mips
Separate rbtx4927_arch_init() and rbtx4937_arch_init().
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/txx9/rbtx4927/setup.c linux/arch/mips/txx9/rbtx4927/setup.c
--- linux-orig/arch/mips/txx9/rbtx4927/setup.c 2008-07-13 16:49:44.924681441 +0900
+++ linux/arch/mips/txx9/rbtx4927/setup.c 2008-07-13 16:50:54.684656833 +0900
@@ -170,13 +170,16 @@ static void __init tx4937_pci_setup(void
static void __init rbtx4927_arch_init(void)
{
- if (mips_machtype == MACH_TOSHIBA_RBTX4937)
- tx4937_pci_setup();
- else
- tx4927_pci_setup();
+ tx4927_pci_setup();
+}
+
+static void __init rbtx4937_arch_init(void)
+{
+ tx4937_pci_setup();
}
#else
#define rbtx4927_arch_init NULL
+#define rbtx4937_arch_init NULL
#endif /* CONFIG_PCI */
static void __noreturn wait_forever(void)
@@ -433,7 +436,7 @@ struct txx9_board_vec rbtx4937_vec __ini
.irq_setup = rbtx4927_irq_setup,
.time_init = rbtx4927_time_init,
.device_init = rbtx4927_device_init,
- .arch_init = rbtx4927_arch_init,
+ .arch_init = rbtx4937_arch_init,
#ifdef CONFIG_PCI
.pci_map_irq = rbtx4927_pci_map_irq,
#endif
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init()
2008-07-13 11:01 ` [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() Yoichi Yuasa
@ 2008-07-13 11:02 ` Yoichi Yuasa
2008-07-13 11:04 ` [PATCH][5/5][MIPS] remove machtype for group Toshiba Yoichi Yuasa
2008-07-13 13:28 ` [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() Atsushi Nemoto
2008-07-13 13:28 ` [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() Atsushi Nemoto
1 sibling, 2 replies; 11+ messages in thread
From: Yoichi Yuasa @ 2008-07-13 11:02 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yoichi_yuasa, Atsushi Nemoto, linux-mips
Separate rbtx4927_time_init() and rbtx4937_time_init().
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/txx9/rbtx4927/setup.c linux/arch/mips/txx9/rbtx4927/setup.c
--- linux-orig/arch/mips/txx9/rbtx4927/setup.c 2008-07-13 16:51:55.940147585 +0900
+++ linux/arch/mips/txx9/rbtx4927/setup.c 2008-07-13 17:39:51.676909186 +0900
@@ -301,6 +301,18 @@ static void __init rbtx4927_mem_setup(vo
#endif
}
+static void __init rbtx49x7_common_time_init(void)
+{
+ /* change default value to udelay/mdelay take reasonable time */
+ loops_per_jiffy = txx9_cpu_clock / HZ / 2;
+
+ mips_hpt_frequency = txx9_cpu_clock / 2;
+ if (____raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_TINTDIS)
+ txx9_clockevent_init(TX4927_TMR_REG(0) & 0xfffffffffULL,
+ TXX9_IRQ_BASE + 17,
+ 50000000);
+}
+
static void __init rbtx4927_time_init(void)
{
/*
@@ -313,6 +325,24 @@ static void __init rbtx4927_time_init(vo
* CPU 166MHz: PCI 33MHz : PCIDIVMODE: 10 (1/5)
* CPU 200MHz: PCI 33MHz : PCIDIVMODE: 11 (1/6)
* i.e. S9[3]: ON (83MHz), OFF (100MHz)
+ */
+ switch ((unsigned long)__raw_readq(&tx4927_ccfgptr->ccfg) &
+ TX4927_CCFG_PCIDIVMODE_MASK) {
+ case TX4927_CCFG_PCIDIVMODE_2_5:
+ case TX4927_CCFG_PCIDIVMODE_5:
+ txx9_cpu_clock = 166666666; /* 166MHz */
+ break;
+ default:
+ txx9_cpu_clock = 200000000; /* 200MHz */
+ }
+
+ rbtx49x7_common_time_init();
+}
+
+static void __init rbtx4937_time_init(void)
+{
+ /*
+ * ASSUMPTION: PCIDIVMODE is configured for PCI 33MHz or 66MHz.
*
* For TX4937:
* PCIDIVMODE[12:11]'s initial value is given by S1[5:4] (ON:0, OFF:1)
@@ -324,39 +354,21 @@ static void __init rbtx4927_time_init(vo
* CPU 333MHz: PCI 33MHz : PCIDIVMODE: 100 (1/10)
* CPU 333MHz: PCI 66MHz : PCIDIVMODE: 101 (1/5)
*/
- if (mips_machtype == MACH_TOSHIBA_RBTX4937)
- switch ((unsigned long)__raw_readq(&tx4938_ccfgptr->ccfg) &
- TX4938_CCFG_PCIDIVMODE_MASK) {
- case TX4938_CCFG_PCIDIVMODE_8:
- case TX4938_CCFG_PCIDIVMODE_4:
- txx9_cpu_clock = 266666666; /* 266MHz */
- break;
- case TX4938_CCFG_PCIDIVMODE_9:
- case TX4938_CCFG_PCIDIVMODE_4_5:
- txx9_cpu_clock = 300000000; /* 300MHz */
- break;
- default:
- txx9_cpu_clock = 333333333; /* 333MHz */
- }
- else
- switch ((unsigned long)__raw_readq(&tx4927_ccfgptr->ccfg) &
- TX4927_CCFG_PCIDIVMODE_MASK) {
- case TX4927_CCFG_PCIDIVMODE_2_5:
- case TX4927_CCFG_PCIDIVMODE_5:
- txx9_cpu_clock = 166666666; /* 166MHz */
- break;
- default:
- txx9_cpu_clock = 200000000; /* 200MHz */
- }
-
- /* change default value to udelay/mdelay take reasonable time */
- loops_per_jiffy = txx9_cpu_clock / HZ / 2;
+ switch ((unsigned long)__raw_readq(&tx4938_ccfgptr->ccfg) &
+ TX4938_CCFG_PCIDIVMODE_MASK) {
+ case TX4938_CCFG_PCIDIVMODE_8:
+ case TX4938_CCFG_PCIDIVMODE_4:
+ txx9_cpu_clock = 266666666; /* 266MHz */
+ break;
+ case TX4938_CCFG_PCIDIVMODE_9:
+ case TX4938_CCFG_PCIDIVMODE_4_5:
+ txx9_cpu_clock = 300000000; /* 300MHz */
+ break;
+ default:
+ txx9_cpu_clock = 333333333; /* 333MHz */
+ }
- mips_hpt_frequency = txx9_cpu_clock / 2;
- if (____raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_TINTDIS)
- txx9_clockevent_init(TX4927_TMR_REG(0) & 0xfffffffffULL,
- TXX9_IRQ_BASE + 17,
- 50000000);
+ rbtx49x7_common_time_init();
}
static int __init toshiba_rbtx4927_rtc_init(void)
@@ -434,7 +446,7 @@ struct txx9_board_vec rbtx4937_vec __ini
.prom_init = rbtx4927_prom_init,
.mem_setup = rbtx4927_mem_setup,
.irq_setup = rbtx4927_irq_setup,
- .time_init = rbtx4927_time_init,
+ .time_init = rbtx4937_time_init,
.device_init = rbtx4927_device_init,
.arch_init = rbtx4937_arch_init,
#ifdef CONFIG_PCI
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH][5/5][MIPS] remove machtype for group Toshiba
2008-07-13 11:02 ` [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() Yoichi Yuasa
@ 2008-07-13 11:04 ` Yoichi Yuasa
2008-07-13 13:31 ` Atsushi Nemoto
2008-07-13 13:28 ` [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() Atsushi Nemoto
1 sibling, 1 reply; 11+ messages in thread
From: Yoichi Yuasa @ 2008-07-13 11:04 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yoichi_yuasa, Atsushi Nemoto, linux-mips
Remove machtype for group Toshiba.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/txx9/jmr3927/setup.c linux/arch/mips/txx9/jmr3927/setup.c
--- linux-orig/arch/mips/txx9/jmr3927/setup.c 2008-07-13 15:59:38.884682499 +0900
+++ linux/arch/mips/txx9/jmr3927/setup.c 2008-07-13 17:43:27.789224724 +0900
@@ -366,7 +366,6 @@ static void __init jmr3927_device_init(v
}
struct txx9_board_vec jmr3927_vec __initdata = {
- .type = MACH_TOSHIBA_JMR3927,
.system = "Toshiba JMR_TX3927",
.prom_init = jmr3927_prom_init,
.mem_setup = jmr3927_mem_setup,
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/txx9/rbtx4927/setup.c linux/arch/mips/txx9/rbtx4927/setup.c
--- linux-orig/arch/mips/txx9/rbtx4927/setup.c 2008-07-13 17:40:52.452372581 +0900
+++ linux/arch/mips/txx9/rbtx4927/setup.c 2008-07-13 17:43:39.193874641 +0900
@@ -428,7 +428,6 @@ static void __init rbtx4927_device_init(
}
struct txx9_board_vec rbtx4927_vec __initdata = {
- .type = MACH_TOSHIBA_RBTX4927,
.system = "Toshiba RBTX4927",
.prom_init = rbtx4927_prom_init,
.mem_setup = rbtx4927_mem_setup,
@@ -441,7 +440,6 @@ struct txx9_board_vec rbtx4927_vec __ini
#endif
};
struct txx9_board_vec rbtx4937_vec __initdata = {
- .type = MACH_TOSHIBA_RBTX4937,
.system = "Toshiba RBTX4937",
.prom_init = rbtx4927_prom_init,
.mem_setup = rbtx4927_mem_setup,
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/arch/mips/txx9/rbtx4938/setup.c linux/arch/mips/txx9/rbtx4938/setup.c
--- linux-orig/arch/mips/txx9/rbtx4938/setup.c 2008-07-13 15:59:38.888682728 +0900
+++ linux/arch/mips/txx9/rbtx4938/setup.c 2008-07-13 17:43:47.814365892 +0900
@@ -619,7 +619,6 @@ static void __init rbtx4938_device_init(
}
struct txx9_board_vec rbtx4938_vec __initdata = {
- .type = MACH_TOSHIBA_RBTX4938,
.system = "Toshiba RBTX4938",
.prom_init = rbtx4938_prom_init,
.mem_setup = rbtx4938_mem_setup,
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/include/asm-mips/bootinfo.h linux/include/asm-mips/bootinfo.h
--- linux-orig/include/asm-mips/bootinfo.h 2008-07-13 15:59:46.073092146 +0900
+++ linux/include/asm-mips/bootinfo.h 2008-07-13 17:44:27.320617224 +0900
@@ -62,17 +62,6 @@
#define MACH_SGI_IP30 4 /* Octane, Octane2 */
/*
- * Valid machtypes for group Toshiba
- */
-#define MACH_PALLAS 0
-#define MACH_TOPAS 1
-#define MACH_JMR 2
-#define MACH_TOSHIBA_JMR3927 3 /* JMR-TX3927 CPU/IO board */
-#define MACH_TOSHIBA_RBTX4927 4
-#define MACH_TOSHIBA_RBTX4937 5
-#define MACH_TOSHIBA_RBTX4938 6
-
-/*
* Valid machtype for group LASAT
*/
#define MACH_LASAT_100 0 /* Masquerade II/SP100/SP50/SP25 */
diff -pruN -X /home/yuasa/Memo/dontdiff linux-orig/include/asm-mips/txx9/generic.h linux/include/asm-mips/txx9/generic.h
--- linux-orig/include/asm-mips/txx9/generic.h 2008-07-13 15:59:46.285104227 +0900
+++ linux/include/asm-mips/txx9/generic.h 2008-07-13 17:44:15.759958419 +0900
@@ -22,7 +22,6 @@ extern unsigned int txx9_gbus_clock;
struct pci_dev;
struct txx9_board_vec {
- unsigned long type;
const char *system;
void (*prom_init)(void);
void (*mem_setup)(void);
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype
2008-07-13 10:51 [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype Yoichi Yuasa
2008-07-13 10:54 ` [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() Yoichi Yuasa
@ 2008-07-13 13:17 ` Atsushi Nemoto
2008-07-14 11:08 ` Ralf Baechle
2 siblings, 0 replies; 11+ messages in thread
From: Atsushi Nemoto @ 2008-07-13 13:17 UTC (permalink / raw)
To: yoichi_yuasa; +Cc: ralf, linux-mips
On Sun, 13 Jul 2008 19:51:55 +0900, Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> wrote:
> txx9_board_vec set directly without mips_machtype.
>
> Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init()
2008-07-13 10:54 ` [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() Yoichi Yuasa
2008-07-13 11:01 ` [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() Yoichi Yuasa
@ 2008-07-13 13:26 ` Atsushi Nemoto
1 sibling, 0 replies; 11+ messages in thread
From: Atsushi Nemoto @ 2008-07-13 13:26 UTC (permalink / raw)
To: yoichi_yuasa; +Cc: ralf, linux-mips
On Sun, 13 Jul 2008 19:54:08 +0900, Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> wrote:
> txx9_cpu_clock setup move to rbtx4927_time_init().
>
> Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
I'm thinking of replacing some magic constant used in
rbtx4927_mem_setup with txx9_cpu_clock, but it is not done yet, so no
problem for now. I'll be back ;)
Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init()
2008-07-13 11:01 ` [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() Yoichi Yuasa
2008-07-13 11:02 ` [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() Yoichi Yuasa
@ 2008-07-13 13:28 ` Atsushi Nemoto
1 sibling, 0 replies; 11+ messages in thread
From: Atsushi Nemoto @ 2008-07-13 13:28 UTC (permalink / raw)
To: yoichi_yuasa; +Cc: ralf, linux-mips
On Sun, 13 Jul 2008 20:01:04 +0900, Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> wrote:
> Separate rbtx4927_arch_init() and rbtx4937_arch_init().
>
> Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init()
2008-07-13 11:02 ` [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() Yoichi Yuasa
2008-07-13 11:04 ` [PATCH][5/5][MIPS] remove machtype for group Toshiba Yoichi Yuasa
@ 2008-07-13 13:28 ` Atsushi Nemoto
1 sibling, 0 replies; 11+ messages in thread
From: Atsushi Nemoto @ 2008-07-13 13:28 UTC (permalink / raw)
To: yoichi_yuasa; +Cc: ralf, linux-mips
On Sun, 13 Jul 2008 20:02:13 +0900, Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> wrote:
> Separate rbtx4927_time_init() and rbtx4937_time_init().
>
> Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH][5/5][MIPS] remove machtype for group Toshiba
2008-07-13 11:04 ` [PATCH][5/5][MIPS] remove machtype for group Toshiba Yoichi Yuasa
@ 2008-07-13 13:31 ` Atsushi Nemoto
0 siblings, 0 replies; 11+ messages in thread
From: Atsushi Nemoto @ 2008-07-13 13:31 UTC (permalink / raw)
To: yoichi_yuasa; +Cc: ralf, linux-mips
On Sun, 13 Jul 2008 20:04:18 +0900, Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> wrote:
> Remove machtype for group Toshiba.
>
> Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Looks very good, thanks Yuasa-san!
Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype
2008-07-13 10:51 [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype Yoichi Yuasa
2008-07-13 10:54 ` [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() Yoichi Yuasa
2008-07-13 13:17 ` [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype Atsushi Nemoto
@ 2008-07-14 11:08 ` Ralf Baechle
2 siblings, 0 replies; 11+ messages in thread
From: Ralf Baechle @ 2008-07-14 11:08 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: Atsushi Nemoto, linux-mips
On Sun, Jul 13, 2008 at 07:51:55PM +0900, Yoichi Yuasa wrote:
All five queued up for 2.6.27.
Thanks, Yoichi-San!
Ralf
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2008-07-14 11:08 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-13 10:51 [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype Yoichi Yuasa
2008-07-13 10:54 ` [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() Yoichi Yuasa
2008-07-13 11:01 ` [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() Yoichi Yuasa
2008-07-13 11:02 ` [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() Yoichi Yuasa
2008-07-13 11:04 ` [PATCH][5/5][MIPS] remove machtype for group Toshiba Yoichi Yuasa
2008-07-13 13:31 ` Atsushi Nemoto
2008-07-13 13:28 ` [PATCH][4/5][MIPS] separate rbtx4927_time_init() and rbtx4937_time_init() Atsushi Nemoto
2008-07-13 13:28 ` [PATCH][3/5][MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init() Atsushi Nemoto
2008-07-13 13:26 ` [PATCH][2/5][MIPS] txx9_cpu_clock setup move to rbtx4927_time_init() Atsushi Nemoto
2008-07-13 13:17 ` [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype Atsushi Nemoto
2008-07-14 11:08 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox