diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-08-19 09:55:10 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-10-11 11:18:42 -0400 |
commit | c7b95bcb38ea492fd025008ef99501a2b90aa237 (patch) | |
tree | a7865927d4745285038903a9e0f5507ccd38846d | |
parent | d10e025f0e4ba4b96d7b5786d232ac5b0b232b11 (diff) |
MIPS: TXx9: Runtime configuration of timeout-error
Add kernel options to control bus timeout error.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/txx9/generic/setup.c | 11 | ||||
-rw-r--r-- | arch/mips/txx9/generic/setup_tx3927.c | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index fa88aefea9ef..fa45f174b0ee 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c | |||
@@ -68,7 +68,12 @@ unsigned int txx9_master_clock; | |||
68 | unsigned int txx9_cpu_clock; | 68 | unsigned int txx9_cpu_clock; |
69 | unsigned int txx9_gbus_clock; | 69 | unsigned int txx9_gbus_clock; |
70 | 70 | ||
71 | #ifdef CONFIG_CPU_TX39XX | ||
72 | /* don't enable by default - see errata */ | ||
73 | int txx9_ccfg_toeon __initdata; | ||
74 | #else | ||
71 | int txx9_ccfg_toeon __initdata = 1; | 75 | int txx9_ccfg_toeon __initdata = 1; |
76 | #endif | ||
72 | 77 | ||
73 | /* Minimum CLK support */ | 78 | /* Minimum CLK support */ |
74 | 79 | ||
@@ -315,6 +320,12 @@ static void __init preprocess_cmdline(void) | |||
315 | } else if (strcmp(str, "dcdisable") == 0) { | 320 | } else if (strcmp(str, "dcdisable") == 0) { |
316 | txx9_dc_disable = 1; | 321 | txx9_dc_disable = 1; |
317 | continue; | 322 | continue; |
323 | } else if (strcmp(str, "toeoff") == 0) { | ||
324 | txx9_ccfg_toeon = 0; | ||
325 | continue; | ||
326 | } else if (strcmp(str, "toeon") == 0) { | ||
327 | txx9_ccfg_toeon = 1; | ||
328 | continue; | ||
318 | } | 329 | } |
319 | if (arcs_cmdline[0]) | 330 | if (arcs_cmdline[0]) |
320 | strcat(arcs_cmdline, " "); | 331 | strcat(arcs_cmdline, " "); |
diff --git a/arch/mips/txx9/generic/setup_tx3927.c b/arch/mips/txx9/generic/setup_tx3927.c index 4bc2f859379d..06c492576078 100644 --- a/arch/mips/txx9/generic/setup_tx3927.c +++ b/arch/mips/txx9/generic/setup_tx3927.c | |||
@@ -32,11 +32,6 @@ void __init tx3927_setup(void) | |||
32 | int i; | 32 | int i; |
33 | unsigned int conf; | 33 | unsigned int conf; |
34 | 34 | ||
35 | /* don't enable - see errata */ | ||
36 | txx9_ccfg_toeon = 0; | ||
37 | if (strstr(prom_getcmdline(), "toeon") != NULL) | ||
38 | txx9_ccfg_toeon = 1; | ||
39 | |||
40 | txx9_reg_res_init(TX3927_REV_PCODE(), TX3927_REG_BASE, | 35 | txx9_reg_res_init(TX3927_REV_PCODE(), TX3927_REG_BASE, |
41 | TX3927_REG_SIZE); | 36 | TX3927_REG_SIZE); |
42 | 37 | ||