Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp536501pxb; Fri, 29 Oct 2021 14:56:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvr6OY7y6xfDgcej25jCd+0awgp2g/aRcGER6h88BCLyh2JjmWh2NM+CZtWyMkQJIA7Xyo X-Received: by 2002:a92:c04c:: with SMTP id o12mr9007839ilf.206.1635544573081; Fri, 29 Oct 2021 14:56:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635544573; cv=none; d=google.com; s=arc-20160816; b=PIBVXo5b10p27US2xvghuAAfWB3uwNCW+QA8QLld/MoavV5AhJ7+hr1AC1f7wgvwxq 9tMBtm3d6iPiOz2NREP/ZIdAX8YlMcDF1nyphUt/EOoDxfs5hA7VoEg6mj3gV7Af8UeS Zr5oAGFkPU6yLOUMaTCFHJkzrrz7TO7LE7Mqn7ySN2glUouRuajVQSilSNXC+S63n8uU ROXG0YueIK1l7TRj3zOmWR/myhYkOCrjm4KZBvYgRAN8PY9DH/Wy9zpKFsDpQtFpkHog p5BcpPILCGR4bK4yEnP/1JmsZvR0+l+CI4P4sMPlQo1DmA+R/27lkVQ2jitYOYDpwVVT 9w3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t4auqlmjwJ416gp2Ll9qb5ySsLBOgXHPuXf1WS/UfdQ=; b=OTFI3fIg2DC28coxncw4/g7epVsyD2r2i4R6pBFeQL3cc3N7ITaW8jYrzzjyXGRtHi y2fVF2KKOm3zcArcrnL3UCZJkB5HYnaaiPLGuGzg9ciP89q/CBErxMOaMSNngBCu5JBh a8snp/l0WWrgMWYDJ+E8VtpgEKFuPRZjPVj3jOKKntNk0Y9YC0KszHPr1vNLX3ugiN6E ceEWie9MGaqSE/TRbYYVqV9xXoafdvNfwgNCMiva0c4WxJvj3VhC0rg3bOPc6ekU2srE HF4PfdQwub87r1bVb2QPttA2iZmYxiyYrvP8EZRMUHNuESYj0trnRdoIZO2A3LLmRyrL xsHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="JfYp/zYF"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d2si11139823ilv.70.2021.10.29.14.55.53; Fri, 29 Oct 2021 14:56:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="JfYp/zYF"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231468AbhJ2V5L (ORCPT + 99 others); Fri, 29 Oct 2021 17:57:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58876 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbhJ2V5H (ORCPT ); Fri, 29 Oct 2021 17:57:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635544478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t4auqlmjwJ416gp2Ll9qb5ySsLBOgXHPuXf1WS/UfdQ=; b=JfYp/zYFUn9JuxWN8Cp6fM00rA+NtLdjxJlpNDD3QswqTgLjnWbXjaRussXAV0hOTsQLFY JnApp1q7TfoDT9CnMC8LV81Yp/ksjNtnibKgkwuyn0zltzO30oeSc5oyE1GLBirNy+0bZ9 xh4heb5VO2EK0mz+6VWql3/QnMRehy0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-530-GgVxXltTNvG70rhcLQFUhw-1; Fri, 29 Oct 2021 17:54:36 -0400 X-MC-Unique: GgVxXltTNvG70rhcLQFUhw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4ED1E8018AC; Fri, 29 Oct 2021 21:54:35 +0000 (UTC) Received: from cmirabil.remote.csb (unknown [10.22.8.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFD6E5DF56; Fri, 29 Oct 2021 21:54:31 +0000 (UTC) From: Charles Mirabile To: linux-kernel@vger.kernel.org Cc: Charles Mirabile , Dmitry Torokhov , linux-input@vger.kernel.org, Serge Schneider , Stefan Wahren , Nicolas Saenz Julienne , linux-rpi-kernel@lists.infradead.org, fedora-rpi@googlegroups.com, Mwesigwa Guma , Joel Savitz Subject: [PATCH 2/5] drivers/input/joystick: sensehat: Raspberry Pi Sense HAT joystick driver Date: Fri, 29 Oct 2021 17:55:13 -0400 Message-Id: <20211029215516.801593-3-cmirabil@redhat.com> In-Reply-To: <20211029215516.801593-1-cmirabil@redhat.com> References: <20211029215516.801593-1-cmirabil@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch implements support for the joystick. It supports left/right/up/down/enter and is attached via i2c and a gpio pin for irq. Signed-off-by: Charles Mirabile Signed-off-by: Mwesigwa Guma Signed-off-by: Joel Savitz --- drivers/input/joystick/Kconfig | 8 ++ drivers/input/joystick/Makefile | 1 + drivers/input/joystick/sensehat-joystick.c | 135 +++++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 drivers/input/joystick/sensehat-joystick.c diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig index 3b23078bc7b5..d2f78353b74c 100644 --- a/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig @@ -399,4 +399,12 @@ config JOYSTICK_N64 Say Y here if you want enable support for the four built-in controller ports on the Nintendo 64 console. +config JOYSTICK_SENSEHAT + tristate "Raspberry Pi Sense HAT joystick" + depends on GPIOLIB && INPUT + select MFD_SENSEHAT_CORE + + help + This is the joystick driver for the Raspberry Pi Sense HAT + endif diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile index 5174b8aba2dd..39c8b5c6e5ae 100644 --- a/drivers/input/joystick/Makefile +++ b/drivers/input/joystick/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_JOYSTICK_N64) += n64joy.o obj-$(CONFIG_JOYSTICK_PSXPAD_SPI) += psxpad-spi.o obj-$(CONFIG_JOYSTICK_PXRC) += pxrc.o obj-$(CONFIG_JOYSTICK_QWIIC) += qwiic-joystick.o +obj-$(CONFIG_JOYSTICK_SENSEHAT) += sensehat-joystick.o obj-$(CONFIG_JOYSTICK_SIDEWINDER) += sidewinder.o obj-$(CONFIG_JOYSTICK_SPACEBALL) += spaceball.o obj-$(CONFIG_JOYSTICK_SPACEORB) += spaceorb.o diff --git a/drivers/input/joystick/sensehat-joystick.c b/drivers/input/joystick/sensehat-joystick.c new file mode 100644 index 000000000000..2a25287b5863 --- /dev/null +++ b/drivers/input/joystick/sensehat-joystick.c @@ -0,0 +1,135 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Raspberry Pi Sense HAT joystick driver + * http://raspberrypi.org + * + * Copyright (C) 2015 Raspberry Pi + * Copyright (C) 2021 Charles Mirabile, Mwesigwa Guma, Joel Savitz + * + * Original Author: Serge Schneider + * Revised for upstream Linux by: Charles Mirabile, Mwesigwa Guma, Joel Savitz + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "sensehat.h" + +int sensehat_get_joystick_state(struct sensehat *sensehat); + +static unsigned char keymap[] = {KEY_DOWN, KEY_RIGHT, KEY_UP, KEY_ENTER, KEY_LEFT,}; + +static irqreturn_t sensehat_joystick_report(int n, void *cookie) +{ + int i; + static s32 prev_keys; + struct sensehat *sensehat = cookie; + struct sensehat_joystick *sensehat_joystick = &sensehat->joystick; + s32 keys = sensehat_get_joystick_state(sensehat); + s32 changes = keys ^ prev_keys; + + prev_keys = keys; + for (i = 0; i < ARRAY_SIZE(keymap); ++i) { + if (changes & (1<keys_dev, + keymap[i], keys & (1<keys_dev); + return IRQ_HANDLED; +} + +static int sensehat_joystick_probe(struct platform_device *pdev) +{ + int ret; + int i; + struct sensehat *sensehat = dev_get_drvdata(&pdev->dev); + struct sensehat_joystick *sensehat_joystick = &sensehat->joystick; + + sensehat_joystick->keys_desc = devm_gpiod_get(&sensehat->i2c_client->dev, + "keys-int", GPIOD_IN); + if (IS_ERR(sensehat_joystick->keys_desc)) { + dev_warn(&pdev->dev, "Failed to get keys-int descriptor.\n"); + return PTR_ERR(sensehat_joystick->keys_desc); + } + + + sensehat_joystick->keys_dev = devm_input_allocate_device(&pdev->dev); + if (!sensehat_joystick->keys_dev) { + dev_err(&pdev->dev, "Could not allocate input device.\n"); + return -ENOMEM; + } + + for (i = 0; i < ARRAY_SIZE(keymap); i++) { + set_bit(keymap[i], + sensehat_joystick->keys_dev->keybit); + } + + sensehat_joystick->keys_dev->name = "Raspberry Pi Sense HAT Joystick"; + sensehat_joystick->keys_dev->phys = "rpi-sense-joy/input0"; + sensehat_joystick->keys_dev->id.bustype = BUS_I2C; + sensehat_joystick->keys_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP); + sensehat_joystick->keys_dev->keycode = keymap; + sensehat_joystick->keys_dev->keycodesize = sizeof(unsigned char); + sensehat_joystick->keys_dev->keycodemax = ARRAY_SIZE(keymap); + + ret = input_register_device(sensehat_joystick->keys_dev); + if (ret) { + dev_err(&pdev->dev, "Could not register input device.\n"); + return ret; + } + + ret = gpiod_direction_input(sensehat_joystick->keys_desc); + if (ret) { + dev_err(&pdev->dev, "Could not set keys-int direction.\n"); + return ret; + } + + sensehat_joystick->keys_irq = gpiod_to_irq(sensehat_joystick->keys_desc); + if (sensehat_joystick->keys_irq < 0) { + dev_err(&pdev->dev, "Could not determine keys-int IRQ.\n"); + return sensehat_joystick->keys_irq; + } + + ret = devm_request_threaded_irq(&pdev->dev, sensehat_joystick->keys_irq, + NULL, sensehat_joystick_report, IRQF_TRIGGER_RISING | IRQF_ONESHOT, + "keys", sensehat); + + if (ret) { + dev_err(&pdev->dev, "IRQ request failed.\n"); + return ret; + } + return 0; +} + +int sensehat_get_joystick_state(struct sensehat *sensehat) +{ + unsigned int reg; + int ret = regmap_read(sensehat->regmap, SENSEHAT_KEYS, ®); + + return ret < 0 ? ret : reg; +} + +static struct platform_device_id sensehat_joystick_device_id[] = { + { .name = "sensehat-joystick" }, + { }, +}; +MODULE_DEVICE_TABLE(platform, sensehat_joystick_device_id); + +static struct platform_driver sensehat_joystick_driver = { + .probe = sensehat_joystick_probe, + .driver = { + .name = "sensehat-joystick", + }, +}; + +module_platform_driver(sensehat_joystick_driver); + +MODULE_DESCRIPTION("Raspberry Pi Sense HAT joystick driver"); +MODULE_AUTHOR("Serge Schneider "); +MODULE_LICENSE("GPL"); -- 2.31.1