]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
sh: Add early printk support for SH770x CPUs.
authorRafael Ignacio Zurita <rizurita@yahoo.com>
Tue, 4 Aug 2009 05:38:08 +0000 (14:38 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 4 Aug 2009 05:38:08 +0000 (14:38 +0900)
This adds early printk support for SH770x (tested on SH7709 based hp6xx).

Signed-off-by: Rafael Ignacio Zurita <rizurita@yahoo.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/Kconfig.debug
arch/sh/kernel/early_printk.c

index a6dce41296e745530c6cf4093bb50cb8afc9c5e8..763b792b16113fe852d66f28e49d57c133f6be46 100644 (file)
@@ -43,6 +43,7 @@ config EARLY_SCIF_CONSOLE_PORT
        default "0xfffe8000" if CPU_SUBTYPE_SH7203
        default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263
        default "0xffe80000" if CPU_SH4
+       default "0xa4000150" if CPU_SH3
        default "0x00000000"
 
 config EARLY_PRINTK
index a952dcf9999d43bedbef8ff275aa3517fb13ab91..64f2746baf91312f58920388985015dbc1dae353 100644 (file)
@@ -134,7 +134,7 @@ static void scif_sercon_init(char *s)
        sci_out(&scif_port, SCFCR, 0x0030);     /* TTRG=b'11 */
        sci_out(&scif_port, SCSCR, 0x0030);     /* TE, RE */
 }
-#elif defined(CONFIG_CPU_SH4)
+#elif defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SH3)
 #define DEFAULT_BAUD 115200
 /*
  * Simple SCIF init, primarily aimed at SH7750 and other similar SH-4
@@ -220,10 +220,8 @@ static int __init setup_early_printk(char *buf)
                early_console = &scif_console;
 
 #if !defined(CONFIG_SH_STANDARD_BIOS)
-#if defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SUBTYPE_SH7720) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7721)
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_CPU_SH3)
                scif_sercon_init(buf + 6);
-#endif
 #endif
        }
 #endif