From e732d5deb63553f53b125700b474f61fad7a3fc0 Mon Sep 17 00:00:00 2001 From: Matt Mullins Date: Tue, 11 Aug 2015 23:07:41 -0700 Subject: [PATCH] Working early_printk for Edison's HSU. This hard-codes the address that port 2 would use. --- arch/x86/platform/intel-mid/early_printk_intel_mid.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/arch/x86/platform/intel-mid/early_printk_intel_mid.c b/arch/x86/platform/intel-mid/early_printk_intel_mid.c index 3b361bdaca5..3d32527b3d9 100644 --- a/arch/x86/platform/intel-mid/early_printk_intel_mid.c +++ b/arch/x86/platform/intel-mid/early_printk_intel_mid.c @@ -409,24 +409,8 @@ void hsu_early_console_init(const char *s) u8 lcr; int *clkctl; - if (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_TANGIER) { - paddr = MERR_HSU_PORT_BASE; - clkctl = (int *)set_fixmap_offset_nocache(FIX_CLOCK_CTL, - MERR_HSU_CLK_CTL); - } else { - paddr = MFLD_HSU_PORT_BASE; - clkctl = NULL; - } - - /* - * Select the early HSU console port if specified by user in the - * kernel command line. - */ - if (*s && !kstrtoul(s, 10, &port)) - port = clamp_val(port, 0, 2); - - paddr += port * 0x80; - phsu = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE, paddr); + phsu = (void *) __va(0xff010180); + return; /* Disable FIFO */ writeb(0x0, phsu + UART_FCR); -- 2.11.0