From: Alan Cox <alan@linux.intel.com>
To: linux-serial@vger.kernel.org, greg@kroah.com
Subject: [PATCH 3/5] hsu, earlyprintk: remove the GPIO work around
Date: Mon, 06 Sep 2010 13:39:45 +0100 [thread overview]
Message-ID: <20100906123935.1328.17198.stgit@localhost.localdomain> (raw)
In-Reply-To: <20100906123843.1328.3930.stgit@localhost.localdomain>
From: Feng Tang <feng.tang@intel.com>
Latest firmware will correctly configure the GPIO lines used by
hsu console, so remove that workaround.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
arch/x86/kernel/mrst_earlyprintk.c | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/arch/x86/kernel/mrst_earlyprintk.c b/arch/x86/kernel/mrst_earlyprintk.c
index 1fb1305..d1a49a7 100644
--- a/arch/x86/kernel/mrst_earlyprintk.c
+++ b/arch/x86/kernel/mrst_earlyprintk.c
@@ -287,17 +287,10 @@ void mrst_early_printk(const char *fmt, ...)
/* Will use HSU port2 for early console */
-
-/*
- * Note:
- * 1. still need GPIO workaround for UART2
- *
- */
static spinlock_t hsu_lock;
static int hsu_inited;
static void __iomem *phsu;
#define HSU_PORT2_PADDR 0xffa28180
-#define MFD_GPIO_HSU_REG 0xff12c064
static void early_hsu_init(void)
{
@@ -308,13 +301,6 @@ static void early_hsu_init(void)
spin_lock_init(&hsu_lock);
- /* GPIO workaround */
- set_fixmap_nocache(FIX_EARLYCON_MEM_BASE, MFD_GPIO_HSU_REG);
- phsu = (void *)(__fix_to_virt(FIX_EARLYCON_MEM_BASE) +
- (MFD_GPIO_HSU_REG & (PAGE_SIZE - 1)));
-
- *((u32 *)phsu) = 0x55465;
-
set_fixmap_nocache(FIX_EARLYCON_MEM_BASE, HSU_PORT2_PADDR);
phsu = (void *)(__fix_to_virt(FIX_EARLYCON_MEM_BASE) +
(HSU_PORT2_PADDR & (PAGE_SIZE - 1)));
@@ -338,8 +324,6 @@ static void early_hsu_init(void)
readb(phsu + UART_IIR);
readb(phsu + UART_MSR);
-
-
writeb(0x7, phsu + UART_FCR);
hsu_inited = 1;
@@ -371,10 +355,6 @@ static void early_hsu_write(struct console *con,
int i;
unsigned long flags;
- /*
- printk("%s(): enter\n\n", __func__);
- */
-
if (unlikely(!hsu_inited))
early_hsu_init();
next prev parent reply other threads:[~2010-09-06 13:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-06 12:39 [PATCH 1/5] mrst_earlyprintk: add a kmsg_dumper to dump the printk buffer when panic Alan Cox
2010-09-06 12:39 ` [PATCH 2/5] hsu, earlyprintk: add early printk for hsu_port2 console Alan Cox
2010-09-06 14:17 ` Ingo Molnar
2010-09-06 14:15 ` Alan Cox
2010-09-06 16:18 ` Ingo Molnar
2010-09-07 1:28 ` Feng Tang
2010-09-06 12:39 ` Alan Cox [this message]
2010-09-06 12:40 ` [PATCH 4/5] serial: mrst_max3110: some code cleanup Alan Cox
2010-09-06 12:40 ` [PATCH 5/5] mrst_max3110: Make the IRQ option runtime Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100906123935.1328.17198.stgit@localhost.localdomain \
--to=alan@linux.intel.com \
--cc=greg@kroah.com \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.