From patchwork Thu Jan 18 18:58:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 125015 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp252782lja; Thu, 18 Jan 2018 11:00:59 -0800 (PST) X-Google-Smtp-Source: ACJfBotQC3Jr7ZUHARcHYwU7FiZnuLmUkOA/4IMx8GWnGMViiMxIR2foGQ4ZTwIS9Fksw5o4M8HC X-Received: by 10.99.122.15 with SMTP id v15mr29790425pgc.175.1516302058986; Thu, 18 Jan 2018 11:00:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516302058; cv=none; d=google.com; s=arc-20160816; b=SJw4WzIAfeEO9Y+piBrVihmoGpYtNPwzopXlTfToWT0He74tK6FnGYPW5vr2RFBhDd fNf8Ar6SIJ1+RayBoSEQC9v83fu7vzHrU8kYDydS5zaahgmF7dZJeMdHYYMjvMNxwbY3 ZKoMwXR5AeseRiTqL3ksmfBOCu5eJRwY4frmryxq7anBzi3KtYXabMbY8Hx2sNf0mAEy TOSWSyPN+5Pl22Hy3VVsoPXiOrLN0QaGuDqXMuE5ecDgS4oj9HWhdcYugUlO2nyrjMO0 exHSmM0HpBvqRUslizO3ESt3G8jxBS2c07+yP1fRaASML8AUcfFsgK6o0rg3CtRpqVSU dHfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=fyl9gTX24x0aQm8yIQKr+tK2SVsLbXSXre4lRub3Dog=; b=xSc3yz3ulCc+qlHzOL1NXk6cmgQehM5TZpfy/UPJtDoSrmGf8iknryE2gg7aeMO+hm dm4o3AEHgAGZGx0EH0MSKDxcjvk7ji9zzl7D1DwumGoJyzk2afcIc1sU7U6+PBF0F92M FW6mlQ9LP6x1Quh42bMjOz3+bcRfnJ7Uok3FoFx9vfnTCxqv7863jrzXdh1ZDhrH07IN BgLa+Z0MLIy1NMDCv8p0Esba6JQIPJN73D/0KlCTfBMSykpsO4msJHQLaEg1IO0768s1 U9vObDnmy+qNpb32IJuc7zsx9IglOK+GorTO8GO1O8xuB6uc1s0o3Z3hB1y0hSRr6EY/ 9ZYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ie2B56v/; spf=pass (google.com: best guess record for domain of linux-input-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w12si6745666pge.666.2018.01.18.11.00.58 for ; Thu, 18 Jan 2018 11:00:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-input-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ie2B56v/; spf=pass (google.com: best guess record for domain of linux-input-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-input-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932497AbeARTA5 (ORCPT ); Thu, 18 Jan 2018 14:00:57 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33712 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932672AbeARTA4 (ORCPT ); Thu, 18 Jan 2018 14:00:56 -0500 Received: by mail-wm0-f68.google.com with SMTP id x4so4042114wmc.0; Thu, 18 Jan 2018 11:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7aPyAZFQCsN0CYkVtoqfrDzDISRUdlxG6/k3sxibIWc=; b=ie2B56v/9jFL4u4uNsKSQLDLQoSpj0m6aJeH10d+VsE6J0EzuLL/OgHTQs2+4EjHQ6 WU7iPrGnLdp0FgcoNOWGIoZt0mv+ANAP0DiRqnzeqngvqklTgVDkc5hTDch0Eviw9m52 2eVD80qMtHVHuicGW/GnjFKfs6teKimwM36GykRCyxJ/swkWyDhBQz5o9KCgi8BJnjAu Z/Nd9yTajC7bpDLWxwaIq+NuWDqoEqPchDQl/fQPW4eK4Qafb/O8Qydoal9dulL7TS1O +r3DpMzMWUpxCJkS+6Fszs0/wvSRg68vC5A+9pv9XIcVGsId+abmfAVKRk6kd5XlTJ92 9Y4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7aPyAZFQCsN0CYkVtoqfrDzDISRUdlxG6/k3sxibIWc=; b=gdDql4HQeILNKIY53Njv4R7nlxXTzxYAPbS8NtJaNB6VMKbVW3RKYCAH0BXLLMNrXL ixunno2CU0+nw5SORjWnD3IIBn6QnKHP6Sm2JSxVcteScJKnfyAqqEHt+kQ4EDPKnit6 RYtzEYfiPBsJdRA/uEk6b+BmNLbSAyPH4lQtu3wq4DIE8AdMPBOP3lQNL3L2NYMHjTX9 CAYnvxi9E1EajNah+CZjt7lmHXkz17A2Bbr3vH6XKp1X30vQrioirto92LJkfm0wVuFy 3BSv0qbts9U0GjenWCx4VMKM4kl06c2cNQjIN0p2H40EDhvnorRMoDh8EQKtOofxfXdN Uivg== X-Gm-Message-State: AKwxytcApxXePvieJx20gdHYnEaa7RDgZmWr0kj1/Hhk5aG/ugUOo7oA PPwhUnNLU74xA5Cuwstif6JNApI5 X-Received: by 10.28.168.3 with SMTP id r3mr6279182wme.92.1516302054505; Thu, 18 Jan 2018 11:00:54 -0800 (PST) Received: from Red.local (LFbn-MAR-1-494-174.w2-15.abo.wanadoo.fr. [2.15.82.174]) by smtp.googlemail.com with ESMTPSA id b14sm10683689wrg.29.2018.01.18.11.00.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 11:00:53 -0800 (PST) From: Corentin Labbe To: dmitry.torokhov@gmail.com, egtvedt@samfundet.no Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH] input: remove at32psif Date: Thu, 18 Jan 2018 19:58:11 +0100 Message-Id: <20180118185811.12856-1-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.6 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Since AVR32 arch is gone, at32psif driver is useless. This patch remove it. Signed-off-by: Corentin Labbe --- drivers/input/serio/Kconfig | 10 -- drivers/input/serio/Makefile | 1 - drivers/input/serio/at32psif.c | 357 ----------------------------------------- 3 files changed, 368 deletions(-) delete mode 100644 drivers/input/serio/at32psif.c -- 2.13.6 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 21488c048fa3..ca4530eb3378 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -96,16 +96,6 @@ config SERIO_RPCKBD To compile this driver as a module, choose M here: the module will be called rpckbd. -config SERIO_AT32PSIF - tristate "AVR32 PSIF PS/2 keyboard and mouse controller" - depends on AVR32 - help - Say Y here if you want to use the PSIF peripheral on AVR32 devices - and connect a PS/2 keyboard and/or mouse to it. - - To compile this driver as a module, choose M here: the module will - be called at32psif. - config SERIO_AMBAKMI tristate "AMBA KMI keyboard controller" depends on ARM_AMBA diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile index a3ca07621542..67950a5ccb3f 100644 --- a/drivers/input/serio/Makefile +++ b/drivers/input/serio/Makefile @@ -13,7 +13,6 @@ obj-$(CONFIG_SERIO_CT82C710) += ct82c710.o obj-$(CONFIG_SERIO_RPCKBD) += rpckbd.o obj-$(CONFIG_SERIO_SA1111) += sa1111ps2.o obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o -obj-$(CONFIG_SERIO_AT32PSIF) += at32psif.o obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o obj-$(CONFIG_HP_SDC) += hp_sdc.o diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c deleted file mode 100644 index e420fd781d44..000000000000 --- a/drivers/input/serio/at32psif.c +++ /dev/null @@ -1,357 +0,0 @@ -/* - * Copyright (C) 2007 Atmel Corporation - * - * Driver for the AT32AP700X PS/2 controller (PSIF). - * - * 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. - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* PSIF register offsets */ -#define PSIF_CR 0x00 -#define PSIF_RHR 0x04 -#define PSIF_THR 0x08 -#define PSIF_SR 0x10 -#define PSIF_IER 0x14 -#define PSIF_IDR 0x18 -#define PSIF_IMR 0x1c -#define PSIF_PSR 0x24 - -/* Bitfields in control register. */ -#define PSIF_CR_RXDIS_OFFSET 1 -#define PSIF_CR_RXDIS_SIZE 1 -#define PSIF_CR_RXEN_OFFSET 0 -#define PSIF_CR_RXEN_SIZE 1 -#define PSIF_CR_SWRST_OFFSET 15 -#define PSIF_CR_SWRST_SIZE 1 -#define PSIF_CR_TXDIS_OFFSET 9 -#define PSIF_CR_TXDIS_SIZE 1 -#define PSIF_CR_TXEN_OFFSET 8 -#define PSIF_CR_TXEN_SIZE 1 - -/* Bitfields in interrupt disable, enable, mask and status register. */ -#define PSIF_NACK_OFFSET 8 -#define PSIF_NACK_SIZE 1 -#define PSIF_OVRUN_OFFSET 5 -#define PSIF_OVRUN_SIZE 1 -#define PSIF_PARITY_OFFSET 9 -#define PSIF_PARITY_SIZE 1 -#define PSIF_RXRDY_OFFSET 4 -#define PSIF_RXRDY_SIZE 1 -#define PSIF_TXEMPTY_OFFSET 1 -#define PSIF_TXEMPTY_SIZE 1 -#define PSIF_TXRDY_OFFSET 0 -#define PSIF_TXRDY_SIZE 1 - -/* Bitfields in prescale register. */ -#define PSIF_PSR_PRSCV_OFFSET 0 -#define PSIF_PSR_PRSCV_SIZE 12 - -/* Bitfields in receive hold register. */ -#define PSIF_RHR_RXDATA_OFFSET 0 -#define PSIF_RHR_RXDATA_SIZE 8 - -/* Bitfields in transmit hold register. */ -#define PSIF_THR_TXDATA_OFFSET 0 -#define PSIF_THR_TXDATA_SIZE 8 - -/* Bit manipulation macros */ -#define PSIF_BIT(name) \ - (1 << PSIF_##name##_OFFSET) - -#define PSIF_BF(name, value) \ - (((value) & ((1 << PSIF_##name##_SIZE) - 1)) \ - << PSIF_##name##_OFFSET) - -#define PSIF_BFEXT(name, value) \ - (((value) >> PSIF_##name##_OFFSET) \ - & ((1 << PSIF_##name##_SIZE) - 1)) - -#define PSIF_BFINS(name, value, old) \ - (((old) & ~(((1 << PSIF_##name##_SIZE) - 1) \ - << PSIF_##name##_OFFSET)) \ - | PSIF_BF(name, value)) - -/* Register access macros */ -#define psif_readl(port, reg) \ - __raw_readl((port)->regs + PSIF_##reg) - -#define psif_writel(port, reg, value) \ - __raw_writel((value), (port)->regs + PSIF_##reg) - -struct psif { - struct platform_device *pdev; - struct clk *pclk; - struct serio *io; - void __iomem *regs; - unsigned int irq; - /* Prevent concurrent writes to PSIF THR. */ - spinlock_t lock; - bool open; -}; - -static irqreturn_t psif_interrupt(int irq, void *_ptr) -{ - struct psif *psif = _ptr; - int retval = IRQ_NONE; - unsigned int io_flags = 0; - unsigned long status; - - status = psif_readl(psif, SR); - - if (status & PSIF_BIT(RXRDY)) { - unsigned char val = (unsigned char) psif_readl(psif, RHR); - - if (status & PSIF_BIT(PARITY)) - io_flags |= SERIO_PARITY; - if (status & PSIF_BIT(OVRUN)) - dev_err(&psif->pdev->dev, "overrun read error\n"); - - serio_interrupt(psif->io, val, io_flags); - - retval = IRQ_HANDLED; - } - - return retval; -} - -static int psif_write(struct serio *io, unsigned char val) -{ - struct psif *psif = io->port_data; - unsigned long flags; - int timeout = 10; - int retval = 0; - - spin_lock_irqsave(&psif->lock, flags); - - while (!(psif_readl(psif, SR) & PSIF_BIT(TXEMPTY)) && timeout--) - udelay(50); - - if (timeout >= 0) { - psif_writel(psif, THR, val); - } else { - dev_dbg(&psif->pdev->dev, "timeout writing to THR\n"); - retval = -EBUSY; - } - - spin_unlock_irqrestore(&psif->lock, flags); - - return retval; -} - -static int psif_open(struct serio *io) -{ - struct psif *psif = io->port_data; - int retval; - - retval = clk_enable(psif->pclk); - if (retval) - return retval; - - psif_writel(psif, CR, PSIF_BIT(CR_TXEN) | PSIF_BIT(CR_RXEN)); - psif_writel(psif, IER, PSIF_BIT(RXRDY)); - - psif->open = true; - return retval; -} - -static void psif_close(struct serio *io) -{ - struct psif *psif = io->port_data; - - psif->open = false; - - psif_writel(psif, IDR, ~0UL); - psif_writel(psif, CR, PSIF_BIT(CR_TXDIS) | PSIF_BIT(CR_RXDIS)); - - clk_disable(psif->pclk); -} - -static void psif_set_prescaler(struct psif *psif) -{ - unsigned long prscv; - unsigned long rate = clk_get_rate(psif->pclk); - - /* PRSCV = Pulse length (100 us) * PSIF module frequency. */ - prscv = 100 * (rate / 1000000UL); - - if (prscv > ((1<pdev->dev, "pclk too fast, " - "prescaler set to max\n"); - } - - clk_enable(psif->pclk); - psif_writel(psif, PSR, prscv); - clk_disable(psif->pclk); -} - -static int __init psif_probe(struct platform_device *pdev) -{ - struct resource *regs; - struct psif *psif; - struct serio *io; - struct clk *pclk; - int irq; - int ret; - - psif = kzalloc(sizeof(struct psif), GFP_KERNEL); - if (!psif) - return -ENOMEM; - psif->pdev = pdev; - - io = kzalloc(sizeof(struct serio), GFP_KERNEL); - if (!io) { - ret = -ENOMEM; - goto out_free_psif; - } - psif->io = io; - - regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!regs) { - dev_dbg(&pdev->dev, "no mmio resources defined\n"); - ret = -ENOMEM; - goto out_free_io; - } - - psif->regs = ioremap(regs->start, resource_size(regs)); - if (!psif->regs) { - ret = -ENOMEM; - dev_dbg(&pdev->dev, "could not map I/O memory\n"); - goto out_free_io; - } - - pclk = clk_get(&pdev->dev, "pclk"); - if (IS_ERR(pclk)) { - dev_dbg(&pdev->dev, "could not get peripheral clock\n"); - ret = PTR_ERR(pclk); - goto out_iounmap; - } - psif->pclk = pclk; - - /* Reset the PSIF to enter at a known state. */ - ret = clk_enable(pclk); - if (ret) { - dev_dbg(&pdev->dev, "could not enable pclk\n"); - goto out_put_clk; - } - psif_writel(psif, CR, PSIF_BIT(CR_SWRST)); - clk_disable(pclk); - - irq = platform_get_irq(pdev, 0); - if (irq < 0) { - dev_dbg(&pdev->dev, "could not get irq\n"); - ret = -ENXIO; - goto out_put_clk; - } - ret = request_irq(irq, psif_interrupt, IRQF_SHARED, "at32psif", psif); - if (ret) { - dev_dbg(&pdev->dev, "could not request irq %d\n", irq); - goto out_put_clk; - } - psif->irq = irq; - - io->id.type = SERIO_8042; - io->write = psif_write; - io->open = psif_open; - io->close = psif_close; - snprintf(io->name, sizeof(io->name), "AVR32 PS/2 port%d", pdev->id); - snprintf(io->phys, sizeof(io->phys), "at32psif/serio%d", pdev->id); - io->port_data = psif; - io->dev.parent = &pdev->dev; - - psif_set_prescaler(psif); - - spin_lock_init(&psif->lock); - serio_register_port(psif->io); - platform_set_drvdata(pdev, psif); - - dev_info(&pdev->dev, "Atmel AVR32 PSIF PS/2 driver on 0x%08x irq %d\n", - (int)psif->regs, psif->irq); - - return 0; - -out_put_clk: - clk_put(psif->pclk); -out_iounmap: - iounmap(psif->regs); -out_free_io: - kfree(io); -out_free_psif: - kfree(psif); - return ret; -} - -static int __exit psif_remove(struct platform_device *pdev) -{ - struct psif *psif = platform_get_drvdata(pdev); - - psif_writel(psif, IDR, ~0UL); - psif_writel(psif, CR, PSIF_BIT(CR_TXDIS) | PSIF_BIT(CR_RXDIS)); - - serio_unregister_port(psif->io); - iounmap(psif->regs); - free_irq(psif->irq, psif); - clk_put(psif->pclk); - kfree(psif); - - return 0; -} - -#ifdef CONFIG_PM_SLEEP -static int psif_suspend(struct device *dev) -{ - struct platform_device *pdev = to_platform_device(dev); - struct psif *psif = platform_get_drvdata(pdev); - - if (psif->open) { - psif_writel(psif, CR, PSIF_BIT(CR_RXDIS) | PSIF_BIT(CR_TXDIS)); - clk_disable(psif->pclk); - } - - return 0; -} - -static int psif_resume(struct device *dev) -{ - struct platform_device *pdev = to_platform_device(dev); - struct psif *psif = platform_get_drvdata(pdev); - - if (psif->open) { - clk_enable(psif->pclk); - psif_set_prescaler(psif); - psif_writel(psif, CR, PSIF_BIT(CR_RXEN) | PSIF_BIT(CR_TXEN)); - } - - return 0; -} -#endif - -static SIMPLE_DEV_PM_OPS(psif_pm_ops, psif_suspend, psif_resume); - -static struct platform_driver psif_driver = { - .remove = __exit_p(psif_remove), - .driver = { - .name = "atmel_psif", - .pm = &psif_pm_ops, - }, -}; - -module_platform_driver_probe(psif_driver, psif_probe); - -MODULE_AUTHOR("Hans-Christian Egtvedt "); -MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver"); -MODULE_LICENSE("GPL");