From nobody Wed Jun 17 07:37:29 2026 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 3F6D736AB5B for ; Mon, 27 Apr 2026 06:42:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777272148; cv=none; b=Q/iRnRQo1jh17kTnL0JYWAHjglexlpH8OkYvrbz2q8iUvbN9wTu9KudYkeVG8E4cnQ8+Sif9ta1sEFVCnHPTswAkoso3FZtRCQA2nS3WZNkeju4Lwv8GLzJ5J3dB55hSifTEPrfgdyY8dQzA7Et+AxT5eWTGy+IJCHnB0gtOtgY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777272148; c=relaxed/simple; bh=OGjx/rpqLanYJw8wyMx1GZX57lDgWW7QcL/E9ij2zVU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=a3LvZ9vYCOYLcTaO186ar8GDrQzBqU4xUyfsuufHgZTPw3AvxpawZSzL5Ew09JW/aEwV4N9YXMiVvDjwwU7bGP5pwQ+WrbFFl72QigRKkzeCgp89MB/n7bqb17qoVDo3ypCePAS07OugZ4ica5il4ZIonxiDdoEtCmyzR1d1J8Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=inventec.com; spf=fail smtp.mailfrom=inventec.com; dkim=pass (2048-bit key) header.d=inventec.com header.i=@inventec.com header.b=S3a3YhOg; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=inventec.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=inventec.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=inventec.com header.i=@inventec.com header.b="S3a3YhOg" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-82f2766905fso4488828b3a.3 for ; Sun, 26 Apr 2026 23:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventec.com; s=google; t=1777272147; x=1777876947; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Z3ThBxdaxluBFioSVhIDwm332ADtoHWnIdue1Mw0j4g=; b=S3a3YhOg4fgpwmPhxRA4m6DwTMIHYmntrsRnalAbPOpCDyjeI1ttxlMZ9wILKuYlag Px1dqfZPI9deEnpzo461dFRV5rzzegiz/1vhyG+utWZttxQIWxl3TB4pP2XmsJFAXnRy Swwi9O0MWaEuH+agwNIrY0a6pVOFD2DSCcYwQA4aS9h+JF7xgmeYzXLUWXWGGW1P2vt8 no0JLWa5AEDgmZt0Ae+v0lvj3+K+3Ielt+t076vOV6h7+3q4PhkelUj88ESTPx+WeEJh hadi6gQ4hFYwPtLQ7ZpYefjX6ALA6GQ7b5W1v+3AZTmIE5djqKiLW1eJ/RPcPxl4r5i+ DaRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777272147; x=1777876947; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Z3ThBxdaxluBFioSVhIDwm332ADtoHWnIdue1Mw0j4g=; b=TV2JsipOj+OlLPSmWwW6K6ZfSICsXvBBu7Fpf7YirKoGjxtwp3cDqzPJQ7J+ix6eDz nayvANT86EWJfcUBpjaXr0JAqCsvExuUPD+66kQ9U9U8d/lF2EQ37n4U/94Q9AYsi8KJ XCR1viRBy8MyWvPPpMduXNG+5Caj5tkcvkC/6bL81qMRq2y5sENxCWQkJkWAwrAKDGNT Qs4vrjDwjPQuyMvdJzJDPZODDRvb64Fu6Ngo/VN2pk3Ddlh6yp2k7LJxFn3MObeFtOwy x84OQRzM3PG0JHXhyhms0DWIXgKONic+ERQstuuDhV2qKZSn/IFrH+V+4T5DDGq/d9G1 Rr6A== X-Forwarded-Encrypted: i=1; AFNElJ9odrwaDuuR5usg3btWeMydPGbL8DGCiTVwbNqPxwyteOKhtLy2gqlYEFzTTG/98DGxBOSy0iq6UK9kiOs=@vger.kernel.org X-Gm-Message-State: AOJu0YzHjBmSIvXCPgk2A7//679vb3aQ3LpvjIPddPVR2Gt2sKkoTUsS 96hJtbvRu41rX7N5QxCBTUTkCUnfiVDxlCJJdLdaQ7P6nsGy9WXHFi0nshkqEflkd9I= X-Gm-Gg: AeBDieutlevexRDMUGjdcSFFPjZngOkvIUDzSjRJiXXHATNN9QtaEiHILZE350UmsIC 0sc7XDD8/XGmpIGxx42M7DSTUVZKl1OKoHYI6rUDm9QBn9S5w9NfVejbaWOjEyBJgy+3G5dlMMw dNBOQkSNyBF4kqV3YK4p722inR4OZRyQiGQ12HVXeMXrVs+WHhiZ2XNfNFLbARrPQTWoHWhNG0f VpYg7qpWT5NTz/njA5A7IzI0RitHMWuagcZE1QRSjM9hDJa/7iI/nnMBpmPF7MXaM9fOEtMR53y Hxr53GSj66AJyeITruaoecCp2KYQXVl7YOkpGUywpOs7nyr5L3Fj1iP/HQKkuOAlghUyKLL5ErL hCadTqPXh93qzZKAxC7V/uBYai6VainXIYDU1zk0VVwgIejzx0kJHXIk2lXw2w8SrBEIAFm2Hu1 vrSy5+2GI+msJpziVNvXJGtIA5vO8WPRSDRSWvWCAYmSv5tJ2iE3br3BJFP5MsOW3dZ58dV11ah Ujf X-Received: by 2002:a05:6a00:1c96:b0:82f:1aeb:fd60 with SMTP id d2e1a72fcca58-82f8c838f93mr41143126b3a.16.1777272146651; Sun, 26 Apr 2026 23:42:26 -0700 (PDT) Received: from [127.0.1.1] (59-120-179-172.hinet-ip.hinet.net. [59.120.179.172]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f8ec05391sm32209315b3a.56.2026.04.26.23.42.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 23:42:26 -0700 (PDT) From: Brian Chiang Date: Mon, 27 Apr 2026 06:42:18 +0000 Subject: [PATCH v6 1/2] dt-bindings: trivial: Add q50sn12072 and q54sn120a1 support 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: <20260427-add-support-for-q50sn12072-and-q54sn120a1-v6-1-ffa77bfa65e7@inventec.com> References: <20260427-add-support-for-q50sn12072-and-q54sn120a1-v6-0-ffa77bfa65e7@inventec.com> In-Reply-To: <20260427-add-support-for-q50sn12072-and-q54sn120a1-v6-0-ffa77bfa65e7@inventec.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Guenter Roeck Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Jack Cheng , Brian Chiang , Jack Cheng X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1777272141; l=1150; i=chiang.brian@inventec.com; s=20260316; h=from:subject:message-id; bh=371ndBFO++Ux/UDUOyIuv35ZzqLJAZsYGZPm32hIp6Q=; b=ibT1eMLWzWgUxQeXo74bGaCtKLb1EeY56CjGi47FvPmxG5mdP/PltdLSVegRag5o0bjedqqZI MtEzxn83IxhC5kigq5Y7DOJiQlQohIxboIqqxCg3Bbeq3vQs4gxn+gA X-Developer-Key: i=chiang.brian@inventec.com; a=ed25519; pk=q+NqJYuJbGpA9KS9941D7f+8PVVW+k7DvaGgFykBiUc= From: Jack Cheng Add support for the Delta Electronics q50sn12072 and q54sn120a1 1/4 Brick DC/DC Regulated Power Modules. Signed-off-by: Jack Cheng Acked-by: Rob Herring (Arm) --- Documentation/devicetree/bindings/trivial-devices.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Docum= entation/devicetree/bindings/trivial-devices.yaml index a482aeadcd44..d4b78154df82 100644 --- a/Documentation/devicetree/bindings/trivial-devices.yaml +++ b/Documentation/devicetree/bindings/trivial-devices.yaml @@ -96,7 +96,11 @@ properties: # Delta Electronics DPS920AB 920W 54V Power Supply - delta,dps920ab # 1/4 Brick DC/DC Regulated Power Module + - delta,q50sn12072 + # 1/4 Brick DC/DC Regulated Power Module - delta,q54sj108a2 + # 1/4 Brick DC/DC Regulated Power Module + - delta,q54sn120a1 # Devantech SRF02 ultrasonic ranger in I2C mode - devantech,srf02 # Devantech SRF08 ultrasonic ranger --=20 2.43.0 From nobody Wed Jun 17 07:37:29 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 AEAC631AA94 for ; Mon, 27 Apr 2026 06:42:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777272151; cv=none; b=DOqVUjWuUBgtZhUbpmy5XadWsRQyxl2OShmYv9ibP60vUm8k0gKrdVMoyCdsJziQ9t1uV7bcw+NiZet8quBns7X/JX+YI+Toq/5nDB1wMEhQDVNae3luzVK5GmljOyUjz2MUEdeMZ6B8LAsXGvmigRYe5RaNo8kL5hZp/ieY1bM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777272151; c=relaxed/simple; bh=Ny6rp8VtXr10LNqRWUYK1VpFIJ0kxq24YYeGC5YBhAE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YaXUuzLf2QUS19FJeLip2n5aUShlzcLugHigbZYIlNd4IiY9IUqPR8NZ0mw2zzR6kN10WNxE8slnzKS1ZnVZQLG+RakvP4uJe6EtekF7uCiT8BvUtb6mF0SGbRxcwKox15VxYd9+He/RO/D/yxBJPnByTu0m4knUvQo4IEUW3gk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=inventec.com; spf=pass smtp.mailfrom=inventec.com; dkim=pass (2048-bit key) header.d=inventec.com header.i=@inventec.com header.b=Kjh56sxU; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=inventec.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=inventec.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=inventec.com header.i=@inventec.com header.b="Kjh56sxU" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-83178c0f29cso2570883b3a.0 for ; Sun, 26 Apr 2026 23:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventec.com; s=google; t=1777272149; x=1777876949; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=9x3Y2ZupitOhxEU0o8FW/3iRu0wU8R9ZhiH2l9hHnI0=; b=Kjh56sxUzFZQbOR42+UgjDpg5z1rBYOuxQw65Q5sEjDSfFUiLfzdHsA6Mti7mSTf8J A7eWo+qt7Cdb8vExWIiUCkRqeUgnz+gKIrhnfTj0T1c8gOHT4pa0C/Uo/X5XI8JsJCX9 Yd0TrHwizJ8mGtZcefmfhHawDUtY6c5gfhWXSddPlCoNekRNjJy5gn02SGtPcPDl8reO Vxc4iSMCM9YdQbMpIHsLOFJJuM2HddGQG4jVK4w1964tWRn4j3CjJhMHhhulutOMXBnI xN5KVxNOm7xRbDGl8dpsG1SaiT3mH9ORfeYCXPB4+eEjxrD8x1hWnhSkJGEVG9505Spd LNcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777272149; x=1777876949; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=9x3Y2ZupitOhxEU0o8FW/3iRu0wU8R9ZhiH2l9hHnI0=; b=Sg0jv0KXUtyHajeFDIoq4lOMHMBHMEDGzPVGR5H/khGCr48EXUJgXyjkKWyVK7csu6 RBA6bKyrWMdiGMpfqambb2aFX9j7zsHyLxXKr6zXP62Wvk4FYcuxHEvBNhHc2029g6Xv V+pO8VInil5qiQUY6J4vqt2Av5xN8ejRdwvLLIg2+oc6qt2KGp8choSvah8+My0gXBbe QEJxENHMCTbt+FfVRwJEFZTI6u6v8dIeqz+gVJ+AqRelTWvF2R+MLrHfXU0mHDyVQcb3 AE0LEHWHdvhYr1SoNpat2f5u3ThQAsDKJliOdaTMK2+CSAj+ulwAXfzyWpNGsD+kXoPJ 9Kug== X-Forwarded-Encrypted: i=1; AFNElJ+9zakNGah2v066Mc+v57K5/l8fvihPCaytOIyffX6daLye3M2YOtyTjn2Fq9auQhprjLUks6xXMUaGtU8=@vger.kernel.org X-Gm-Message-State: AOJu0YwIEYoRjKuRHlKSPG+0op0cD6xjKAxdQF3NlRtsqKj9lWeWafpD j+lERGowYo653BtjLwQCfJCjtbVwgn9QwO9dhZOe3RicgNmCfp5Ku/2c3HzsWjKmXXEu/8Px7H3 wnPuJzts= X-Gm-Gg: AeBDievEui9K7fN4+ZTgZ7QC1KrAGVJ3h6F9YvQbmYI6wI+0LQb4YHCN7a8BNQuCRK8 pSqS/3OIbjlCGRAxHXIMpcMIg2GR8061GnRFpYJDCIsiaJHUEK7mRKdqHYk/F+DXD4PhaWfsJ/T boE7QZiChHCWG7CLkgUkRexLQ10Eo/ArHWjN3jmBsnVLuHG7rUAkx9qgOx4BSkybg0Of8WcuhtH TqWtkI+uiwFyj5KaaFVbhGS8YrBlTdFVj0P9mVdYA/PynMiYNyPKsun/vL0/m68AJG4bWQFunzd 7Gj3hPHcreTFqjpAquZOjXBJnBW4lJkcpN1OXmqcELXDb8SXNU309T3lfNUuHk2Oc2xmEiSTW0/ rCAHLqOwBNtz7yMcRx7ydhIaU4QNtMgJD1ceEj7xm731nYpw3SQDSbREC0NXs4b1JItjMYqdeaw zcKR6d3yLIO0/NvTZ4dGCiyyZUqE731b3W9WlsvPDwpOLAzo8I4UvoQe/8nk+v2N+qHQ6MaW9bD /U2 X-Received: by 2002:a05:6a00:2ea8:b0:82f:807:ed7f with SMTP id d2e1a72fcca58-82f8c8c239cmr44293726b3a.24.1777272149077; Sun, 26 Apr 2026 23:42:29 -0700 (PDT) Received: from [127.0.1.1] (59-120-179-172.hinet-ip.hinet.net. [59.120.179.172]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f8ec05391sm32209315b3a.56.2026.04.26.23.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 23:42:28 -0700 (PDT) From: Brian Chiang Date: Mon, 27 Apr 2026 06:42:19 +0000 Subject: [PATCH v6 2/2] hwmon: (pmbus/q54sj108a2) Add support for q50sn12072 and q54sn120a1 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: <20260427-add-support-for-q50sn12072-and-q54sn120a1-v6-2-ffa77bfa65e7@inventec.com> References: <20260427-add-support-for-q50sn12072-and-q54sn120a1-v6-0-ffa77bfa65e7@inventec.com> In-Reply-To: <20260427-add-support-for-q50sn12072-and-q54sn120a1-v6-0-ffa77bfa65e7@inventec.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Guenter Roeck Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Jack Cheng , Brian Chiang , Jack Cheng X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1777272142; l=13936; i=chiang.brian@inventec.com; s=20260316; h=from:subject:message-id; bh=zL9IAMgfrDjYm69CQT4Hu56m1ws5BQxSRoSUIUNzHas=; b=kukLX2TI/I2GcnEoVPJV50WJ2QAfDkOfUTVaRKeC/UILE4jsQRtZ9Pd4IjQ0y5/8mtrLKyQ9C 4DTrfWCRf0bC+xda+cBPMyFHDRwDMiLsIB6HzCJoPwHB4tetrPO6Bgk X-Developer-Key: i=chiang.brian@inventec.com; a=ed25519; pk=q+NqJYuJbGpA9KS9941D7f+8PVVW+k7DvaGgFykBiUc= From: Jack Cheng The Q50SN12072 and Q54SN120A1 are high-efficiency, high-density DC-DC power module from Delta Power Modules. The Q50SN12072, quarter brick, single output 12V. This product provides up to 1200 watts of output power at 38~60V. The Q50SN12072 offers peak efficiency up to 98.3%@54Vin. The Q54SN120A1, quarter brick, single output 12V. This product provides up to 1300 watts of output power at 40~60V. The Q54SN120A1 offers peak efficiency up to 98.1%@54Vin. Add support for them to q54sj108a2 driver. Signed-off-by: Jack Cheng Co-developed-by: Brian Chiang Signed-off-by: Brian Chiang --- drivers/hwmon/pmbus/q54sj108a2.c | 179 ++++++++++++++++++++++++++---------= ---- 1 file changed, 119 insertions(+), 60 deletions(-) diff --git a/drivers/hwmon/pmbus/q54sj108a2.c b/drivers/hwmon/pmbus/q54sj10= 8a2.c index d5d60a9af8c5..b59cfee861f2 100644 --- a/drivers/hwmon/pmbus/q54sj108a2.c +++ b/drivers/hwmon/pmbus/q54sj108a2.c @@ -22,7 +22,9 @@ #define PMBUS_FLASH_KEY_WRITE 0xEC =20 enum chips { - q54sj108a2 + q50sn12072, + q54sj108a2, + q54sn120a1 }; =20 enum { @@ -55,10 +57,24 @@ struct q54sj108a2_data { #define to_psu(x, y) container_of((x), struct q54sj108a2_data, debugfs_ent= ries[(y)]) =20 static struct pmbus_driver_info q54sj108a2_info[] =3D { - [q54sj108a2] =3D { + [q50sn12072] =3D { .pages =3D 1, + /* Source : Delta Q50SN12072 */ + .format[PSC_VOLTAGE_OUT] =3D linear, + .format[PSC_TEMPERATURE] =3D linear, + .format[PSC_VOLTAGE_IN] =3D linear, + .format[PSC_CURRENT_OUT] =3D linear, =20 + .func[0] =3D PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | PMBUS_HAVE_PIN | + PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | + PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | + PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | + PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_POUT, + }, + [q54sj108a2] =3D { + .pages =3D 1, /* Source : Delta Q54SJ108A2 */ + .format[PSC_VOLTAGE_OUT] =3D linear, .format[PSC_TEMPERATURE] =3D linear, .format[PSC_VOLTAGE_IN] =3D linear, .format[PSC_CURRENT_OUT] =3D linear, @@ -69,6 +85,20 @@ static struct pmbus_driver_info q54sj108a2_info[] =3D { PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_STATUS_INPUT, }, + [q54sn120a1] =3D { + .pages =3D 1, + /* Source : Delta Q54SN120A1 */ + .format[PSC_VOLTAGE_OUT] =3D linear, + .format[PSC_TEMPERATURE] =3D linear, + .format[PSC_VOLTAGE_IN] =3D linear, + .format[PSC_CURRENT_OUT] =3D linear, + + .func[0] =3D PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | PMBUS_HAVE_PIN | + PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | + PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | + PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | + PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_POUT, + }, }; =20 static ssize_t q54sj108a2_debugfs_read(struct file *file, char __user *buf, @@ -83,73 +113,77 @@ static ssize_t q54sj108a2_debugfs_read(struct file *fi= le, char __user *buf, char *out =3D data; char *res; =20 + rc =3D pmbus_lock_interruptible(psu->client); + if (rc) + return rc; + switch (idx) { case Q54SJ108A2_DEBUGFS_OPERATION: rc =3D i2c_smbus_read_byte_data(psu->client, PMBUS_OPERATION); if (rc < 0) - return rc; + goto unlock; =20 rc =3D snprintf(data, 3, "%02x", rc); break; case Q54SJ108A2_DEBUGFS_WRITEPROTECT: rc =3D i2c_smbus_read_byte_data(psu->client, PMBUS_WRITE_PROTECT); if (rc < 0) - return rc; + goto unlock; =20 rc =3D snprintf(data, 3, "%02x", rc); break; case Q54SJ108A2_DEBUGFS_VOOV_RESPONSE: rc =3D i2c_smbus_read_byte_data(psu->client, PMBUS_VOUT_OV_FAULT_RESPONS= E); if (rc < 0) - return rc; + goto unlock; =20 rc =3D snprintf(data, 3, "%02x", rc); break; case Q54SJ108A2_DEBUGFS_IOOC_RESPONSE: rc =3D i2c_smbus_read_byte_data(psu->client, PMBUS_IOUT_OC_FAULT_RESPONS= E); if (rc < 0) - return rc; + goto unlock; =20 rc =3D snprintf(data, 3, "%02x", rc); break; case Q54SJ108A2_DEBUGFS_PMBUS_VERSION: rc =3D i2c_smbus_read_byte_data(psu->client, PMBUS_REVISION); if (rc < 0) - return rc; + goto unlock; =20 rc =3D snprintf(data, 3, "%02x", rc); break; case Q54SJ108A2_DEBUGFS_MFR_ID: rc =3D i2c_smbus_read_block_data(psu->client, PMBUS_MFR_ID, data); if (rc < 0) - return rc; + goto unlock; break; case Q54SJ108A2_DEBUGFS_MFR_MODEL: rc =3D i2c_smbus_read_block_data(psu->client, PMBUS_MFR_MODEL, data); if (rc < 0) - return rc; + goto unlock; break; case Q54SJ108A2_DEBUGFS_MFR_REVISION: rc =3D i2c_smbus_read_block_data(psu->client, PMBUS_MFR_REVISION, data); if (rc < 0) - return rc; + goto unlock; break; case Q54SJ108A2_DEBUGFS_MFR_LOCATION: rc =3D i2c_smbus_read_block_data(psu->client, PMBUS_MFR_LOCATION, data); if (rc < 0) - return rc; + goto unlock; break; case Q54SJ108A2_DEBUGFS_BLACKBOX_READ_OFFSET: rc =3D i2c_smbus_read_byte_data(psu->client, READ_HISTORY_EVENT_NUMBER); if (rc < 0) - return rc; + goto unlock; =20 rc =3D snprintf(data, 3, "%02x", rc); break; case Q54SJ108A2_DEBUGFS_BLACKBOX_READ: rc =3D i2c_smbus_read_block_data(psu->client, READ_HISTORY_EVENTS, data); if (rc < 0) - return rc; + goto unlock; =20 res =3D bin2hex(data_char, data, rc); rc =3D res - data_char; @@ -158,16 +192,22 @@ static ssize_t q54sj108a2_debugfs_read(struct file *f= ile, char __user *buf, case Q54SJ108A2_DEBUGFS_FLASH_KEY: rc =3D i2c_smbus_read_block_data(psu->client, PMBUS_FLASH_KEY_WRITE, dat= a); if (rc < 0) - return rc; + goto unlock; =20 res =3D bin2hex(data_char, data, rc); rc =3D res - data_char; out =3D data_char; break; default: - return -EINVAL; + rc =3D -EINVAL; + goto unlock; } =20 +unlock: + pmbus_unlock(psu->client); + if (rc < 0) + return rc; + out[rc] =3D '\n'; rc +=3D 2; =20 @@ -184,25 +224,29 @@ static ssize_t q54sj108a2_debugfs_write(struct file *= file, const char __user *bu int idx =3D *idxp; struct q54sj108a2_data *psu =3D to_psu(idxp, idx); =20 - rc =3D i2c_smbus_write_byte_data(psu->client, PMBUS_WRITE_PROTECT, 0); + rc =3D pmbus_lock_interruptible(psu->client); if (rc) return rc; =20 + rc =3D i2c_smbus_write_byte_data(psu->client, PMBUS_WRITE_PROTECT, 0); + if (rc) + goto unlock; + switch (idx) { case Q54SJ108A2_DEBUGFS_OPERATION: rc =3D kstrtou8_from_user(buf, count, 0, &dst_data); if (rc < 0) - return rc; + goto unlock; =20 rc =3D i2c_smbus_write_byte_data(psu->client, PMBUS_OPERATION, dst_data); if (rc < 0) - return rc; + goto unlock; =20 break; case Q54SJ108A2_DEBUGFS_CLEARFAULT: rc =3D i2c_smbus_write_byte(psu->client, PMBUS_CLEAR_FAULTS); if (rc < 0) - return rc; + goto unlock; =20 break; case Q54SJ108A2_DEBUGFS_STOREDEFAULT: @@ -212,53 +256,59 @@ static ssize_t q54sj108a2_debugfs_write(struct file *= file, const char __user *bu flash_key[3] =3D 0x42; rc =3D i2c_smbus_write_block_data(psu->client, PMBUS_FLASH_KEY_WRITE, 4,= flash_key); if (rc < 0) - return rc; + goto unlock; =20 rc =3D i2c_smbus_write_byte(psu->client, STORE_DEFAULT_ALL); if (rc < 0) - return rc; + goto unlock; =20 break; case Q54SJ108A2_DEBUGFS_VOOV_RESPONSE: rc =3D kstrtou8_from_user(buf, count, 0, &dst_data); if (rc < 0) - return rc; + goto unlock; =20 rc =3D i2c_smbus_write_byte_data(psu->client, PMBUS_VOUT_OV_FAULT_RESPON= SE, dst_data); if (rc < 0) - return rc; + goto unlock; =20 break; case Q54SJ108A2_DEBUGFS_IOOC_RESPONSE: rc =3D kstrtou8_from_user(buf, count, 0, &dst_data); if (rc < 0) - return rc; + goto unlock; =20 rc =3D i2c_smbus_write_byte_data(psu->client, PMBUS_IOUT_OC_FAULT_RESPON= SE, dst_data); if (rc < 0) - return rc; + goto unlock; =20 break; case Q54SJ108A2_DEBUGFS_BLACKBOX_ERASE: rc =3D i2c_smbus_write_byte(psu->client, ERASE_BLACKBOX_DATA); if (rc < 0) - return rc; + goto unlock; =20 break; case Q54SJ108A2_DEBUGFS_BLACKBOX_SET_OFFSET: rc =3D kstrtou8_from_user(buf, count, 0, &dst_data); if (rc < 0) - return rc; + goto unlock; =20 rc =3D i2c_smbus_write_byte_data(psu->client, SET_HISTORY_EVENT_OFFSET, = dst_data); if (rc < 0) - return rc; + goto unlock; =20 break; default: - return -EINVAL; + rc =3D -EINVAL; + goto unlock; } =20 +unlock: + pmbus_unlock(psu->client); + if (rc < 0) + return rc; + return count; } =20 @@ -270,7 +320,9 @@ static const struct file_operations q54sj108a2_fops =3D= { }; =20 static const struct i2c_device_id q54sj108a2_id[] =3D { + { "q50sn12072", q50sn12072 }, { "q54sj108a2", q54sj108a2 }, + { "q54sn120a1", q54sn120a1 }, { }, }; =20 @@ -280,6 +332,7 @@ static int q54sj108a2_probe(struct i2c_client *client) { struct device *dev =3D &client->dev; u8 buf[I2C_SMBUS_BLOCK_MAX + 1]; + const struct i2c_device_id *mid; enum chips chip_id; int ret, i; struct dentry *debugfs; @@ -292,14 +345,9 @@ static int q54sj108a2_probe(struct i2c_client *client) I2C_FUNC_SMBUS_BLOCK_DATA)) return -ENODEV; =20 - if (client->dev.of_node) - chip_id =3D (enum chips)(unsigned long)of_device_get_match_data(dev); - else - chip_id =3D i2c_match_id(q54sj108a2_id, client)->driver_data; - ret =3D i2c_smbus_read_block_data(client, PMBUS_MFR_ID, buf); if (ret < 0) { - dev_err(&client->dev, "Failed to read Manufacturer ID\n"); + dev_err(dev, "Failed to read Manufacturer ID\n"); return ret; } if (ret !=3D 6 || strncmp(buf, "DELTA", 5)) { @@ -308,19 +356,25 @@ static int q54sj108a2_probe(struct i2c_client *client) return -ENODEV; } =20 - /* - * The chips support reading PMBUS_MFR_MODEL. - */ ret =3D i2c_smbus_read_block_data(client, PMBUS_MFR_MODEL, buf); if (ret < 0) { dev_err(dev, "Failed to read Manufacturer Model\n"); return ret; } - if (ret !=3D 14 || strncmp(buf, "Q54SJ108A2", 10)) { - buf[ret] =3D '\0'; + buf[ret] =3D '\0'; + for (mid =3D q54sj108a2_id; mid->name[0]; mid++) { + if (!strncasecmp(mid->name, buf, strlen(mid->name))) + break; + } + if (!mid->name[0]) { dev_err(dev, "Unsupported Manufacturer Model '%s'\n", buf); return -ENODEV; } + chip_id =3D mid->driver_data; + + if (strcmp(client->name, mid->name) !=3D 0) + dev_notice(dev, "Device mismatch: Configured %s, detected %s\n", + client->name, mid->name); =20 ret =3D i2c_smbus_read_block_data(client, PMBUS_MFR_REVISION, buf); if (ret < 0) { @@ -341,6 +395,7 @@ static int q54sj108a2_probe(struct i2c_client *client) if (!psu) return 0; =20 + psu->chip =3D chip_id; psu->client =3D client; =20 debugfs =3D pmbus_get_debugfs_dir(client); @@ -359,9 +414,6 @@ static int q54sj108a2_probe(struct i2c_client *client) debugfs_create_file("write_protect", 0444, q54sj108a2_dir, &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_WRITEPROTECT], &q54sj108a2_fops); - debugfs_create_file("store_default", 0200, q54sj108a2_dir, - &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_STOREDEFAULT], - &q54sj108a2_fops); debugfs_create_file("vo_ov_response", 0644, q54sj108a2_dir, &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_VOOV_RESPONSE], &q54sj108a2_fops); @@ -383,27 +435,34 @@ static int q54sj108a2_probe(struct i2c_client *client) debugfs_create_file("mfr_location", 0444, q54sj108a2_dir, &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_MFR_LOCATION], &q54sj108a2_fops); - debugfs_create_file("blackbox_erase", 0200, q54sj108a2_dir, - &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_BLACKBOX_ERASE], - &q54sj108a2_fops); - debugfs_create_file("blackbox_read_offset", 0444, q54sj108a2_dir, - &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_BLACKBOX_READ_OFFSET], - &q54sj108a2_fops); - debugfs_create_file("blackbox_set_offset", 0200, q54sj108a2_dir, - &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_BLACKBOX_SET_OFFSET], - &q54sj108a2_fops); - debugfs_create_file("blackbox_read", 0444, q54sj108a2_dir, - &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_BLACKBOX_READ], - &q54sj108a2_fops); - debugfs_create_file("flash_key", 0444, q54sj108a2_dir, - &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_FLASH_KEY], - &q54sj108a2_fops); + if (psu->chip =3D=3D q54sj108a2) { + debugfs_create_file("store_default", 0200, q54sj108a2_dir, + &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_STOREDEFAULT], + &q54sj108a2_fops); + debugfs_create_file("blackbox_erase", 0200, q54sj108a2_dir, + &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_BLACKBOX_ERASE], + &q54sj108a2_fops); + debugfs_create_file("blackbox_read_offset", 0444, q54sj108a2_dir, + &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_BLACKBOX_READ_OFFSET], + &q54sj108a2_fops); + debugfs_create_file("blackbox_read", 0444, q54sj108a2_dir, + &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_BLACKBOX_READ], + &q54sj108a2_fops); + debugfs_create_file("blackbox_set_offset", 0200, q54sj108a2_dir, + &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_BLACKBOX_SET_OFFSET], + &q54sj108a2_fops); + debugfs_create_file("flash_key", 0444, q54sj108a2_dir, + &psu->debugfs_entries[Q54SJ108A2_DEBUGFS_FLASH_KEY], + &q54sj108a2_fops); + } =20 return 0; } =20 static const struct of_device_id q54sj108a2_of_match[] =3D { - { .compatible =3D "delta,q54sj108a2", .data =3D (void *)q54sj108a2 }, + { .compatible =3D "delta,q50sn12072" }, + { .compatible =3D "delta,q54sj108a2" }, + { .compatible =3D "delta,q54sn120a1" }, { }, }; =20 @@ -421,6 +480,6 @@ static struct i2c_driver q54sj108a2_driver =3D { module_i2c_driver(q54sj108a2_driver); =20 MODULE_AUTHOR("Xiao.Ma "); -MODULE_DESCRIPTION("PMBus driver for Delta Q54SJ108A2 series modules"); +MODULE_DESCRIPTION("PMBus driver for Delta Q54SJ108A2 and compatibles"); MODULE_LICENSE("GPL"); MODULE_IMPORT_NS("PMBUS"); --=20 2.43.0