From patchwork Wed Dec 22 21:41:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Charkov X-Patchwork-Id: 428661 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBMLfm1t032260 for ; Wed, 22 Dec 2010 21:41:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752288Ab0LVVlr (ORCPT ); Wed, 22 Dec 2010 16:41:47 -0500 Received: from mail-ew0-f45.google.com ([209.85.215.45]:39486 "EHLO mail-ew0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752000Ab0LVVlq (ORCPT ); Wed, 22 Dec 2010 16:41:46 -0500 Received: by ewy10 with SMTP id 10so2822842ewy.4 for ; Wed, 22 Dec 2010 13:41:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=T/mDsJfqCPK8NgnBDFWOA4BeEf+B2cXWKz41WP9cxEc=; b=Zb9/6qH1lZQ8SFU0Bu8DPNRXRldj6WCP4GEOBnnwuBsDp9WhUCRiTm4yCVN6Om6Avx VMBEWFFc0e2xbfCDVv5bHJGd/RV3USe6ry6YUlEiwRTOpxPoZv8qaOKIIM1PJW99obXx 5P4t213UzYqNRfdHnN81dd+MUYTcPjlNPDLe0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=EWVBOtIIij4pqhHFoj6FeTfKVjxEOOXADx6OCS0qCnRYNFspq5nvcMI6sRxen2AZea 9jjB8WKYO2xwwneSPYSv6Pc+XkpqsIUEsfeKShvZWlwCocIWgCEd0q+6+X0ydJI6kJjR j0Q33pLzMpKo46RlpBDLvHUKg39coh8zuKhPw= Received: by 10.213.109.7 with SMTP id h7mr7223178ebp.93.1293054105072; Wed, 22 Dec 2010 13:41:45 -0800 (PST) Received: from localhost ([109.188.34.162]) by mx.google.com with ESMTPS id t5sm5038248eeh.14.2010.12.22.13.41.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 22 Dec 2010 13:41:43 -0800 (PST) Date: Thu, 23 Dec 2010 00:41:41 +0300 From: Alexey Charkov To: Dmitry Torokhov Cc: Alexey Charkov , linux-arm-kernel@lists.infradead.org, vt8500-wm8505-linux-kernel@googlegroups.com, Tony Lindgren , Feng Tang , Janusz Krzysztofik , Dmitry Eremin-Solenikov , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6 v3] input: Add support for VIA VT8500 and compatibles in i8042 Message-ID: <20101222214141.GA31173@alchark-u3s> References: <1289147348-31969-1-git-send-email-alchark@gmail.com> <1289147348-31969-3-git-send-email-alchark@gmail.com> <20101112233013.GA30946@core.coreip.homeip.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20101112233013.GA30946@core.coreip.homeip.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 22 Dec 2010 21:41:49 +0000 (UTC) diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 6256233..ff799f3 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -21,7 +21,8 @@ if SERIO config SERIO_I8042 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 default y - depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ + depends on !PARISC && \ + (!ARM || ARCH_SHARK || ARCH_VT8500 || FOOTBRIDGE_HOST) && \ (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN help i8042 is the chip over which the standard AT keyboard and PS/2 diff --git a/drivers/input/serio/i8042-vt8500.h b/drivers/input/serio/i8042-vt8500.h new file mode 100644 index 0000000..a7e6673 --- /dev/null +++ b/drivers/input/serio/i8042-vt8500.h @@ -0,0 +1,73 @@ +#ifndef _I8042_VT8500_H +#define _I8042_VT8500_H + +#include + +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + */ + +static void __iomem *regbase; + +/* + * Names. + */ + +#define I8042_KBD_PHYS_DESC "vt8500ps2/serio0" +#define I8042_AUX_PHYS_DESC "vt8500ps2/serio1" +#define I8042_MUX_PHYS_DESC "vt8500ps2/serio%d" + +/* + * IRQs. + */ + +#define I8042_KBD_IRQ (wmt_i8042_kbd_irq) +#define I8042_AUX_IRQ (wmt_i8042_aux_irq) + + +/* + * Register numbers. + */ + +#define I8042_COMMAND_REG (regbase + 0x4) +#define I8042_STATUS_REG (regbase + 0x4) +#define I8042_DATA_REG (regbase + 0x0) + +static inline int i8042_read_data(void) +{ + return readl(I8042_DATA_REG); +} + +static inline int i8042_read_status(void) +{ + return readl(I8042_STATUS_REG); +} + +static inline void i8042_write_data(int val) +{ + writel(val, I8042_DATA_REG); +} + +static inline void i8042_write_command(int val) +{ + writel(val, I8042_COMMAND_REG); +} + +static inline int i8042_platform_init(void) +{ + i8042_reset = true; + regbase = ioremap(wmt_i8042_base, SZ_1K); + if (!regbase) + return -ENODEV; + + return 0; +} + +static inline void i8042_platform_exit(void) +{ + iounmap(regbase); +} + +#endif /* _I8042_VT8500_H */ diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h index cbc1beb..bdb2aeb 100644 --- a/drivers/input/serio/i8042.h +++ b/drivers/input/serio/i8042.h @@ -16,6 +16,8 @@ #if defined(CONFIG_MACH_JAZZ) #include "i8042-jazzio.h" +#elif defined(CONFIG_ARCH_VT8500) +#include "i8042-vt8500.h" #elif defined(CONFIG_SGI_HAS_I8042) #include "i8042-ip22io.h" #elif defined(CONFIG_SNI_RM)