From patchwork Tue Nov 26 20:47:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein via B4 Relay X-Patchwork-Id: 13886358 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32740D65525 for ; Tue, 26 Nov 2024 20:50:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qT/s3m1EQsAbsZRS6XEfhWEzH/ag/XveYrxCo1OuO10=; b=WtRiNSSuOG99gw3ESUUxY40FqV wUfc7hqdnPa3P/h7jlfjr8DBZNrlsDXX93iUINoushTLPvgHATlNOcLmqwV63Bvb93YRq1O8tp3KN 4tHuQSCCdDQnevihRfnqWDfjX0eWCbrqBEVxXJyDRVCuExQOMOageLSEvUoutno5I28LFiuugNxII MiE+QOXJBzaOUF4IvCsY33Kn89lF74mahbppfpW5LxkyG5nJCArp5OqsM1Gje6qiMGDF2A1iEtxV7 iYK03l3fl8/t9cd4tlfrBU5JyvYitMatRVHTtwqB1oa3oRp39oyvbXdJYgLHGss2maCA789fTpxaE Uk1JPb3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tG2Vh-0000000Bge3-2Pth; Tue, 26 Nov 2024 20:50:13 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tG2Tm-0000000BgHV-465A for linux-arm-kernel@lists.infradead.org; Tue, 26 Nov 2024 20:48:16 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 395ACA413FF; Tue, 26 Nov 2024 20:46:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id B69C5C4CED0; Tue, 26 Nov 2024 20:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732654093; bh=nPlVVBDGKjV5+b5plwup/oaCwem/vGJJlIuA9WfZlTQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=p375jSE/nhXtMxzvEOS9mugsU2ApN2vVdpuN9R4/WGM07+3cDR4KMSZ1FHNvh1/8L mGU4Yk19FQw3WXOe9K4jdRKyYJqPNlB507wa57oOxm8xes2D0Bn5XIpd//ZpRvDvTK J9k4ZSuTPm2L9ZKhturx9xqqP9qtJbEqZjWtueQQA9dfChBzOi1FhhsZyJwaPNFzEx G5uPkfjBD4ClIrN2Tk7Xq4z/yUDDhmRqKJbnNaeHWXNFyS8ZW1bmlZrEmeKbxV52EC ZAGTz3cNm+KE080l7XHoANzMB7xnijTu5TsR2I8caY3/PaOZZHNcwWpkB9FprjkTnY J6Yd/ECCPBP0g== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4BD0D65553; Tue, 26 Nov 2024 20:48:13 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Tue, 26 Nov 2024 21:47:59 +0100 Subject: [PATCH 1/4] dt-bindings: input: touchscreen: Add Z2 controller MIME-Version: 1.0 Message-Id: <20241126-z2-v1-1-c43c4cc6200d@gmail.com> References: <20241126-z2-v1-0-c43c4cc6200d@gmail.com> In-Reply-To: <20241126-z2-v1-0-c43c4cc6200d@gmail.com> To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1732654092; l=2804; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=UHvXgMi/23w7qON+PGUGo++6lr9MH2GBkiekDOSsTok=; b=v2an5Zj1C0uzlwCBhHF2ZQWwt6rSGPADVo45ZAjcVatoE2WRViXstwZvsJUf7P6F9MtmnBKza 2GOjGYozUJwDVOHKJNJtRTlkyNCJtsYdABKic9dSMOvOWgu8iwJqldS X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= X-Endpoint-Received: by B4 Relay for fnkl.kernel@gmail.com/20241124 with auth_id=283 X-Original-From: Sasha Finkelstein X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_124815_148786_6DB6E155 X-CRM114-Status: GOOD ( 11.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: fnkl.kernel@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Sasha Finkelstein Add bindings for touchscreen controllers attached using the Z2 protocol. Those are present in most Apple devices. Signed-off-by: Sasha Finkelstein --- .../input/touchscreen/apple,z2-multitouch.yaml | 83 ++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml b/Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml new file mode 100644 index 0000000000000000000000000000000000000000..0387e2178b91d5658dfd60cb44099a8048dc97df --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/touchscreen/apple,z2-multitouch.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Apple touchscreens attached using the Z2 protocol + +maintainers: + - Sasha Finkelstein + +description: A series of touschscreen controllers used in Apple products + +allOf: + - $ref: touchscreen.yaml# + - $ref: /schemas/spi/spi-peripheral-props.yaml# + +properties: + compatible: + items: + - enum: + - apple,j293-touchbar + - apple,j493-touchbar + - const: apple,z2-touchbar + - const: apple,z2-multitouch + + interrupts: + maxItems: 1 + + reset-gpios: + maxItems: 1 + + cs-gpios: + maxItems: 1 + description: | + J293 has a hardware quirk where the CS line is unusable and has + to the be driven by a GPIO pin instead + + firmware-name: + maxItems: 1 + + label: + maxItems: 1 + + touchscreen-size-x: true + touchscreen-size-y: true + +required: + - compatible + - interrupts + - reset-gpios + - firmware-name + - label + - touchscreen-size-x + - touchscreen-size-y + +unevaluatedProperties: false + +examples: + - | + #include + #include + + spi { + #address-cells = <1>; + #size-cells = <0>; + + touchscreen@0 { + compatible = "apple,j293-touchbar", "apple,z2-touchbar", + "apple,z2-multitouch"; + reg = <0>; + spi-max-frequency = <11500000>; + reset-gpios = <&pinctrl_ap 139 0>; + cs-gpios = <&pinctrl_ap 109 0>; + interrupts-extended = <&pinctrl_ap 194 IRQ_TYPE_EDGE_FALLING>; + firmware-name = "apple/dfrmtfw-j293.bin"; + touchscreen-size-x = <23045>; + touchscreen-size-y = <640>; + label = "MacBookPro17,1 Touch Bar"; + }; + }; + +... From patchwork Tue Nov 26 20:48:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein via B4 Relay X-Patchwork-Id: 13886359 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 90617D65525 for ; Tue, 26 Nov 2024 20:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KI+eTiHlb58jQAnWMxhCyeG4bUzA/j+6559CDGR7pFs=; b=XAOAmSoyImTg8EdTE0P469foNk 9Z2xzYnN4dKuhHDL5eJAgaw57UocaoSxjFVnX8w5mx1uZOvOo/Z9BE5519EpL5GGbUn1oZA6eegEC AdqpjjPjkxDhTSg3klBRto/vAeoCZ6M3xE2MjEkYcFN0DDakO0uHOFD3vDQ570pzXHQi7yOzwMhlB ewdLvpWeutQh2R9QMMDRJenWhUwW9/EzjG4bTyGlPWr+McdHcJ8xyTFZ9vg9ay51I8gktljncsL+s zCZO4UCyQGtqUXADgtazHbRbfoxR+m1/f4oMQCUpUE7SCnSdCygU9N51A6hX1bVPwg2cDtdu5EcOG mE93j/hA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tG2Wd-0000000Bgkh-0kUY; Tue, 26 Nov 2024 20:51:11 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tG2Tn-0000000BgHX-1GdR for linux-arm-kernel@lists.infradead.org; Tue, 26 Nov 2024 20:48:17 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 8861EA41411; Tue, 26 Nov 2024 20:46:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id CA721C4AF0B; Tue, 26 Nov 2024 20:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732654093; bh=IXUq3AAJtkQSlXFZUixQqzh6OX6yIQbCqut41Fiwkxg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=fUM340hT0tP4P3vYB6pK/pf7Uc7eaAhrQHBsWELxqoyGq3uF9kV2WhCtUMl0dAyAj aaCPSpQIdDl4KKDcdMW/Vqs6jOrzMQZE4ZUEjF6m4knjVrv0LSViLie6AYEMGwHwbH 31DBDw5pJ9gnqohfQkd6YhMQr+4fLZ6oibpyWVvB1HBTHYVvovGj4OLtkbms+RxYza tFsNtTWRl9NjE859Q3lmfxurl1BoM9/6iZqYqMGuaGleJri6ORL4DbmrFyvvZnNTj0 k/T+v714w9+SgquYAdcpnk79Ba8ufuSjVmo+NZ4jnc6AlJobfkpI0LtHQxuk9SG2E0 dWq6QJma4EIdQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA3EBD65556; Tue, 26 Nov 2024 20:48:13 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Tue, 26 Nov 2024 21:48:00 +0100 Subject: [PATCH 2/4] input: apple_z2: Add a driver for Apple Z2 touchscreens MIME-Version: 1.0 Message-Id: <20241126-z2-v1-2-c43c4cc6200d@gmail.com> References: <20241126-z2-v1-0-c43c4cc6200d@gmail.com> In-Reply-To: <20241126-z2-v1-0-c43c4cc6200d@gmail.com> To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein , Janne Grunau X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1732654092; l=15834; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=dfQEyh/UrvHG/pCLg4sh/Stvl6AtcY4Zz1IE5oS6Qu0=; b=OHf//pIesbOd98TXoUfeQJGjvQydWRLv3hCVMPMeRvOWncrk4zHXyvjNNpsv+dIIhv4XeK14i DLv2REOojY4DVd0YrNVCXALrtGPTb5jlpmqjRt/5lrL0x07NW9qlbNH X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= X-Endpoint-Received: by B4 Relay for fnkl.kernel@gmail.com/20241124 with auth_id=283 X-Original-From: Sasha Finkelstein X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_124815_480849_6EC871F5 X-CRM114-Status: GOOD ( 25.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: fnkl.kernel@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Sasha Finkelstein Adds a driver for Apple touchscreens using the Z2 protocol. Signed-off-by: Janne Grunau Signed-off-by: Sasha Finkelstein --- drivers/input/touchscreen/Kconfig | 13 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/apple_z2.c | 495 +++++++++++++++++++++++++++++++++++ 3 files changed, 509 insertions(+) diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 1ac26fc2e3eb94a4f62a49962c25ec853b567a43..4ad5002191f77a17414f9e1494b0afd6447355c0 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -103,6 +103,19 @@ config TOUCHSCREEN_ADC To compile this driver as a module, choose M here: the module will be called resistive-adc-touch.ko. +config TOUCHSCREEN_APPLE_Z2 + tristate "Apple Z2 touchscreens" + default ARCH_APPLE + depends on SPI + help + Say Y here if you have an Apple device with + a touchscreen or a touchbar. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called apple_z2. + config TOUCHSCREEN_AR1021_I2C tristate "Microchip AR1020/1021 i2c touchscreen" depends on I2C && OF diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 82bc837ca01e2ee18c5e9c578765d55ef9fab6d4..97a025c6a3770fb80255246eb63c11688ebd79eb 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_TOUCHSCREEN_AD7879_I2C) += ad7879-i2c.o obj-$(CONFIG_TOUCHSCREEN_AD7879_SPI) += ad7879-spi.o obj-$(CONFIG_TOUCHSCREEN_ADC) += resistive-adc-touch.o obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o +obj-$(CONFIG_TOUCHSCREEN_APPLE_Z2) += apple_z2.o obj-$(CONFIG_TOUCHSCREEN_AR1021_I2C) += ar1021_i2c.o obj-$(CONFIG_TOUCHSCREEN_ATMEL_MXT) += atmel_mxt_ts.o obj-$(CONFIG_TOUCHSCREEN_AUO_PIXCIR) += auo-pixcir-ts.o diff --git a/drivers/input/touchscreen/apple_z2.c b/drivers/input/touchscreen/apple_z2.c new file mode 100644 index 0000000000000000000000000000000000000000..9f57708b3d1749bf23db6132d25cbb47fd622a9f --- /dev/null +++ b/drivers/input/touchscreen/apple_z2.c @@ -0,0 +1,495 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Apple Z2 touchscreen driver + * + * Copyright (C) The Asahi Linux Contributors + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define APPLE_Z2_NUM_FINGERS_OFFSET 16 +#define APPLE_Z2_FINGERS_OFFSET 24 +#define APPLE_Z2_TOUCH_STARTED 3 +#define APPLE_Z2_TOUCH_MOVED 4 +#define APPLE_Z2_CMD_READ_INTERRUPT_DATA 0xEB +#define APPLE_Z2_HBPP_CMD_BLOB 0x3001 +#define APPLE_Z2_FW_MAGIC 0x5746325A +#define LOAD_COMMAND_INIT_PAYLOAD 0 +#define LOAD_COMMAND_SEND_BLOB 1 +#define LOAD_COMMAND_SEND_CALIBRATION 2 + +struct apple_z2 { + struct spi_device *spidev; + struct gpio_desc *cs_gpio; + struct gpio_desc *reset_gpio; + struct input_dev *input_dev; + struct completion boot_irq; + int booted; + int open; + int counter; + int y_size; + const char *fw_name; + const char *cal_blob; + int cal_size; +}; + +struct apple_z2_finger { + u8 finger; + u8 state; + __le16 unknown2; + __le16 abs_x; + __le16 abs_y; + __le16 rel_x; + __le16 rel_y; + __le16 tool_major; + __le16 tool_minor; + __le16 orientation; + __le16 touch_major; + __le16 touch_minor; + __le16 unused[2]; + __le16 pressure; + __le16 multi; +} __packed; + +struct apple_z2_hbpp_blob_hdr { + u16 cmd; + u16 len; + u32 addr; + u16 checksum; +} __packed; + +struct apple_z2_fw_hdr { + u32 magic; + u32 version; +} __packed; + +struct apple_z2_read_interrupt_cmd { + u8 cmd; + u8 counter; + u8 unused[12]; + __le16 checksum; +} __packed; + +static void apple_z2_parse_touches(struct apple_z2 *z2, char *msg, size_t msg_len) +{ + int i; + int nfingers; + int slot; + int slot_valid; + struct apple_z2_finger *fingers; + + if (!z2->open) + return; + if (msg_len <= APPLE_Z2_NUM_FINGERS_OFFSET) + return; + nfingers = msg[APPLE_Z2_NUM_FINGERS_OFFSET]; + fingers = (struct apple_z2_finger *)(msg + APPLE_Z2_FINGERS_OFFSET); + for (i = 0; i < nfingers; i++) { + slot = input_mt_get_slot_by_key(z2->input_dev, fingers[i].finger); + if (slot < 0) { + dev_warn(&z2->spidev->dev, "unable to get slot for finger\n"); + continue; + } + slot_valid = fingers[i].state == APPLE_Z2_TOUCH_STARTED || + fingers[i].state == APPLE_Z2_TOUCH_MOVED; + input_mt_slot(z2->input_dev, slot); + input_mt_report_slot_state(z2->input_dev, MT_TOOL_FINGER, slot_valid); + if (!slot_valid) + continue; + input_report_abs(z2->input_dev, ABS_MT_POSITION_X, + le16_to_cpu(fingers[i].abs_x)); + input_report_abs(z2->input_dev, ABS_MT_POSITION_Y, + z2->y_size - le16_to_cpu(fingers[i].abs_y)); + input_report_abs(z2->input_dev, ABS_MT_WIDTH_MAJOR, + le16_to_cpu(fingers[i].tool_major)); + input_report_abs(z2->input_dev, ABS_MT_WIDTH_MINOR, + le16_to_cpu(fingers[i].tool_minor)); + input_report_abs(z2->input_dev, ABS_MT_ORIENTATION, + le16_to_cpu(fingers[i].orientation)); + input_report_abs(z2->input_dev, ABS_MT_TOUCH_MAJOR, + le16_to_cpu(fingers[i].touch_major)); + input_report_abs(z2->input_dev, ABS_MT_TOUCH_MINOR, + le16_to_cpu(fingers[i].touch_minor)); + } + input_mt_sync_frame(z2->input_dev); + input_sync(z2->input_dev); +} + +static int apple_z2_spi_sync(struct apple_z2 *z2, struct spi_message *msg) +{ + int error; + + if (z2->cs_gpio) + gpiod_direction_output(z2->cs_gpio, 0); + + error = spi_sync(z2->spidev, msg); + + if (z2->cs_gpio) + gpiod_direction_output(z2->cs_gpio, 1); + + return error; +} + +static int apple_z2_read_packet(struct apple_z2 *z2) +{ + struct spi_message msg; + struct spi_transfer xfer; + struct apple_z2_read_interrupt_cmd len_cmd; + char len_rx[16]; + size_t pkt_len; + char *pkt_rx; + int error; + + spi_message_init(&msg); + memset(&xfer, 0, sizeof(xfer)); + memset(&len_cmd, 0, sizeof(len_cmd)); + + len_cmd.cmd = APPLE_Z2_CMD_READ_INTERRUPT_DATA; + len_cmd.counter = z2->counter + 1; + len_cmd.checksum = cpu_to_le16(APPLE_Z2_CMD_READ_INTERRUPT_DATA + 1 + z2->counter); + z2->counter = 1 - z2->counter; + xfer.tx_buf = &len_cmd; + xfer.rx_buf = len_rx; + xfer.len = sizeof(len_cmd); + + spi_message_add_tail(&xfer, &msg); + error = apple_z2_spi_sync(z2, &msg); + if (error) + return error; + + pkt_len = (get_unaligned_le16(len_rx + 1) + 8) & (-4); + pkt_rx = kzalloc(pkt_len, GFP_KERNEL); + if (!pkt_rx) + return -ENOMEM; + + spi_message_init(&msg); + memset(&xfer, 0, sizeof(xfer)); + xfer.rx_buf = pkt_rx; + xfer.len = pkt_len; + + spi_message_add_tail(&xfer, &msg); + error = apple_z2_spi_sync(z2, &msg); + + if (!error) + apple_z2_parse_touches(z2, pkt_rx + 5, pkt_len - 5); + + kfree(pkt_rx); + return error; +} + +static irqreturn_t apple_z2_irq(int irq, void *data) +{ + struct spi_device *spi = data; + struct apple_z2 *z2 = spi_get_drvdata(spi); + + if (!z2->booted) + complete(&z2->boot_irq); + else + apple_z2_read_packet(z2); + + return IRQ_HANDLED; +} + +static void apple_z2_build_cal_blob(struct apple_z2 *z2, u32 address, char *data) +{ + u16 len_words = (z2->cal_size + 3) / 4; + u32 checksum = 0; + u16 checksum_hdr = 0; + int i; + struct apple_z2_hbpp_blob_hdr *hdr; + + hdr = (struct apple_z2_hbpp_blob_hdr *)data; + hdr->cmd = APPLE_Z2_HBPP_CMD_BLOB; + hdr->len = len_words; + hdr->addr = address; + + for (i = 2; i < 8; i++) + checksum_hdr += data[i]; + + hdr->checksum = checksum_hdr; + memcpy(data + 10, z2->cal_blob, z2->cal_size); + + for (i = 0; i < z2->cal_size; i++) + checksum += z2->cal_blob[i]; + + *(u32 *)(data + z2->cal_size + 10) = checksum; +} + +static int apple_z2_send_firmware_blob(struct apple_z2 *z2, const char *data, u32 size, u8 bpw) +{ + struct spi_message msg; + struct spi_transfer blob_xfer, ack_xfer; + char int_ack[] = {0x1a, 0xa1}; + char ack_rsp[] = {0, 0}; + int error; + + spi_message_init(&msg); + memset(&blob_xfer, 0, sizeof(blob_xfer)); + memset(&ack_xfer, 0, sizeof(ack_xfer)); + + blob_xfer.tx_buf = data; + blob_xfer.len = size; + blob_xfer.bits_per_word = bpw; + spi_message_add_tail(&blob_xfer, &msg); + + ack_xfer.tx_buf = int_ack; + ack_xfer.rx_buf = ack_rsp; + ack_xfer.len = 2; + spi_message_add_tail(&ack_xfer, &msg); + + reinit_completion(&z2->boot_irq); + error = apple_z2_spi_sync(z2, &msg); + if (error) + return error; + wait_for_completion_timeout(&z2->boot_irq, msecs_to_jiffies(20)); + return 0; +} + +static int apple_z2_upload_firmware(struct apple_z2 *z2) +{ + const struct firmware *fw; + struct apple_z2_fw_hdr *fw_hdr; + size_t fw_idx = sizeof(struct apple_z2_fw_hdr); + int error; + u32 load_cmd; + u32 size; + u32 address; + char *data; + u8 bits_per_word; + + error = request_firmware(&fw, z2->fw_name, &z2->spidev->dev); + if (error) { + dev_err(&z2->spidev->dev, "unable to load firmware"); + return error; + } + + fw_hdr = (struct apple_z2_fw_hdr *)fw->data; + if (fw_hdr->magic != APPLE_Z2_FW_MAGIC || fw_hdr->version != 1) { + dev_err(&z2->spidev->dev, "invalid firmware header"); + return -EINVAL; + } + + while (fw_idx < fw->size) { + if (fw->size - fw_idx < 8) { + dev_err(&z2->spidev->dev, "firmware malformed"); + error = -EINVAL; + goto error; + } + + load_cmd = *(u32 *)(fw->data + fw_idx); + fw_idx += 4; + if (load_cmd == LOAD_COMMAND_INIT_PAYLOAD || load_cmd == LOAD_COMMAND_SEND_BLOB) { + size = *(u32 *)(fw->data + fw_idx); + fw_idx += 4; + if (fw->size - fw_idx < size) { + dev_err(&z2->spidev->dev, "firmware malformed"); + error = -EINVAL; + goto error; + } + bits_per_word = load_cmd == LOAD_COMMAND_SEND_BLOB ? 16 : 8; + error = apple_z2_send_firmware_blob(z2, fw->data + fw_idx, + size, bits_per_word); + if (error) + goto error; + fw_idx += size; + } else if (load_cmd == 2) { + address = *(u32 *)(fw->data + fw_idx); + fw_idx += 4; + if (z2->cal_size != 0) { + size = z2->cal_size + sizeof(struct apple_z2_hbpp_blob_hdr) + 4; + data = kzalloc(size, GFP_KERNEL); + apple_z2_build_cal_blob(z2, address, data); + error = apple_z2_send_firmware_blob(z2, data, size, 16); + kfree(data); + if (error) + goto error; + } + } else { + dev_err(&z2->spidev->dev, "firmware malformed"); + error = -EINVAL; + goto error; + } + if (fw_idx % 4 != 0) + fw_idx += 4 - (fw_idx % 4); + } + + + z2->booted = 1; + apple_z2_read_packet(z2); + error: + release_firmware(fw); + return error; +} + +static int apple_z2_boot(struct apple_z2 *z2) +{ + int timeout; + + enable_irq(z2->spidev->irq); + gpiod_direction_output(z2->reset_gpio, 0); + timeout = wait_for_completion_timeout(&z2->boot_irq, msecs_to_jiffies(20)); + if (timeout == 0) + return -ETIMEDOUT; + return apple_z2_upload_firmware(z2); +} + +static int apple_z2_open(struct input_dev *dev) +{ + struct apple_z2 *z2 = input_get_drvdata(dev); + int error; + + /* Reset the device on boot */ + gpiod_direction_output(z2->reset_gpio, 1); + usleep_range(5000, 10000); + error = apple_z2_boot(z2); + if (error) { + gpiod_direction_output(z2->reset_gpio, 1); + disable_irq(z2->spidev->irq); + } else + z2->open = 1; + return error; +} + +static void apple_z2_close(struct input_dev *dev) +{ + struct apple_z2 *z2 = input_get_drvdata(dev); + + disable_irq(z2->spidev->irq); + gpiod_direction_output(z2->reset_gpio, 1); + z2->open = 0; + z2->booted = 0; +} + +static int apple_z2_probe(struct spi_device *spi) +{ + struct device *dev = &spi->dev; + struct apple_z2 *z2; + int error; + const char *label; + struct touchscreen_properties props; + + z2 = devm_kzalloc(dev, sizeof(*z2), GFP_KERNEL); + if (!z2) + return -ENOMEM; + + z2->spidev = spi; + init_completion(&z2->boot_irq); + spi_set_drvdata(spi, z2); + + z2->cs_gpio = devm_gpiod_get_index(dev, "cs", 0, 0); + if (IS_ERR(z2->cs_gpio)) { + if (PTR_ERR(z2->cs_gpio) != -ENOENT) { + dev_err(dev, "unable to get cs"); + return PTR_ERR(z2->cs_gpio); + } + z2->cs_gpio = NULL; + } + + z2->reset_gpio = devm_gpiod_get_index(dev, "reset", 0, 0); + if (IS_ERR(z2->reset_gpio)) { + dev_err(dev, "unable to get reset"); + return PTR_ERR(z2->reset_gpio); + } + + error = devm_request_threaded_irq(dev, z2->spidev->irq, NULL, + apple_z2_irq, IRQF_ONESHOT | IRQF_NO_AUTOEN, + "apple-z2-irq", spi); + if (error < 0) { + dev_err(dev, "unable to request irq"); + return z2->spidev->irq; + } + + error = device_property_read_string(dev, "label", &label); + if (error) { + dev_err(dev, "unable to get device name"); + return error; + } + + error = device_property_read_string(dev, "firmware-name", &z2->fw_name); + if (error) { + dev_err(dev, "unable to get firmware name"); + return error; + } + + z2->cal_blob = of_get_property(dev->of_node, "apple,z2-cal-blob", &z2->cal_size); + if (!z2->cal_blob) { + dev_warn(dev, "unable to get calibration, precision may be degraded"); + z2->cal_size = 0; + } + + z2->input_dev = devm_input_allocate_device(dev); + if (!z2->input_dev) + return -ENOMEM; + z2->input_dev->name = label; + z2->input_dev->phys = "apple_z2"; + z2->input_dev->dev.parent = dev; + z2->input_dev->id.bustype = BUS_SPI; + z2->input_dev->open = apple_z2_open; + z2->input_dev->close = apple_z2_close; + + /* Allocate the axes before setting from DT */ + input_set_abs_params(z2->input_dev, ABS_MT_POSITION_X, 0, 0, 0, 0); + input_set_abs_params(z2->input_dev, ABS_MT_POSITION_Y, 0, 0, 0, 0); + touchscreen_parse_properties(z2->input_dev, true, &props); + z2->y_size = props.max_y; + input_abs_set_res(z2->input_dev, ABS_MT_POSITION_X, 100); + input_abs_set_res(z2->input_dev, ABS_MT_POSITION_Y, 100); + input_set_abs_params(z2->input_dev, ABS_MT_WIDTH_MAJOR, 0, 65535, 0, 0); + input_set_abs_params(z2->input_dev, ABS_MT_WIDTH_MINOR, 0, 65535, 0, 0); + input_set_abs_params(z2->input_dev, ABS_MT_TOUCH_MAJOR, 0, 65535, 0, 0); + input_set_abs_params(z2->input_dev, ABS_MT_TOUCH_MINOR, 0, 65535, 0, 0); + input_set_abs_params(z2->input_dev, ABS_MT_ORIENTATION, -32768, 32767, 0, 0); + + input_set_drvdata(z2->input_dev, z2); + + error = input_mt_init_slots(z2->input_dev, 256, INPUT_MT_DIRECT); + if (error < 0) { + dev_err(dev, "unable to initialize multitouch slots"); + return error; + } + + error = input_register_device(z2->input_dev); + if (error < 0) + dev_err(dev, "unable to register input device"); + + return error; +} + +static const struct of_device_id apple_z2_of_match[] = { + { .compatible = "apple,z2-multitouch" }, + {}, +}; +MODULE_DEVICE_TABLE(of, apple_z2_of_match); + +static struct spi_device_id apple_z2_of_id[] = { + { .name = "j293-touchbar" }, + { .name = "j493-touchbar" }, + { .name = "z2-touchbar" }, + { .name = "z2-multitouch" }, + {} +}; +MODULE_DEVICE_TABLE(spi, apple_z2_of_id); + +static struct spi_driver apple_z2_driver = { + .driver = { + .name = "apple-z2", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(apple_z2_of_match), + }, + .id_table = apple_z2_of_id, + .probe = apple_z2_probe, +}; + +module_spi_driver(apple_z2_driver); + +MODULE_LICENSE("GPL"); +MODULE_FIRMWARE("apple/dfrmtfw-*.bin"); From patchwork Tue Nov 26 20:48:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein via B4 Relay X-Patchwork-Id: 13886361 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EB489D65559 for ; Tue, 26 Nov 2024 20:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vO6XpbsmfDMTTfpVaq/O4i++ICaY0nJXlftKGPZc4lA=; b=kpZ2y56jNDghnxjZSHbj2WqPls JEyVqCgSFavw8m7A5N25QyWa9PvQbgqk0mE99EWdkh0tt6IcPkspMiLmOj/HYpG0Oomu4DSNuhJIk n0e/qS6eeHzMueP54IQONEdfx7v5H7L3LUnJHy2alQD7UBdmrNMvyNHqLKIpoJFJndGNN+dYaN4r9 7TfNXr8v06+gwJo6rkufSGAbf4uortjTd8qFcBH2afUAvoia5zxXN/6cfNHW55Iml/S3KyoUwPYC1 GbeAAcUIBbLBKlYWXmR7aj2h4nd61FIGsgLFZ9wgNfRs9JUusM1Obiev14GxWi4Ec1TP3X3nMDEVB KK7tFQng==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tG2YV-0000000Bgyr-2DXN; Tue, 26 Nov 2024 20:53:07 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tG2Tn-0000000BgHn-2S2e for linux-arm-kernel@lists.infradead.org; Tue, 26 Nov 2024 20:48:17 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id ABD95A41413; Tue, 26 Nov 2024 20:46:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id D5443C4CED3; Tue, 26 Nov 2024 20:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732654093; bh=3sfwidJbVEfmW6zxaxyjnfU+ygUlFzzFkMzDLVh/wfs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Qwy7qRytUbDPXbnhZYUz1OyCHBrgynuDosnuP6FApFOuv+o1zYReI3X1sMTv78IFr WZKgGodHntj+rYDlSQdLIWL6x7U1kTrtYowW0pL9UrgGjvojBVHOweEoDuZUDTMb4G rZZ+BExcAMi+jfaL+njkphmJ/V5k4u6HROyST8tSLLTd4O3mMYxhc1eD73fiIpcHUX UWo8fw5cxPgV0mtkSjXiDWb/1liJ9HU3RNzFCVcZhrKwh+wSegtmdySnHDI9dachFH DSMqPeErte2xuYM7/9iNqrPbY4mq18qD5wj0FX91zBSE2lvGeGOjJeTzktzek74vfF /6fjpfHJs2QHw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA719D65525; Tue, 26 Nov 2024 20:48:13 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Tue, 26 Nov 2024 21:48:01 +0100 Subject: [PATCH 3/4] arm64: dts: apple: Add touchbar digitizer nodes MIME-Version: 1.0 Message-Id: <20241126-z2-v1-3-c43c4cc6200d@gmail.com> References: <20241126-z2-v1-0-c43c4cc6200d@gmail.com> In-Reply-To: <20241126-z2-v1-0-c43c4cc6200d@gmail.com> To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein , Janne Grunau X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1732654092; l=4794; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=gqYKJvX7z4TYFIJsxMCI4+iHYsE1/zB864hQ5FlH8lE=; b=Nw0G9eeqDcbozBTTSvbTNsP02fpKEivr65A5bAVLeDx3aczp+j91xqgla8OBRfAY6NSjMiyh1 M0XVh9RkM2eBs2Lz7HYpPRPm4B1HrmkDyzdg+gzTUKKZC5iUDEJs8MC X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= X-Endpoint-Received: by B4 Relay for fnkl.kernel@gmail.com/20241124 with auth_id=283 X-Original-From: Sasha Finkelstein X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_124815_764563_7F2717E9 X-CRM114-Status: GOOD ( 11.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: fnkl.kernel@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Sasha Finkelstein Adds device tree entries for the touchbar digitizer Co-developed-by: Janne Grunau Signed-off-by: Janne Grunau Signed-off-by: Sasha Finkelstein --- arch/arm64/boot/dts/apple/t8103-j293.dts | 24 ++++++++++++++++++++++++ arch/arm64/boot/dts/apple/t8103.dtsi | 19 +++++++++++++++++++ arch/arm64/boot/dts/apple/t8112-j493.dts | 20 ++++++++++++++++++++ arch/arm64/boot/dts/apple/t8112.dtsi | 14 ++++++++++++++ 4 files changed, 77 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t8103-j293.dts b/arch/arm64/boot/dts/apple/t8103-j293.dts index 56b0c67bfcda321b60c621de092643017693ff91..a1c4e5731f2147121a9845bc9f34d224025fb145 100644 --- a/arch/arm64/boot/dts/apple/t8103-j293.dts +++ b/arch/arm64/boot/dts/apple/t8103-j293.dts @@ -28,6 +28,10 @@ led-0 { default-state = "keep"; }; }; + + aliases { + touchbar0 = &touchbar0; + }; }; &bluetooth0 { @@ -38,6 +42,26 @@ &wifi0 { brcm,board-type = "apple,honshu"; }; +&spi0 { + status = "okay"; + + touchbar0: touchbar@0 { + compatible = "apple,j293-touchbar", + "apple,z2-touchbar", "apple,z2-multitouch"; + reg = <0>; + spi-max-frequency = <11500000>; + spi-cs-setup-delay-ns = <2000>; + spi-cs-hold-delay-ns = <2000>; + reset-gpios = <&pinctrl_ap 139 GPIO_ACTIVE_LOW>; + cs-gpios = <&pinctrl_ap 109 0>; + interrupts-extended = <&pinctrl_ap 194 IRQ_TYPE_EDGE_FALLING>; + firmware-name = "apple/dfrmtfw-j293.bin"; + touchscreen-size-x = <23045>; + touchscreen-size-y = <640>; + label = "MacBookPro17,1 Touch Bar"; + }; +}; + &i2c2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi index 9b0dad6b618444ac6b1c9735c50cccfc3965f947..dc72aae3844bf33579f623f0b01abc7de4033af4 100644 --- a/arch/arm64/boot/dts/apple/t8103.dtsi +++ b/arch/arm64/boot/dts/apple/t8103.dtsi @@ -326,6 +326,13 @@ clkref: clock-ref { clock-output-names = "clkref"; }; + clk_200m: clock-200m { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <200000000>; + clock-output-names = "clk_200m"; + }; + /* * This is a fabulated representation of the input clock * to NCO since we don't know the true clock tree. @@ -441,6 +448,18 @@ fpwm1: pwm@235044000 { status = "disabled"; }; + spi0: spi@235100000 { + compatible = "apple,t8103-spi", "apple,spi"; + reg = <0x2 0x35100000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&clk_200m>; + power-domains = <&ps_spi0>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; /* only used in J293 */ + }; + serial0: serial@235200000 { compatible = "apple,s5l-uart"; reg = <0x2 0x35200000 0x0 0x1000>; diff --git a/arch/arm64/boot/dts/apple/t8112-j493.dts b/arch/arm64/boot/dts/apple/t8112-j493.dts index 0ad908349f55406783942735a2e9dad54cda00ec..03fb711b3a1fa767ba70807a6d3404e4d52eb783 100644 --- a/arch/arm64/boot/dts/apple/t8112-j493.dts +++ b/arch/arm64/boot/dts/apple/t8112-j493.dts @@ -20,6 +20,7 @@ / { aliases { bluetooth0 = &bluetooth0; wifi0 = &wifi0; + touchbar0 = &touchbar0; }; led-controller { @@ -67,3 +68,22 @@ &i2c4 { &fpwm1 { status = "okay"; }; + +&spi3 { + status = "okay"; + + touchbar0: touchbar@0 { + compatible = "apple,j493-touchbar", "apple,z2-touchbar", "apple,z2-multitouch"; + reg = <0>; + label = "Mac14,7 Touch Bar"; + spi-max-frequency = <8000000>; + spi-cs-setup-delay-ns = <2000>; + spi-cs-hold-delay-ns = <2000>; + + reset-gpios = <&pinctrl_ap 170 GPIO_ACTIVE_LOW>; + interrupts-extended = <&pinctrl_ap 174 IRQ_TYPE_EDGE_FALLING>; + firmware-name = "apple/dfrmtfw-j493.bin"; + touchscreen-size-x = <23045>; + touchscreen-size-y = <640>; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t8112.dtsi b/arch/arm64/boot/dts/apple/t8112.dtsi index 1666e6ab250bc0be9b8318e3c8fc903ccd3f3760..977c1ca5e8c1b566bb3876b6619ea8812b98e072 100644 --- a/arch/arm64/boot/dts/apple/t8112.dtsi +++ b/arch/arm64/boot/dts/apple/t8112.dtsi @@ -467,6 +467,20 @@ fpwm1: pwm@235044000 { status = "disabled"; }; + spi3: spi@23510c000 { + compatible = "apple,t8112-spi", "apple,spi"; + reg = <0x2 0x3510c000 0x0 0x4000>; + interrupt-parent = <&aic>; + interrupts = ; + clocks = <&clkref>; + pinctrl-0 = <&spi3_pins>; + pinctrl-names = "default"; + power-domains = <&ps_spi3>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + serial0: serial@235200000 { compatible = "apple,s5l-uart"; reg = <0x2 0x35200000 0x0 0x1000>; From patchwork Tue Nov 26 20:48:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Finkelstein via B4 Relay X-Patchwork-Id: 13886360 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D5ED7D65555 for ; Tue, 26 Nov 2024 20:52:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To: References:Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version: Subject:Date:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dLFDVevhwR8sJ6T6qzO6vKVFKAd7nL/GUnEtM3QHpfU=; b=dO4VjvpgZw48zRs9PC5ZksdssK JQXq0NlR9siJy3KbUvpCjYqhcYRTDPKExzlcxt89+JuD1HwWTglrQNQwEAQFgUwe734MUwJZVWmjc WMe5311vjM+DOs8raTlHuk7dxgkeq03XF16kuAMml4PXCee7NFPaJG3OE17k1s/zxMO2pYWp3O4lZ YKV7gkKT/em35SaTBWfMi7OgSqhN997CphSXkdc6apu+QLAIX/rlp6SWTE81Z3ia1PETupqi45809 ZGezcF4+XXRVXXM33X7Zv+B/Ub5pvPV4/iX7fJQqrwSC2L3sD0Hv/FZoekkE3TNFhL7Z0p7b7BXhn 4QrCMCOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tG2XZ-0000000Bgrb-3Rg7; Tue, 26 Nov 2024 20:52:09 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tG2Tn-0000000BgI3-3MIo for linux-arm-kernel@lists.infradead.org; Tue, 26 Nov 2024 20:48:17 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id D0923A413F7; Tue, 26 Nov 2024 20:46:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id E5EDCC4CEDB; Tue, 26 Nov 2024 20:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732654094; bh=4El0kQkrRlr/CEy5dm9S79SsYdqflPKE+Y43lCIJcaQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=UQlEL2RNBHDHMuwoN3QCs0DnB98E6jQ/0NwC8lNh/CXmmPF9CDQjJ7yuVaGp8okjY EpG/qZaYI79Ip7ucaltMasSH1iqdouLfMu0XvFIhMc0CB0opcu5Gy1RBWzkF2h/rS1 QFAqGp6PJaFnVuZfWctgi7H6q+IwO81nUl2Ia7Oy6QiOrD/FxrLowQTvTy45mC4iJ9 h+AMaxDTVrZOqcW0uwBPOzJPWtJ5Vjeks+sMG/7vfvRVitHaOFw8FnswyVExZl3m2t 7bdInh/ZPymcQgOwPM/95BSOTZWWtJvrtrGq6HVkfVlahgnj13QjSnKQrhBH0W+Uj+ AsqzTLJsXoReQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA82ED65555; Tue, 26 Nov 2024 20:48:13 +0000 (UTC) From: Sasha Finkelstein via B4 Relay Date: Tue, 26 Nov 2024 21:48:02 +0100 Subject: [PATCH 4/4] MAINTAINERS: Add entries for Apple Z2 touchscreen driver MIME-Version: 1.0 Message-Id: <20241126-z2-v1-4-c43c4cc6200d@gmail.com> References: <20241126-z2-v1-0-c43c4cc6200d@gmail.com> In-Reply-To: <20241126-z2-v1-0-c43c4cc6200d@gmail.com> To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Henrik Rydberg Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1732654092; l=1218; i=fnkl.kernel@gmail.com; s=20241124; h=from:subject:message-id; bh=5VgCgIUSJDHHHfv8AULS59dx+V2ZROTDT6FjcyDo/sU=; b=Ir5WYIz0L4uxDNqP4Iy7InHtKEJmKl90BhcHI3EpOmGhvc+koHFn6UlkCO9LEZdWpqqMjrxn0 bgIC/fxwW36CBu2f+H+IjVj9O1oIm9ZeDSEOaIOg5bBm1onJ8WeFmfB X-Developer-Key: i=fnkl.kernel@gmail.com; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= X-Endpoint-Received: by B4 Relay for fnkl.kernel@gmail.com/20241124 with auth_id=283 X-Original-From: Sasha Finkelstein X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_124815_913311_04161C2A X-CRM114-Status: GOOD ( 10.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: fnkl.kernel@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Sasha Finkelstein Add the MAINTAINERS entries for the driver Signed-off-by: Sasha Finkelstein --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index e7f0170977013889ca7c39b17727ba36d32e92dc..9f75fff12fa1912b70251cade845d6b3d5e28c48 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2166,6 +2166,7 @@ F: Documentation/devicetree/bindings/clock/apple,nco.yaml F: Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml F: Documentation/devicetree/bindings/dma/apple,admac.yaml F: Documentation/devicetree/bindings/i2c/apple,i2c.yaml +F: Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml F: Documentation/devicetree/bindings/interrupt-controller/apple,* F: Documentation/devicetree/bindings/iommu/apple,dart.yaml F: Documentation/devicetree/bindings/iommu/apple,sart.yaml @@ -2186,6 +2187,7 @@ F: drivers/dma/apple-admac.c F: drivers/pmdomain/apple/ F: drivers/i2c/busses/i2c-pasemi-core.c F: drivers/i2c/busses/i2c-pasemi-platform.c +F: drivers/input/touchscreen/apple_z2.c F: drivers/iommu/apple-dart.c F: drivers/iommu/io-pgtable-dart.c F: drivers/irqchip/irq-apple-aic.c