From patchwork Wed Oct 20 22:14:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Charkov X-Patchwork-Id: 269341 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 o9KMEvmJ024386 for ; Wed, 20 Oct 2010 22:14:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755537Ab0JTWO4 (ORCPT ); Wed, 20 Oct 2010 18:14:56 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:57682 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755088Ab0JTWOz (ORCPT ); Wed, 20 Oct 2010 18:14:55 -0400 Received: by eyx24 with SMTP id 24so1489307eyx.19 for ; Wed, 20 Oct 2010 15:14:54 -0700 (PDT) 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=7D5617PmrtwqUoA0XzyTLQLwgKS5onDgCh+qE6na0ys=; b=xFRZOyuRlyhEQ9xDrkTMefuwjl7hDnMTqVPI5slaIJMQpAHdxGwt4FBsxFMT2C69g0 ZHbluPDRVBB/DYdHVC1crfB2EmZhohiv1X2EKMImgiWqYeS7B3YA5pZVbfi7WePs8iEo ApUKt0qk4+t5W0BA/ZeBKWUzXrXbenc4U49Gc= 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=mdUJsrWqYVs5WW/25+8J35+VCIuH1CZjKnY5T/738XdrlKeJmVmWej+w1yDpJaDmT4 I9j+2k7bqIGj84pTdpVC9wUAbq0J2dBeF0s2t6w17R5RbbLKd0ZYzKEXbrjF9l/8RPGb Xr3Tk2ktyTW7vcyGPXcIxXDLFhspEikJfV6Zk= Received: by 10.213.35.143 with SMTP id p15mr7226071ebd.47.1287612894374; Wed, 20 Oct 2010 15:14:54 -0700 (PDT) Received: from localhost ([178.177.54.163]) by mx.google.com with ESMTPS id v56sm870591eeh.2.2010.10.20.15.14.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 20 Oct 2010 15:14:53 -0700 (PDT) Date: Thu, 21 Oct 2010 02:14:49 +0400 From: Alexey Charkov To: Dmitry Torokhov Cc: Alexey Charkov , vt8500-wm8505-linux-kernel@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6 v2] input: Add support for VIA VT8500 and compatibles in i8042 Message-ID: <20101020221449.GA30322@alchark-u3s.lan> References: <1287608139-21354-1-git-send-email-alchark@gmail.com> <1287608139-21354-3-git-send-email-alchark@gmail.com> <201010201415.09535.dmitry.torokhov@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201010201415.09535.dmitry.torokhov@gmail.com> 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, 20 Oct 2010 22:14:57 +0000 (UTC) diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 3bfe8fa..2b86774 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..6a709b6 --- /dev/null +++ b/drivers/input/serio/i8042-vt8500.h @@ -0,0 +1,74 @@ +#ifndef _I8042_VT8500_H +#define _I8042_VT8500_H + +#include +#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 IRQ_PS2KBD +#define I8042_AUX_IRQ IRQ_PS2MOUSE + + +/* + * 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(VT8500_PS2_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)