From nobody Thu Apr 2 10:43:12 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACD0A262A6; Sun, 29 Mar 2026 18:02:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774807360; cv=none; b=BLw/xelGRgF8YJOmma0tuT4O1TMo912E7qimmQe+3xkswsP8fIashiwDp0+aPSkHWiV3+LWnPe+KaRmi5AavVknW3VZyFq/1MsmNlCEB1EeJvuKjKr0nMNWnFiLbxupwULodiBbHlr1/M4r7Sx+7qNn6PlfxZvT5vcPuGsKaMo0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774807360; c=relaxed/simple; bh=KQLMbeg4QKqADBpszyEzpxFyxsA9Ac3jxbOP4uoc5Y8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CX1z+ofibYoLBzh8lXqEK4b3r9gsGiQjtvDrv4p1Pl8t7A2xXTyuCPEuugSVG0EoZHrihpVy5pX4WfPw0P5GmRCqqeFFFr+FJhmEvlJ36zHfCLLsVI72mfjL77nM4tdMP0Gvkl6hvafW3uS9pAJAJ+0yAQOH5+VtcyZYqSp6Fgo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ob9ACM1V; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ob9ACM1V" Received: by smtp.kernel.org (Postfix) with ESMTPS id 59879C19424; Sun, 29 Mar 2026 18:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774807360; bh=KQLMbeg4QKqADBpszyEzpxFyxsA9Ac3jxbOP4uoc5Y8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Ob9ACM1Vt+/wakNGNDH0pR4HUEX+fPwSanH6rvYONZoZx0QWAcSCa0jgSpG0Gpv7Q vFYU+cqhYQS58iquT9D/PJPWY1+PxQubE1yYv85MXKyFLqHM/+ZpsLQ93CxUciLSoz O/BDgesGTccaxadgUQlhSKU8N1/VzM6FX9E6niszqm3dxxihIsD62Fp5q+G/OGKiZ5 CeuqVMdIkizO6tZQnUYs61WEr1iCi33vHvUzp0LJicxZ3FCji+6Mdu1BbNZQWEJCO6 Y08ObhHn+73FsJ+6Ua2JZ9htShkF+5Pwo12lPUkY5DzFMcOlwDExgJ/1JPC34QocgS NpLHaZITwTpYA== 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 46E50F3D61C; Sun, 29 Mar 2026 18:02:40 +0000 (UTC) From: Markus Probst via B4 Relay Date: Sun, 29 Mar 2026 20:02:15 +0200 Subject: [PATCH v5 1/4] dt-bindings: embedded-controller: Add synology microp devices Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260329-synology_microp_initial-v5-1-27cb80bdf591@posteo.de> References: <20260329-synology_microp_initial-v5-0-27cb80bdf591@posteo.de> In-Reply-To: <20260329-synology_microp_initial-v5-0-27cb80bdf591@posteo.de> To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Bryan O'Donoghue , Lee Jones , Pavel Machek , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Len Brown , Saravana Kannan Cc: platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-acpi@vger.kernel.org, Markus Probst X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2847; i=markus.probst@posteo.de; h=from:subject:message-id; bh=LjFpIfANTZFo1+4IPCHrW+YIb3KmnE+ivKHsB6gln08=; b=owEBiQJ2/ZANAwAIATR2H/jnrUPSAcsmYgBpyWk57cnwGnzCYU7bX9FQiaKM/eXTH6tO9Tsvs 8PqY3PJRquJAk8EAAEIADkWIQSCdBjE9KxY53IwxHM0dh/4561D0gUCaclpORsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDIACgkQNHYf+OetQ9IgDA/+MkrrYxXzol9wLHQzbRjvpCsg6A/6Hn6 H0AoQgev00ZuBP8o5HPBJW2wL0BSIZ8hEg/hIxrGg/vxBYMKHz90cfSGPjF3tyqVJw7tf1wlcwP bNRykHuuxTXqNeQ+vtEhLD5oa/y4pbwkDoTFmGfRxCmPpj3h/5iEo4k6yOVRA+toNg63jEtMCzJ Hm9aq4s6vaWN/X9Hf4+1jdJi4PUZN4gozqI3iqp1zLIuFKx2S/M5wrlTp9whdBqunWSDYYgcyZ5 RoZ/kNYb+049oFVOHCwX46k1+J7C3s58MemHgWiIO0JL0t2y45exFk4ozUVw94/68rEd2gq4yZ3 ZAAN4RyhqCBQRgUeQREp3CA1W++fodZZvkfV9H7Wy7d+q82wvmLmM8LA1X2Q+zyOmw3RmuXMYs9 /APKwzC5fDHFOHpsmIPsEIqVwdPldK1Ks//Pk/hbtNso3D7lsMOr4oZqNzdZX5JragSPj7xQU0d ITPdapX3ODn4R/yTCsVvEKra7yBbBPTXOA2NtaDri54URNPhMOWMdQiouADGMCksBjS9sGKM//W PtWNKFQh2n+d4kBn3+0rL6epwa7Ut344MIYHN1fxtSfZS2QPtDTw6hS88OcFQU93DvwEo5R28h/ BAKU8Sbn74AVHk0n0D6UHZuBbWlKJVvWckYrJ7+xj86jWoINbFt0= X-Developer-Key: i=markus.probst@posteo.de; a=openpgp; fpr=827418C4F4AC58E77230C47334761FF8E7AD43D2 X-Endpoint-Received: by B4 Relay for markus.probst@posteo.de/default with auth_id=680 X-Original-From: Markus Probst Reply-To: markus.probst@posteo.de From: Markus Probst Add the Synology Microp devicetree bindings. Those devices are microcontrollers found on Synology NAS devices. They are connected to a serial port on the host device. Those devices are used to control certain LEDs, fan speeds, a beeper, to handle buttons, fan failures and to properly shutdown and reboot the device. Signed-off-by: Markus Probst --- .../synology,ds923p-microp.yaml | 65 ++++++++++++++++++= ++++ 1 file changed, 65 insertions(+) diff --git a/Documentation/devicetree/bindings/embedded-controller/synology= ,ds923p-microp.yaml b/Documentation/devicetree/bindings/embedded-controller= /synology,ds923p-microp.yaml new file mode 100644 index 000000000000..599d32ce2be9 --- /dev/null +++ b/Documentation/devicetree/bindings/embedded-controller/synology,ds923p= -microp.yaml @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/embedded-controller/synology,ds923p-mic= rop.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synology NAS on-board Microcontroller + +maintainers: + - Markus Probst + +description: | + Synology Microp is a microcontroller found in Synology NAS devices. + It is connected to a serial port on the host device. + + It is necessary to properly shutdown and reboot the NAS device and + provides additional functionality such as led control, fan speed control, + a beeper and buttons on the NAS device. + +properties: + compatible: + enum: + - synology,ds923p-microp + - synology,ds918p-microp + - synology,ds214play-microp + - synology,ds225p-microp + - synology,ds425p-microp + - synology,ds710p-microp + - synology,ds1010p-microp + - synology,ds723p-microp + - synology,ds1522p-microp + - synology,rs422p-microp + - synology,ds725p-microp + - synology,ds118-microp + - synology,ds124-microp + - synology,ds223-microp + - synology,ds223j-microp + - synology,ds1823xsp-microp + - synology,rs822p-microp + - synology,rs1221p-microp + - synology,rs1221rpp-microp + - synology,ds925p-microp + - synology,ds1525p-microp + - synology,ds1825p-microp + + fan-failure-gpios: + description: GPIOs needed to determine which fans stopped working on a= fan failure event. + minItems: 2 + maxItems: 3 + +required: + - compatible + +additionalProperties: false + +examples: + - | + #include + #include + + embedded-controller { + compatible =3D "synology,ds923p-microp"; + + fan-failure-gpios =3D <&gpio 68 GPIO_ACTIVE_HIGH>, <&gpio 69 GPIO_AC= TIVE_HIGH>; + }; --=20 2.52.0 From nobody Thu Apr 2 10:43:12 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4AAB386578; Sun, 29 Mar 2026 18:02:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774807361; cv=none; b=rP4dSj9l4Jj/x4llbxsgAToUAv9Vky+OK9Gc3I2q2l3uKXv2r6owAj6Icbb/afuNT+v7os5gTlEN1FcW7zhxNl37WsAsIWu+BljX5ay6+Rw5K9KcWF7925AxjnaIRXL/Q3KaQItcgHgbLxwER6KIdqFPfg3ijUHDwv+34ePWcjQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774807361; c=relaxed/simple; bh=G0FGzYXDDW4R9eGPWkahJ7X/ZrWEJvdqlnXvnLxXd54=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JkevLbs2G4dCoWeN7g/OJZKPYrMaDGNkfTmScIvVpMbPIYMGsVYPQKwL0FeWUz7GP36Ll9DeKGM1sjpemUVeKxvhQrTXrdg7u6m/SeIW6njFq7V6v0KiIqm+ULEiiB0OteI8iWU/d7Nyv0q2TnaAr5X2Ef+GHfasPXbvHGNazwM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Y8Fnndf2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Y8Fnndf2" Received: by smtp.kernel.org (Postfix) with ESMTPS id 704A8C2BCB1; Sun, 29 Mar 2026 18:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774807360; bh=G0FGzYXDDW4R9eGPWkahJ7X/ZrWEJvdqlnXvnLxXd54=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Y8Fnndf220bgT/tYw+7Ak/AswOVy0Gd3/haR9ABW7nxutHIt0S1zvdwQCh61SiEuj bo22MEVBEqdEGs3I6ftGkydkhfPIu1DsIacDqBhSRX1VNd6Y7NfVm8CnoRvX1PrPil udMXNwrJriAA51OmPoWznf9uvlG0hlltd84suuGjBQuIQTBKvbxbGZztT6kEY57hJA /fHHIex20nxUj61wM6ZkcWeIJ+MmnPRZ63O/tSnq9hbC7hwK/O7RqwfMPa6lWin3b+ IQKSNw0frRlH4wIZ0gjbf2I2h0NLPNO3frVl0CJMs/6nh34Boi8X1Na+Qh4KUDZDKN 1NdsgQosXQwvA== 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 5CDD7F3D61F; Sun, 29 Mar 2026 18:02:40 +0000 (UTC) From: Markus Probst via B4 Relay Date: Sun, 29 Mar 2026 20:02:16 +0200 Subject: [PATCH v5 2/4] ACPI: of: match PRP0001 in of_match_device Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260329-synology_microp_initial-v5-2-27cb80bdf591@posteo.de> References: <20260329-synology_microp_initial-v5-0-27cb80bdf591@posteo.de> In-Reply-To: <20260329-synology_microp_initial-v5-0-27cb80bdf591@posteo.de> To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Bryan O'Donoghue , Lee Jones , Pavel Machek , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Len Brown , Saravana Kannan Cc: platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-acpi@vger.kernel.org, Markus Probst X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3479; i=markus.probst@posteo.de; h=from:subject:message-id; bh=HMCBaJI1P1YqAkteFmwT2ODjJk1KjOq1Yh0ug86s1zs=; b=owEBiQJ2/ZANAwAIATR2H/jnrUPSAcsmYgBpyWk64tit0EV5IRL2Ka6xmKM30y1j9EVJH02Ji fJerO0lS5+JAk8EAAEIADkWIQSCdBjE9KxY53IwxHM0dh/4561D0gUCaclpOhsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDIACgkQNHYf+OetQ9J7HhAAjkadI0ejYpWk+cSPgdRrBvZshABIbgZ GQxgme4t6lF1yir06RFgZ4DX9OiuYb3uNNb9sEML4Rc+pmpQMqj49ucyUWhmJ8Ck8GsFJZy3uz1 x52L159LhE7fnrRpft71UTe9QuN7KbK8hVW3l/HYQOpa+bh0K1s/dNcH8G7JMyJk6cLX9Dgu/uJ R1VWPjOcCyM+wQdZ9Nsx27sUInClzLYS3IkFFIF0aCm5K0X4GdsCQOzsNJHVEdNMQwtTfKSBZKo XDR1D46AGw8atrYG/Lz18Q0nKzjTnYrQimTiv2SkzON6c9z1o/OFC7jQNH1ewKTy8+pQ0omYHUN 2QgE0iLkoSVJxW6CLIQd8r1V+wOurWApv0dI01lzIa28uNrn1uxLUCmtC3ugdxoudexVj3XR5xZ F0bbHkrm+1lVIA6cK46JaFCbJ/eFKCOx28q9uzRmHcCGnRuuItmtogtRiVVf5lIy+6uFp491/0l yFsIhX27UgnOEMGPdyEPKi9eskCdpM+F6Uzjhf+MIZxRB1bK5vtJV5mpKgJ5r+/DtKqCx+1+WGb VhtDnr91ra0PsNEKzqJoHjdfFZrZjDeQo5GReIeWr1BVPUVqHU7QfnotHPItj6dhzcSP3LyMIB3 Dhd4hoPqw/HnYDOvAxwf5IhSzTTfCw/RQ7GuTNwZTmF5Gs2918pU= X-Developer-Key: i=markus.probst@posteo.de; a=openpgp; fpr=827418C4F4AC58E77230C47334761FF8E7AD43D2 X-Endpoint-Received: by B4 Relay for markus.probst@posteo.de/default with auth_id=680 X-Original-From: Markus Probst Reply-To: markus.probst@posteo.de From: Markus Probst Export `acpi_of_match_device` function and use it to match for PRP0001 in `of_match_device`, if the device does not have a device node. This fixes the match data being NULL when using ACPI PRP0001, even though the device was matched against an of device table. Signed-off-by: Markus Probst --- drivers/acpi/bus.c | 7 ++++--- drivers/of/device.c | 9 +++++++-- include/linux/acpi.h | 11 +++++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 2ec095e2009e..cd02f04cf685 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -831,9 +831,9 @@ const struct acpi_device *acpi_companion_match(const st= ruct device *dev) * identifiers and a _DSD object with the "compatible" property, use that * property to match against the given list of identifiers. */ -static bool acpi_of_match_device(const struct acpi_device *adev, - const struct of_device_id *of_match_table, - const struct of_device_id **of_id) +bool acpi_of_match_device(const struct acpi_device *adev, + const struct of_device_id *of_match_table, + const struct of_device_id **of_id) { const union acpi_object *of_compatible, *obj; int i, nval; @@ -866,6 +866,7 @@ static bool acpi_of_match_device(const struct acpi_devi= ce *adev, =20 return false; } +EXPORT_SYMBOL_GPL(acpi_of_match_device); =20 static bool acpi_of_modalias(struct acpi_device *adev, char *modalias, size_t len) diff --git a/drivers/of/device.c b/drivers/of/device.c index f7e75e527667..128682390058 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -11,6 +11,7 @@ #include #include #include +#include =20 #include #include "of_private.h" @@ -26,8 +27,12 @@ const struct of_device_id *of_match_device(const struct of_device_id *matc= hes, const struct device *dev) { - if (!matches || !dev->of_node || dev->of_node_reused) - return NULL; + if (!matches || !dev->of_node || dev->of_node_reused) { + const struct of_device_id *id =3D NULL; + + acpi_of_match_device(ACPI_COMPANION(dev), matches, &id); + return id; + } return of_match_node(matches, dev->of_node); } EXPORT_SYMBOL(of_match_device); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4d2f0bed7a06..1cf23edcbfbb 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -736,6 +736,10 @@ const struct acpi_device_id *acpi_match_acpi_device(co= nst struct acpi_device_id const struct acpi_device_id *acpi_match_device(const struct acpi_device_id= *ids, const struct device *dev); =20 +bool acpi_of_match_device(const struct acpi_device *adev, + const struct of_device_id *of_match_table, + const struct of_device_id **of_id); + const void *acpi_device_get_match_data(const struct device *dev); extern bool acpi_driver_match_device(struct device *dev, const struct device_driver *drv); @@ -965,6 +969,13 @@ static inline const struct acpi_device_id *acpi_match_= device( return NULL; } =20 +static inline bool acpi_of_match_device(const struct acpi_device *adev, + const struct of_device_id *of_match_table, + const struct of_device_id **of_id) +{ + return false; +} + static inline const void *acpi_device_get_match_data(const struct device *= dev) { return NULL; --=20 2.52.0 From nobody Thu Apr 2 10:43:12 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1537E387345; Sun, 29 Mar 2026 18:02:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774807361; cv=none; b=QbVVhA9WoYdL/woF4ZY348gcyiXISIFhZfgxmAnTyZnJJl1MMgOVaPrx5D7ODqBzRs37RCcbx7jHLQd8m1SrAuNN/u+nelqzvQXxOS5NRzkyXeeHHTMOLpm6teu09K7ga3yAt1u2foX+gkmvw2npKBXGxNbZgC3lQerS6n2MF1I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774807361; c=relaxed/simple; bh=FJhC27+7zeXo83uPgrYf71tU8fzeZWxPfJuQirmjthA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FdnBfibrOv+IRYkBGJ1EuWhVnw+lWyPimrAs3p0hjZttfYF1tpsv/BOEJBiggUfzhYB9gwy/je59uOu7Hp1GC0t9lg1V64k5Z0GckGMOyj4Ma42d1Rw0gycUcN6EehqHkg5CQWxWndA3xqg6SZmYQIsalqucoZnGtsEd0PDrblA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VDyEDx6g; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VDyEDx6g" Received: by smtp.kernel.org (Postfix) with ESMTPS id 93DE1C2BCB2; Sun, 29 Mar 2026 18:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774807360; bh=FJhC27+7zeXo83uPgrYf71tU8fzeZWxPfJuQirmjthA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=VDyEDx6gwxhqYOjuDddQZYEe2HcnYWgXwryfk/pwFuHIpU2e0an2WXC3PMcBaXilk 8oZldrp43Qbg3BaZaJavhip72k8p6kKf6cj/1dHaiSqbOxmLv2lUBuB5/dwBtgpaYU k1yG0ZLJ3adsTyfaCuFIglJODiu1joz/1PZ/WSQ4WzJxnZhqMSz6GEQR3hSgZ/NrMP fY/GTEKJbEreqnbe1f65EJ28Ryj4dBF812/87zkuG7cI/hckyljOFvPmPTKFqp+c5S 3Nc5dIa0dYHcdl8qHFSBNR2TVnoZMFC+vnvGInUndzXkozStM3B2Mr/8c4ZLCnWsNX nHkWY35A2Id0g== 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 84A2DF3D60E; Sun, 29 Mar 2026 18:02:40 +0000 (UTC) From: Markus Probst via B4 Relay Date: Sun, 29 Mar 2026 20:02:17 +0200 Subject: [PATCH v5 3/4] rust: add visibility to of_device_table macro Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260329-synology_microp_initial-v5-3-27cb80bdf591@posteo.de> References: <20260329-synology_microp_initial-v5-0-27cb80bdf591@posteo.de> In-Reply-To: <20260329-synology_microp_initial-v5-0-27cb80bdf591@posteo.de> To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Bryan O'Donoghue , Lee Jones , Pavel Machek , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Len Brown , Saravana Kannan Cc: platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-acpi@vger.kernel.org, Markus Probst X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1069; i=markus.probst@posteo.de; h=from:subject:message-id; bh=iV2l67bhv+wCuyTeTqB9BVUr9sNOMqsg1qsymLG7EsM=; b=owEBiQJ2/ZANAwAIATR2H/jnrUPSAcsmYgBpyWk80jz8hwYduy2NVO16Nw+QmCcnfOUz4un+D flz7346mdyJAk8EAAEIADkWIQSCdBjE9KxY53IwxHM0dh/4561D0gUCaclpPBsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDIACgkQNHYf+OetQ9L1IhAAmOHqW05kUkziFxXtscbD5JGUieX/6Xe ONLSKTl/BtzYFwSZZOnvkhewlw5jN/37XUDGkFdu8ol6LY8XRd5hff+AV3JpM0oclvwbMOQABRc 4gi67cvMB8iOGnIRN1/YcJl4NLbbyfYkugxE7CSF8wwnhRdOTzK7lyBLVPQUMg7OUpcijlEn92w 85BW3OVkrRd19axOEFPR+Rkj0fOncuHqXiE5LWxmhrVJV5FPB/ylysA2sWHzZ9Y93ozYaF00iIX 0Lbjeg8TkNnqesjS6D104WW7rBSMeV40f5cQr+RWqid3jDvc0h20sM0Aj73FDG+C5pwgI/DIaIV T+joE6ZUQb+GaVBLRjBlxmYk/rDzfQYuS6qhLd/DFq15Qd9S6V++H4kUJfTl0dZLfzAgmJpJE0y saDHowfRam5yf2gSWRPbnYOL0PNDaivmi6ppJG4sdcb7OlHiYTJ83meAJTfoIYY8gu8h2sKwH3p jtfjoOj11bGwZMQubldnHPl10SyA6ABxrqB2RzX2CzV7BLEvWxOgenRXq0uXeVXaF8Gikp+AwRL qsqVm8hkZpDXLiQIUK+ShWyZlibpj34PM2u7xg5x0MPOEcYmcta2rfgrZX2NuxipHvJtabHUEeN OCJE7QzLwafk3BsbFSqdnzgFvEXMeDIkZhQBggpkMJmKaNoV9hzk= X-Developer-Key: i=markus.probst@posteo.de; a=openpgp; fpr=827418C4F4AC58E77230C47334761FF8E7AD43D2 X-Endpoint-Received: by B4 Relay for markus.probst@posteo.de/default with auth_id=680 X-Original-From: Markus Probst Reply-To: markus.probst@posteo.de From: Markus Probst Add visibility argument to macro to allow defining an of device table in a different module than the driver, which can improve readability. Signed-off-by: Markus Probst --- rust/kernel/of.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rust/kernel/of.rs b/rust/kernel/of.rs index 58b20c367f99..a0de98a23416 100644 --- a/rust/kernel/of.rs +++ b/rust/kernel/of.rs @@ -53,8 +53,9 @@ pub const fn new(compatible: &'static CStr) -> Self { /// Create an OF `IdTable` with an "alias" for modpost. #[macro_export] macro_rules! of_device_table { - ($table_name:ident, $module_table_name:ident, $id_info_type: ty, $tabl= e_data: expr) =3D> { - const $table_name: $crate::device_id::IdArray< + ($table_vis:vis $table_name:ident, $module_table_name:ident, $id_info_= type: ty, + $table_data: expr) =3D> { + $table_vis const $table_name: $crate::device_id::IdArray< $crate::of::DeviceId, $id_info_type, { $table_data.len() }, --=20 2.52.0 From nobody Thu Apr 2 10:43:12 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 151CA386C3E; Sun, 29 Mar 2026 18:02:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774807361; cv=none; b=Cw9mozf8Bn30Q40vZEH1Zy2/Lu1DcF01wV7ts0Rpb5dc5fi6cacu3B2kZEcp/B5OkKv0YFY2YTKlXGtrdnH+eA2JpPxquz9g6QBWsTe43FCp7rS84jq2WXduvQnUGMDtj4NMUMeC5tn94YB4VvXBo3WTQUEIMpnBHqbbrQq0pCA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774807361; c=relaxed/simple; bh=ubfJ4y7S2sHEWcdmejHmgeyKajPKdWW7xq2MuYD5xmc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V59whP5wAPkKQD4rRfi1OTcMTJzoJqzuibgZs0KxSKQRi+8QY1tY89okEPbLE+wdWG3a6wAQOuHLYBWBBLYRqhyHyvt5rqD9CbI+zViVLsDQckd1+7X2Bnxuk/Ckq7MNRMcalXdcOdPnSBka4YMjVY+Al09DfBUSWmnOQ8Vr52s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oqu+8890; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oqu+8890" Received: by smtp.kernel.org (Postfix) with ESMTPS id A6278C2BCB4; Sun, 29 Mar 2026 18:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774807360; bh=ubfJ4y7S2sHEWcdmejHmgeyKajPKdWW7xq2MuYD5xmc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=oqu+8890nctB4Y4dzW3pJSbcCjWW6FgCb1ltYP2zoI9rGLqQQlCH6XH4gyCscB09d s+lKoXXEzX3TJeeysKzZoT38GeQbWvX6o9VlfwC+dr6ZKzbJSoJ9ZImnAXWw5PJkFV sheQAculz9pNA17Yl/GxRxPtCXC8JfesyKFtwJtiKIm+t6nZlLyA+4yWnUPNLOlpNl eD87qBa6eJ4lHUnhCuTYWizLKevzQPifkxCW2BrVc/CTU0YHz0jtqVn+eCRnZUFRxj Z7DKfDx0sG+SK93GgJcgYajw3mN2dWbgFXi2ov0Wiw/gilE0+XtIJDDztRn3h6baHd qnNNTf8xY6TPA== 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 9A3B4FC72A0; Sun, 29 Mar 2026 18:02:40 +0000 (UTC) From: Markus Probst via B4 Relay Date: Sun, 29 Mar 2026 20:02:18 +0200 Subject: [PATCH v5 4/4] platform: Add initial synology microp driver Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260329-synology_microp_initial-v5-4-27cb80bdf591@posteo.de> References: <20260329-synology_microp_initial-v5-0-27cb80bdf591@posteo.de> In-Reply-To: <20260329-synology_microp_initial-v5-0-27cb80bdf591@posteo.de> To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Bryan O'Donoghue , Lee Jones , Pavel Machek , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Len Brown , Saravana Kannan Cc: platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-acpi@vger.kernel.org, Markus Probst X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=20314; i=markus.probst@posteo.de; h=from:subject:message-id; bh=yrzjZbZgwaJ2bp4M2Fjq+W1D7x0HPjApLfr85u17qBg=; b=owEBiQJ2/ZANAwAIATR2H/jnrUPSAcsmYgBpyWk9BO5iJDlwUL2Yn3JUsufOSJeCw/uvs9A1D /bhkBKvZ0WJAk8EAAEIADkWIQSCdBjE9KxY53IwxHM0dh/4561D0gUCaclpPRsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDIACgkQNHYf+OetQ9JgKhAAkHvqRfb6r3jvhGFlV89rvBLDCjVTL/l J8KINrZLjzuMxj+c0ZoZMcWR0i9Nkx2EtjyaYnSEqJabbpoE2FyzRRsV/2T6gyCMaBz2/AwAL/W rbovlhFR1jScibAQTji6ekDceeAJKNxhj7/QrADbQsoPYEcEk74v1naMEmwNn+DlIh+xNqJd/pm C+0Oee00GbiO7l+svtQ4tI9/LV7hiQL2q3ABMAlobIr96K9oIZfNlUZGzXHJUmNajgiGcQ2RyFX UdzjSYuTHy4anAy8qFWIJHfdQfyUbknC74EWgkCzfDTab3Ep1uRQ4Vps0+ckSK5IaB4EHomlmtm XUSdcwYhsAJKOq4o+cHk4EynK1DbwWyfO6UFUm9EufgFBIqOF/xB9BvL/KsGEbAjrfZZHEAHxv/ vxD70rSWwP1YEgQZKusOnj/RJDmKJvfHZ7FDpwyGkgxniQxOqI9iSMK/xXVjF6SYaw+P91YsffT qBqTiTTHQUaCcn9Kyu4Ck04W6s4NmdNVyaQGopx/0caiFvTK3RP24BgrJ5985lFbon74gqcUMMV xabGTwUYiOu35KKN0gXJdPy41astzLBBkS0UPN0za/MPtp9ZqBaADa9eXTDpODPAoGrapFerW8C VBNj5z/eGfa5w5xSLyIVj+FcKHQDW63osYPmBxR/i7wux87YixX0= X-Developer-Key: i=markus.probst@posteo.de; a=openpgp; fpr=827418C4F4AC58E77230C47334761FF8E7AD43D2 X-Endpoint-Received: by B4 Relay for markus.probst@posteo.de/default with auth_id=680 X-Original-From: Markus Probst Reply-To: markus.probst@posteo.de From: Markus Probst Add a initial synology microp driver, written in Rust. The driver targets a microcontroller found in Synology NAS devices. It currently only supports controlling of the power led, status led, alert led and usb led. Other components such as fan control or handling on-device buttons will be added once the required rust abstractions are there. This driver can be used both on arm and x86, thus it goes into the root directory of drivers/platform. Tested successfully on a Synology DS923+. Signed-off-by: Markus Probst --- MAINTAINERS | 6 + drivers/platform/Kconfig | 2 + drivers/platform/Makefile | 1 + drivers/platform/synology_microp/Kconfig | 13 + drivers/platform/synology_microp/Makefile | 3 + drivers/platform/synology_microp/TODO | 7 + drivers/platform/synology_microp/command.rs | 55 ++++ drivers/platform/synology_microp/led.rs | 276 +++++++++++++++++= ++++ drivers/platform/synology_microp/model.rs | 171 +++++++++++++ .../platform/synology_microp/synology_microp.rs | 54 ++++ 10 files changed, 588 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 83b5a45de729..24cc4f63cce6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25544,6 +25544,12 @@ F: drivers/dma-buf/sync_* F: include/linux/sync_file.h F: include/uapi/linux/sync_file.h =20 +SYNOLOGY MICROP DRIVER +M: Markus Probst +S: Maintained +F: Documentation/devicetree/bindings/embedded-controller/synology,ds923p-m= icrop.yaml +F: drivers/platform/synology_microp/ + SYNOPSYS ARC ARCHITECTURE M: Vineet Gupta L: linux-snps-arc@lists.infradead.org diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig index 312788f249c9..996050566a4a 100644 --- a/drivers/platform/Kconfig +++ b/drivers/platform/Kconfig @@ -22,3 +22,5 @@ source "drivers/platform/arm64/Kconfig" source "drivers/platform/raspberrypi/Kconfig" =20 source "drivers/platform/wmi/Kconfig" + +source "drivers/platform/synology_microp/Kconfig" diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile index fa322e7f8716..2381872e9133 100644 --- a/drivers/platform/Makefile +++ b/drivers/platform/Makefile @@ -15,3 +15,4 @@ obj-$(CONFIG_SURFACE_PLATFORMS) +=3D surface/ obj-$(CONFIG_ARM64_PLATFORM_DEVICES) +=3D arm64/ obj-$(CONFIG_BCM2835_VCHIQ) +=3D raspberrypi/ obj-$(CONFIG_ACPI_WMI) +=3D wmi/ +obj-$(CONFIG_SYNOLOGY_MICROP) +=3D synology_microp/ diff --git a/drivers/platform/synology_microp/Kconfig b/drivers/platform/sy= nology_microp/Kconfig new file mode 100644 index 000000000000..0c145a5b7174 --- /dev/null +++ b/drivers/platform/synology_microp/Kconfig @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config SYNOLOGY_MICROP + tristate "Synology Microp driver" + depends on LEDS_CLASS && LEDS_CLASS_MULTICOLOR + depends on RUST_SERIAL_DEV_BUS_ABSTRACTIONS + help + Enable support for the MCU found in Synology NAS devices. + + This is needed to properly shutdown and reboot the device, as well as + additional functionality like fan and LED control. + + This driver is work in progress and may not be fully functional. diff --git a/drivers/platform/synology_microp/Makefile b/drivers/platform/s= ynology_microp/Makefile new file mode 100644 index 000000000000..63585ccf76e4 --- /dev/null +++ b/drivers/platform/synology_microp/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-y +=3D synology_microp.o diff --git a/drivers/platform/synology_microp/TODO b/drivers/platform/synol= ogy_microp/TODO new file mode 100644 index 000000000000..1961a33115db --- /dev/null +++ b/drivers/platform/synology_microp/TODO @@ -0,0 +1,7 @@ +TODO: +- add missing components: + - handle on-device buttons (Power, Factory reset, "USB Copy") + - handle fan failure + - beeper + - fan speed control + - correctly perform device power-off and restart on Synology devices diff --git a/drivers/platform/synology_microp/command.rs b/drivers/platform= /synology_microp/command.rs new file mode 100644 index 000000000000..5b3dd715afac --- /dev/null +++ b/drivers/platform/synology_microp/command.rs @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0 + +use kernel::{ + device::Bound, + error::Result, + serdev, // +}; + +use crate::led; + +#[derive(Copy, Clone)] +#[expect( + clippy::enum_variant_names, + reason =3D "future variants will not end with Led" +)] +pub(crate) enum Command { + PowerLed(led::State), + StatusLed(led::StatusLedColor, led::State), + AlertLed(led::State), + UsbLed(led::State), + EsataLed(led::State), +} + +impl Command { + pub(crate) fn write(self, dev: &serdev::Device) -> Result { + dev.write_all( + match self { + Self::PowerLed(led::State::On) =3D> &[0x34], + Self::PowerLed(led::State::Blink) =3D> &[0x35], + Self::PowerLed(led::State::Off) =3D> &[0x36], + + Self::StatusLed(_, led::State::Off) =3D> &[0x37], + Self::StatusLed(led::StatusLedColor::Green, led::State::On= ) =3D> &[0x38], + Self::StatusLed(led::StatusLedColor::Green, led::State::Bl= ink) =3D> &[0x39], + Self::StatusLed(led::StatusLedColor::Orange, led::State::O= n) =3D> &[0x3A], + Self::StatusLed(led::StatusLedColor::Orange, led::State::B= link) =3D> &[0x3B], + + Self::AlertLed(led::State::On) =3D> &[0x4C, 0x41, 0x31], + Self::AlertLed(led::State::Blink) =3D> &[0x4C, 0x41, 0x32], + Self::AlertLed(led::State::Off) =3D> &[0x4C, 0x41, 0x33], + + Self::UsbLed(led::State::On) =3D> &[0x40], + Self::UsbLed(led::State::Blink) =3D> &[0x41], + Self::UsbLed(led::State::Off) =3D> &[0x42], + + Self::EsataLed(led::State::On) =3D> &[0x4C, 0x45, 0x31], + Self::EsataLed(led::State::Blink) =3D> &[0x4C, 0x45, 0x32], + Self::EsataLed(led::State::Off) =3D> &[0x4C, 0x45, 0x33], + }, + serdev::Timeout::Max, + )?; + dev.wait_until_sent(serdev::Timeout::Max); + Ok(()) + } +} diff --git a/drivers/platform/synology_microp/led.rs b/drivers/platform/syn= ology_microp/led.rs new file mode 100644 index 000000000000..a78a95588456 --- /dev/null +++ b/drivers/platform/synology_microp/led.rs @@ -0,0 +1,276 @@ +// SPDX-License-Identifier: GPL-2.0 + +use kernel::{ + device::Bound, + devres::{ + self, + Devres, // + }, + led::{ + self, + LedOps, + MultiColorSubLed, // + }, + new_mutex, + prelude::*, + serdev, + str::CString, + sync::Mutex, // +}; +use pin_init::pin_init_scope; + +use crate::{ + command::Command, + model::Model, // +}; + +#[pin_data] +pub(crate) struct Data { + #[pin] + status: Devres>, + power_name: CString, + #[pin] + power: Devres>, +} + +impl Data { + pub(super) fn register<'a>( + dev: &'a serdev::Device, + model: &'a Model, + ) -> impl PinInit + 'a { + pin_init_scope(move || { + if let Some(color) =3D model.led_alert { + let name =3D CString::try_from_fmt(fmt!("{}:alarm", color.= as_c_str().to_str()?))?; + devres::register( + dev.as_ref(), + led::DeviceBuilder::new().color(color).name(&name).bui= ld( + dev, + try_pin_init!(LedHandler { + blink <- new_mutex!(false), + command: Command::AlertLed, + }), + ), + GFP_KERNEL, + )?; + } + + if model.led_usb_copy { + devres::register( + dev.as_ref(), + led::DeviceBuilder::new() + .color(led::Color::Green) + .name(c"green:usb") + .build( + dev, + try_pin_init!(LedHandler { + blink <- new_mutex!(false), + command: Command::UsbLed, + }), + ), + GFP_KERNEL, + )?; + } + + if model.led_esata { + devres::register( + dev.as_ref(), + led::DeviceBuilder::new() + .color(led::Color::Green) + .name(c"green:esata") + .build( + dev, + try_pin_init!(LedHandler { + blink <- new_mutex!(false), + command: Command::EsataLed, + }), + ), + GFP_KERNEL, + )?; + } + + Ok(try_pin_init!(Self { + status <- led::DeviceBuilder::new() + .color(led::Color::Multi) + .name(c"multicolor:status") + .build_multicolor( + dev, + try_pin_init!(StatusLedHandler { + blink <- new_mutex!(false), + }), + StatusLedHandler::SUBLEDS, + ), + power_name: CString::try_from_fmt(fmt!( + "{}:power", + model.led_power.as_c_str().to_str()? + ))?, + power <- led::DeviceBuilder::new() + .color(model.led_power) + .name(power_name) + .build( + dev, + try_pin_init!(LedHandler { + blink <- new_mutex!(true), + command: Command::PowerLed, + }), + ), + })) + }) + } +} + +#[derive(Copy, Clone)] +pub(crate) enum StatusLedColor { + Green, + Orange, +} + +#[derive(Copy, Clone)] +pub(crate) enum State { + On, + Blink, + Off, +} + +#[pin_data] +struct LedHandler { + #[pin] + blink: Mutex, + command: fn(State) -> Command, +} + +#[vtable] +impl LedOps for LedHandler { + type Bus =3D serdev::Device; + type Mode =3D led::Normal; + const BLOCKING: bool =3D true; + const MAX_BRIGHTNESS: u32 =3D 1; + + fn brightness_set( + &self, + dev: &Self::Bus, + _classdev: &led::Device, + brightness: u32, + ) -> Result<()> { + let mut blink =3D self.blink.lock(); + (self.command)(if brightness =3D=3D 0 { + *blink =3D false; + State::Off + } else if *blink { + State::Blink + } else { + State::On + }) + .write(dev)?; + + Ok(()) + } + + fn blink_set( + &self, + dev: &Self::Bus, + _classdev: &led::Device, + delay_on: &mut usize, + delay_off: &mut usize, + ) -> Result<()> { + let mut blink =3D self.blink.lock(); + + (self.command)(if *delay_on =3D=3D 0 && *delay_off !=3D 0 { + State::Off + } else if *delay_on !=3D 0 && *delay_off =3D=3D 0 { + State::On + } else { + *blink =3D true; + *delay_on =3D 167; + *delay_off =3D 167; + + State::Blink + }) + .write(dev) + } +} + +#[pin_data] +struct StatusLedHandler { + #[pin] + blink: Mutex, +} + +impl StatusLedHandler { + const SUBLEDS: &[MultiColorSubLed] =3D &[ + MultiColorSubLed::new(led::Color::Green).initial_intensity(1), + MultiColorSubLed::new(led::Color::Orange), + ]; +} + +#[vtable] +impl LedOps for StatusLedHandler { + type Bus =3D serdev::Device; + type Mode =3D led::MultiColor; + const BLOCKING: bool =3D true; + const MAX_BRIGHTNESS: u32 =3D 1; + + fn brightness_set( + &self, + dev: &Self::Bus, + classdev: &led::MultiColorDevice, + brightness: u32, + ) -> Result<()> { + let mut blink =3D self.blink.lock(); + if brightness =3D=3D 0 { + *blink =3D false; + } + + let (color, subled_brightness) =3D if classdev.subleds()[1].intens= ity =3D=3D 0 { + (StatusLedColor::Green, classdev.subleds()[0].brightness) + } else { + (StatusLedColor::Orange, classdev.subleds()[1].brightness) + }; + + Command::StatusLed( + color, + if subled_brightness =3D=3D 0 { + State::Off + } else if *blink { + State::Blink + } else { + State::On + }, + ) + .write(dev) + } + + fn blink_set( + &self, + dev: &Self::Bus, + classdev: &led::MultiColorDevice, + delay_on: &mut usize, + delay_off: &mut usize, + ) -> Result<()> { + let mut blink =3D self.blink.lock(); + *blink =3D true; + + let (color, subled_intensity) =3D if classdev.subleds()[1].intensi= ty =3D=3D 0 { + (StatusLedColor::Green, classdev.subleds()[0].intensity) + } else { + (StatusLedColor::Orange, classdev.subleds()[1].intensity) + }; + Command::StatusLed( + color, + if *delay_on =3D=3D 0 && *delay_off !=3D 0 { + *blink =3D false; + State::Off + } else if subled_intensity =3D=3D 0 { + State::Off + } else if *delay_on !=3D 0 && *delay_off =3D=3D 0 { + *blink =3D false; + State::On + } else { + *delay_on =3D 167; + *delay_off =3D 167; + + State::Blink + }, + ) + .write(dev) + } +} diff --git a/drivers/platform/synology_microp/model.rs b/drivers/platform/s= ynology_microp/model.rs new file mode 100644 index 000000000000..b972aae2b805 --- /dev/null +++ b/drivers/platform/synology_microp/model.rs @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: GPL-2.0 + +use kernel::{ + led::{ + self, + Color, // + }, + of::DeviceId, // +}; + +pub(crate) struct Architecture; + +impl Architecture { + const fn new() -> Self { + Self + } +} + +pub(crate) struct Model { + #[expect( + dead_code, + reason =3D "needed later for architecture specific properties, lik= e poweroff behaviour" + )] + pub(crate) arch: Architecture, + pub(crate) led_power: led::Color, + pub(crate) led_alert: Option, + pub(crate) led_usb_copy: bool, + pub(crate) led_esata: bool, +} + +impl Model { + const fn new(arch: Architecture) -> Self { + Self { + arch, + led_power: led::Color::Blue, + led_alert: None, + led_usb_copy: false, + led_esata: false, + } + } + + const fn led_power(self, color: led::Color) -> Self { + Self { + led_power: color, + ..self + } + } + + const fn led_alert(self, color: led::Color) -> Self { + Self { + led_alert: Some(color), + ..self + } + } + + const fn led_esata(self) -> Self { + Self { + led_esata: true, + ..self + } + } + + const fn led_usb_copy(self) -> Self { + Self { + led_usb_copy: true, + ..self + } + } +} + +macro_rules! models { + [ + $($arch:ident $(.$arch_func:ident( $($arch_arg:tt)* ))* + @ [ + $($model:ident $(.$func:ident( $($arg:tt)* ))*, )* + ], + )* + ] =3D> { + models![ + $( + { + Architecture::new() + $( + .$arch_func($($arch_arg)*) + )* + } + @ + [ + $( + $model $(.$func($($arg)*))*, + )* + ], + )* + ] + }; + [ + $($arch:block + @ [ + $($model:ident $(.$func:ident( $($arg:tt)* ))*, )* + ], + )* + ] =3D> { + [ + $( + $(( + DeviceId::new(::kernel::c_str!( + ::core::concat!( + "synology,", + ::core::stringify!($model), + "-microp", + ) + )), + Model::new($arch) + $( + .$func($($arg)*) + )* + ),)* + )* + ] + }; +} + +kernel::of_device_table!( + pub(crate) OF_TABLE, + MODULE_OF_TABLE, + Model, + models![ + apollolake @ [ + ds918p, + ], + evansport @ [ + ds214play, + ], + geminilakenk @ [ + ds225p.led_usb_copy(), + ds425p, + ], + pineview @ [ + ds710p.led_esata(), + ds1010p.led_alert(Color::Orange), + ], + r1000 @ [ + ds923p, + ds723p, + ds1522p, + rs422p.led_power(Color::Green), + ], + r1000nk @ [ + ds725p, + ], + rtd1296 @ [ + ds118, + ], + rtd1619b @ [ + ds124, + ds223.led_usb_copy(), + ds223j, + ], + v1000 @ [ + ds1823xsp, + rs822p.led_power(Color::Green), + rs1221p.led_power(Color::Green), + rs1221rpp.led_power(Color::Green), + ], + v1000nk @ [ + ds925p, + ds1525p, + ds1825p, + ], + ] +); diff --git a/drivers/platform/synology_microp/synology_microp.rs b/drivers/= platform/synology_microp/synology_microp.rs new file mode 100644 index 000000000000..51152cc14b1e --- /dev/null +++ b/drivers/platform/synology_microp/synology_microp.rs @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Synology Microp driver + +use kernel::{ + device, + of, + prelude::*, + serdev, // +}; +use pin_init::pin_init_scope; + +use crate::model::Model; + +pub(crate) mod command; +mod led; +mod model; + +kernel::module_serdev_device_driver! { + type: SynologyMicropDriver, + name: "synology_microp", + authors: ["Markus Probst "], + description: "Synology Microp driver", + license: "GPL v2", +} + +#[pin_data] +struct SynologyMicropDriver { + #[pin] + led: led::Data, +} + +#[vtable] +impl serdev::Driver for SynologyMicropDriver { + type IdInfo =3D Model; + const OF_ID_TABLE: Option> =3D Some(&model::= OF_TABLE); + + fn probe( + dev: &serdev::Device, + model: Option<&Model>, + ) -> impl PinInit { + pin_init_scope(move || { + let model =3D model.ok_or(EINVAL)?; + + dev.set_baudrate(9600).map_err(|_| EINVAL)?; + dev.set_flow_control(false); + dev.set_parity(serdev::Parity::None)?; + + Ok(try_pin_init!(Self { + led <- led::Data::register(dev, model), + })) + }) + } +} --=20 2.52.0