From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6394937C909 for ; Wed, 12 Aug 2026 10:35:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786530946; cv=none; b=WIkpbdGOqD+LQQzI0bsscAsZWeRGkXu+AZBNm9ZfqewWjg+pwQyyjGSyM1tEf1xZpp3vwiDdjaqv6//lGOxUY1vO9VUbL+Z9OsN4GpgtO8ESgowMEr6RfomS8uc13Rk/+mMGTMC0rdrEFZaXCeeCPb+mhPfryPrmPp+mnIvt/Ic= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786530946; c=relaxed/simple; bh=FQJBQhgjZb1RX/e4wc0m6QodCj403YS0hRdwNpBEnLg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IQ5cf8e0cE8/0DfWaWFMd5Pwosr/cWlct4X5lgfIsz2vJ22j+13EXtAMmXs+b/Pgc4g9nQV96qJxQw+GQlMRpt2P/HfkojzEW9Bz2GxTqlzo+5nUZrG2qrLpHyjPozqufznwKY7p9eQy8ilSqr6X60Nd3jKbYsyxdnYZ6I7lSv0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arimil.com; spf=pass smtp.mailfrom=arimil.com; dkim=pass (2048-bit key) header.d=arimil.com header.i=@arimil.com header.b=LjovySjG; arc=none smtp.client-ip=209.85.219.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arimil.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arimil.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=arimil.com header.i=@arimil.com header.b="LjovySjG" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-8efcfdb2b43so6205336d6.3 for ; Wed, 12 Aug 2026 03:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arimil.com; s=google; t=1786530943; x=1787135743; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4qz5IS5RcDj1noT8ncMYxPnyxq+wgolMrwdoOFMS+O4=; b=LjovySjGlkOKOymAtv7CT1Wa11yufXwtyDF97DJG3BHj7+d8YHhGtRgjlsGEyZmjSj H0RHxeBKYy8RAAhHKuqUYRLqcQZVkjDh4t8mzw7rAfX4KH89qaB7yTwbGFk2Q8Y2LJok OrUq+UYNq3w6qb+5DLl+M5O+EYJOtJJliBegmjAibQehcaTpU5Lpx5q6Z3UAe1cgbrab K9hejZ8QnJxFE5kGF9vNA0yAhQiz+0juYACPfnPRku3wMV1vQoXsirRKpuBGEid/yLlZ v3qSH9WN4n3pJ8TUrd5VxeW/rzWsLbqdhd93C/nWAc8atlBw1/VJT8zeBSMtsBXubMeV hrAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786530943; x=1787135743; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=4qz5IS5RcDj1noT8ncMYxPnyxq+wgolMrwdoOFMS+O4=; b=R9Aqq/VTuJ/HF6RXuDwm4LlioKSQ7KJDAn/iygMhNukaFGG6Hy/J40j8LICCue13ba iKPeWvIk+MUwW4Go2VGrvrlPA+/W6pAjUaao4lpDVroVX3DEtb6i60Ef32jbNETcYc6P ixA5w6vUceXL+Nlu05WBW95qNXBRxx0g4FNtVLs7Bpt2z73QPPrYQOe1lQdf7Rdign8v TNmxomi+ZB/dCC4+t9uBjrzPBtOJEGWXtc3N5vWKQgCfnftPDGgg2hBOeU2PI26ijMTe Ecv9kW01WSHOmaoOS9mzLkz2ApS+OhxdJ68gpvF5tlYVSxfFCIxbxVa7oW5vCgCIA/7f 8zRw== X-Forwarded-Encrypted: i=1; AHgh+RrZhm7EjQbxETgg54JrIjsgo6jm5n6cD7FIzTbEb1D3QYh8nRHK3YNrNY+PO8wMG2NW+gdGKbzxs7jYxKU=@vger.kernel.org X-Gm-Message-State: AOJu0YyBrXQePPgis0z19mnPILSCGDnJ5dT3b9vQ1UFtJSZr4DPXqTLQ X3TVl0g/66w97doTMJPns+Xg95ryB5yBpGevvvn0piVWFd7226oMVz5RowPhQxV4f+w= X-Gm-Gg: AR+sD12Fa/lMoohPds37NI9xCTe78nu35m7LbPIvhETZh1PoP0bmALZf1xmTH7g0kEL FQyTsb4/ZJ2fJeXsOAVXjd0U4RvA/E8lwNl31fUMZEEvWhxf17EMpsp9v8sAMq/5IfeHjZU6dDw XDAZaygpKhxjssn8mzMHy1ue7YYbakoBhAx72HokiHSjep9nClPQiSjBottO0HxTnslX4hSjTVK 920BJw1GME1A1N5t9uvy+0RHUG506PMkO6rsiO3qDArgHA+bhIV7/7LgnnvX1Dvt4+axWduhTFb /cYmM+b8HoGSektKE3TyQRyvhnuV/O/z/2TSQciUUvkTyqUQUgq3zP98fn/AVR72URJI+GuJwm7 agBkDASzi6aZA75QwxBiOA7f6Lc/UVgR6UV4BfAWcyRx0VBRwLaIOIdCkHqq8bHi1nAn7QpMVvp HWcPFwF0tDENSRoOxNK7DY+gULF628373QHydp2iFNjL3atIXlca26Md6CDALpkIK7lZM1i9lkx VRCiZ5iSE2+0asHA8xmYI/NXnMFOifPmw== X-Received: by 2002:a05:6214:5097:b0:8ef:e0d0:9fae with SMTP id 6a1803df08f44-90a6ff631ccmr30481976d6.14.1786530943279; Wed, 12 Aug 2026 03:35:43 -0700 (PDT) Received: from camelot.arimil.com (24.229.171.193.res-cmts.sm3.ptd.net. [24.229.171.193]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-90a6c29e942sm18718386d6.12.2026.08.12.03.35.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 03:35:41 -0700 (PDT) From: Arie Miller To: Guenter Roeck Cc: Aleksa Savic , Will Smith , Jonathan Corbet , Shuah Khan , linux-hwmon@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Arie Miller Subject: [PATCH v3 2/3] hwmon: (asus_rog_ryujin) Add ROG Ryujin III support Date: Wed, 12 Aug 2026 06:35:31 -0400 Message-ID: <20260812103532.395049-3-renari@arimil.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260812103532.395049-1-renari@arimil.com> References: <20260812103532.395049-1-renari@arimil.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The ROG Ryujin III uses different report offsets and a different cooler-duty channel from the Ryujin II. It also lacks the separate external fan controller supplied with the older model. Add model data and USB IDs for the Extreme and EVA Edition variants. Skip controller commands and hide the unavailable controller hwmon channels for these devices. Update the driver documentation, Kconfig text, and module description accordingly. Link: https://github.com/aleksamagicka/asus_rog_ryujin-hwmon/pull/9 Assisted-by: Codex:gpt-5.6-sol sparse Signed-off-by: Arie Miller --- Documentation/hwmon/asus_rog_ryujin.rst | 24 +++++++++++++----------- drivers/hwmon/Kconfig | 4 ++-- drivers/hwmon/asus_rog_ryujin.c | 18 ++++++++++++++++-- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/Documentation/hwmon/asus_rog_ryujin.rst b/Documentation/hwmon/asus_rog_ryujin.rst index 9f77da070022..cfdfe3712f19 100644 --- a/Documentation/hwmon/asus_rog_ryujin.rst +++ b/Documentation/hwmon/asus_rog_ryujin.rst @@ -6,6 +6,8 @@ Kernel driver asus_rog_ryujin Supported devices: * ASUS ROG RYUJIN II 360 +* ASUS ROG RYUJIN III EXTREME +* ASUS ROG RYUJIN III EVA EDITION Author: Aleksa Savic @@ -16,10 +18,10 @@ This driver enables hardware monitoring support for the listed ASUS ROG RYUJIN all-in-one CPU liquid coolers. Available sensors are pump, internal and external (controller) fan speed in RPM, their duties in PWM, as well as coolant temperature. -Attaching external fans to the controller is optional and allows them to be -controlled from the device. If not connected, the fan-related sensors will -report zeroes. The controller is a separate hardware unit that comes bundled -with the AIO and connects to it to allow fan control. +The RYUJIN II includes a separate external fan controller. Attaching fans to +the controller is optional and allows them to be controlled from the device. +If not connected, the controller-related sensors will report zeroes. The +RYUJIN III does not expose these controller channels. The addressable LCD screen is not supported in this driver and should be controlled through userspace tools. @@ -33,15 +35,15 @@ supports hot swapping. Sysfs entries ------------- -=========== ============================================= +=========== ========================================================== fan1_input Pump speed (in rpm) fan2_input Internal fan speed (in rpm) -fan3_input External (controller) fan 1 speed (in rpm) -fan4_input External (controller) fan 2 speed (in rpm) -fan5_input External (controller) fan 3 speed (in rpm) -fan6_input External (controller) fan 4 speed (in rpm) +fan3_input External (controller) fan 1 speed (in rpm, RYUJIN II only) +fan4_input External (controller) fan 2 speed (in rpm, RYUJIN II only) +fan5_input External (controller) fan 3 speed (in rpm, RYUJIN II only) +fan6_input External (controller) fan 4 speed (in rpm, RYUJIN II only) temp1_input Coolant temperature (in millidegrees Celsius) pwm1 Pump duty pwm2 Internal fan duty -pwm3 External (controller) fan duty -=========== ============================================= +pwm3 External (controller) fan duty (RYUJIN II only) +=========== ========================================================== diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 43418633e2e8..81a9a1d40eec 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -293,11 +293,11 @@ config SENSORS_ASC7621 will be called asc7621. config SENSORS_ASUS_ROG_RYUJIN - tristate "ASUS ROG RYUJIN II 360 hardware monitoring driver" + tristate "ASUS ROG RYUJIN hardware monitoring driver" depends on HID help If you say yes here you get support for the fans and sensors of - the ASUS ROG RYUJIN II 360 AIO CPU liquid cooler. + supported ASUS ROG RYUJIN II and III AIO CPU liquid coolers. This driver can also be built as a module. If so, the module will be called asus_rog_ryujin. diff --git a/drivers/hwmon/asus_rog_ryujin.c b/drivers/hwmon/asus_rog_ryujin.c index 80563ce38519..79e5b6d6dae0 100644 --- a/drivers/hwmon/asus_rog_ryujin.c +++ b/drivers/hwmon/asus_rog_ryujin.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * hwmon driver for Asus ROG Ryujin II 360 AIO cooler. + * hwmon driver for Asus ROG Ryujin AIO coolers. * * Copyright 2024 Aleksa Savic */ @@ -17,6 +17,8 @@ #define USB_VENDOR_ID_ASUS_ROG 0x0b05 #define USB_PRODUCT_ID_RYUJIN_AIO 0x1988 /* ASUS ROG RYUJIN II 360 */ +#define USB_PRODUCT_ID_RYUJIN_III_EXTREME 0x1bcb +#define USB_PRODUCT_ID_RYUJIN_III_EVA 0x1ade struct rog_ryujin_device_info { u8 temp_offset; @@ -34,6 +36,14 @@ static const struct rog_ryujin_device_info rog_ryujin_ii_360_info = { .has_controller = true, }; +static const struct rog_ryujin_device_info rog_ryujin_iii_info = { + .temp_offset = 5, + .pump_speed_offset = 7, + .fan_speed_offset = 10, + .duty_channel = 1, + .has_controller = false, +}; + #define STATUS_VALIDITY 1500 /* ms */ #define MAX_REPORT_LENGTH 65 @@ -576,6 +586,10 @@ static void rog_ryujin_remove(struct hid_device *hdev) static const struct hid_device_id rog_ryujin_table[] = { { HID_USB_DEVICE(USB_VENDOR_ID_ASUS_ROG, USB_PRODUCT_ID_RYUJIN_AIO), .driver_data = (kernel_ulong_t)&rog_ryujin_ii_360_info }, + { HID_USB_DEVICE(USB_VENDOR_ID_ASUS_ROG, USB_PRODUCT_ID_RYUJIN_III_EXTREME), + .driver_data = (kernel_ulong_t)&rog_ryujin_iii_info }, + { HID_USB_DEVICE(USB_VENDOR_ID_ASUS_ROG, USB_PRODUCT_ID_RYUJIN_III_EVA), + .driver_data = (kernel_ulong_t)&rog_ryujin_iii_info }, { } }; @@ -605,4 +619,4 @@ module_exit(rog_ryujin_exit); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Aleksa Savic "); -MODULE_DESCRIPTION("Hwmon driver for Asus ROG Ryujin II 360 AIO cooler"); +MODULE_DESCRIPTION("Hwmon driver for Asus ROG Ryujin AIO coolers"); -- 2.55.0