From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 6327B21CC71 for ; Tue, 10 Jun 2025 10:36:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749551786; cv=none; b=FiiFR8mhnrGvf1QjM+UkFfE4a3OTFmqg3ezGeKoSqAx16Thf89o4kGEsKiGVsfVrP7nX8cXrL8BPkKZRoj54Aop48SlnLla4I7BqsrQfaekytDmiygOS+YEWtKnvhExlrG9vE9KsdVreNh3PzswgqEfDYiqxPDzuP9b9WL8Tosc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749551786; c=relaxed/simple; bh=dmq8o36TWJB0FyTjqJVgXYaya0q5Y0iYVdvbZ4aVtHk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U6cYfSnBNHGpG04CmjYO5KrOSpH+mZQ6ugDwA26P8IVobN/tPUbKVVJwqUauWsQ2iy2nCLHYvnQUoFLVF8Wu4LdQYNm7FCxcxFxB8EPgjAyhDVXDEEp5Uw0xX55+dbRV4NRGfJcLSqSnggRkjodiKAhc/8sDOrgrWVGPSIELB7g= 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=ab1CXMXk; arc=none smtp.client-ip=209.85.216.52 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="ab1CXMXk" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-3138e64b3fcso1343731a91.2 for ; Tue, 10 Jun 2025 03:36:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventec.com; s=google; t=1749551782; x=1750156582; 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; bh=RxWDwPFv6h0dImX3Gmoz9VyaNxnEqO7/sNmZV6i1DE4=; b=ab1CXMXkp07nvtmr7Dy6W43krO5X0o+wXtQQC0/0C8uxRgHm1mwNu7Xf0L7E1OJyB0 3DkqZTaJVxBGq7RId82zpuuY9sx4DTXKluOm8GfHJbRwYZZAEqTG8qbpkwOyuvM+g5Vf Xctv+AMdTVbr5pnD6BYwhvHrIS/P4QWebUlhNe/dNc2Fut/hpFkwDg6FU8it8rOokSQD V3u24YRVHgr3N0lKjG+LX9QE32KzR3YVBd+MOatbt3VfTeHLERdhB/rioSiVNxjR0NhA pAVWPbjnKRyKRtQYBKRf1stpYSLkJxdPgawiOZ2SJj9ZaL91TRhlhWq4l+3p2vEN3iYv pxRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749551782; x=1750156582; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RxWDwPFv6h0dImX3Gmoz9VyaNxnEqO7/sNmZV6i1DE4=; b=Yk4EQxuqpr3SpHcD8zuRm9l7LrOuPmazX1NN8kau/8YCXhYvbKP0lSgE3QjZqNI527 zrn7rmREdnjx0kaUf5Aga8BEeychBaQlsLwfx4wUbhEXcx2BiAYGGhzHCBSOq4bV38bL J2ZkMEZVsLEaOTQIhinLR9t0ulz0CfepEFmPwS9BQSZM3PLJvxvw3u3xvnUbFnJ5tgvV bmiPd2Fgl1FT+lHlU5sMR5gXhyisDISpT6W4ZUTP39thyRxNsOcBG/JrrXjk2oPV5lpO hAGdZk3tTNIc24mT7gYd6NcV4AMXU4aTfViXcGRceD0k/+vQhgO1GUxwhD8X9ePDkAlm W2RQ== X-Forwarded-Encrypted: i=1; AJvYcCUBN2TIidbzShPwtQeNwbx3EV3GPAaKj3nmy4J/1P35GzmI/tFM/2E6ybe8rLnmCZ0xK/E32A9MXU6phQ==@vger.kernel.org X-Gm-Message-State: AOJu0YymKV4zOAI3zMEwOPADCLqrg5xctzarLlaworaGm8xWel0NtbvE bgux0y9lLEDYjwtBHfFLifvykxAjmo1nU1VYQHhVdzGAIbkUJuVEWw5cwQdM77dk89I= X-Gm-Gg: ASbGnctQe7g73WoUJrOow3mxXCh2bVZmgdk9P7dj/ke6CiMi67A2Us59oWuuCCo/LiS niqCV5gDNJ9oZUl35BEkrXt4+5eincgj6q1hYRfeuok2OWzyOsUkjU5gPLjxXpD0Fo3Zr1mJrV2 JX3v1ibM6MaO/YNoXXCdRPZfub1K2yoUtgEVRZgns41k0qJZTkSthmpYJYf9ahvqx18Ow+e3WJS omAQBT8rClbemA5MCb42NQfa8h2p/8zKiT/PPGC6shRnOO+4wITGUSo0BFiIyiyDt7f5xjZ41H/ /iaJusCR83SRQONSlnYA6LnP9/l61Yd11tX01ls4SxS5/PMbrEtL5MuWyal/EBZ8l9h6jUipB8r talOE+F1BhfdY9MicmCMO9AQQTcWch7imM0OzzaCRSR8= X-Google-Smtp-Source: AGHT+IGn8fcfrrXvZkpHFKZoSgfdWXzGVsrIu9dy8O+QoTfXt6qGcbJSz6dn7vl+kdYmmnpCPjuB9Q== X-Received: by 2002:a17:90b:3a8b:b0:311:e8cc:424e with SMTP id 98e67ed59e1d1-3134767ea00mr23916915a91.24.1749551781667; Tue, 10 Jun 2025 03:36:21 -0700 (PDT) Received: from localhost.localdomain (60-250-242-163.hinet-ip.hinet.net. [60.250.242.163]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31349ff7e14sm7800595a91.45.2025.06.10.03.36.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 03:36:21 -0700 (PDT) From: Chiang Brian To: Jean Delvare , Guenter Roeck , Jonathan Corbet , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti Cc: Chiang Brian , linux-hwmon@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH v9 2/2] hwmon: (pmbus/tps53679) Add support for TPS53685 Date: Tue, 10 Jun 2025 18:25:55 +0800 Message-Id: <20250610102556.236300-3-chiang.brian@inventec.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250610102556.236300-1-chiang.brian@inventec.com> References: <20250610102556.236300-1-chiang.brian@inventec.com> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The TPS53685 is a fully AMD SVI3 compliant step down controller with trans-inductor voltage regulator(TLVR) topology support, dual channels, built-in non-volatile memory (NVM), PMBus interface, and full compatible with TI NexFET smart power stages. Add support for it to the tps53679 driver. Signed-off-by: Chiang Brian --- v8 -> v9: - Wrap commit message body at 75 columns - Fix the alignment to match open parenthesis - Link to v8: https://lore.kernel.org/all/20250602042454.184643-3-chiang.brian@inventec.com/ v7 -> v8: - Convert the type of device_id in tps53679_identify_multiphase() from int to char * - Run make.cross with ARCH i386 - Link to v7: https://lore.kernel.org/all/20250515081449.1433772-3-chiang.brian@inventec.com/ v6 -> v7: - Modify the type of device_id from u16 to char * - Run make.cross with ARCH nios2, powerpc, and riscv - Link to v6: https://lore.kernel.org/all/20250424132538.2004510-2-chiang.brian@inventec.corp-partner.google.com/ v5 -> v6: - Add information about tps53685 into tps53679.rst - Add additional flags when identifing the chip as tps53685 - Adjust length once returned device id is terminated by null character - Link to v5: https://lore.kernel.org/all/20250314033040.3190642-1-chiang.brian@inventec.com/ v4 -> v5: - document the compatible of tps53685 into dt-bindings - add the buffer length as argument for %*ph - Add Changelog - Link to v4: https://lore.kernel.org/all/CAJCfHmW61d2jd_tYpNEqBG_Z58bEnVKAmsvhrEP1zXQoXqrUVw@mail.gmail.com/ v3 -> v4: - Add length comparison into the comparison of "id",or it may be true when the substring of "id" matches device id. - Restore `return 0;` in `tps53679_identify_chip()` - Link to v3: https://lore.kernel.org/all/CAJCfHmVyaDPh0_ThPjhBP0zMO1oE1AR=4=Zsa0cMPXU3J4v6dw@mail.gmail.com/ v2 -> v3: - Remove the length comparsion in the comparison of "id". - Link to v2: https://lore.kernel.org/all/CAJCfHmUteFM+nUZWBWvmwFjALg1QUL5r+=syU1HmYTL1ewQWqA@mail.gmail.com/ v1 -> v2: - Modify subject and description to meet requirements - Add "tps53685" into enum chips with numeric order - Modify the content of marco "TPS53681_DEVICE_ID" from 0x81 to "\x81" - Add marco "TPS53685_DEVICE_ID" with content "TIShP" - Modify the type of "id" from u16 to char* in `tps53679_identify_chip()` - Modify the comparison of "id". It will be true if the string "id" matches device ID and compare with type char*, - Add the length comparsion into the comparison of "id". - Modify "len" as return code in `tps53679_identify_chip()` - Output device error log with %*ph, instead of 0x%x\n" - Use existing tps53679_identify_multiphase() with argument "TPS53685_DEVICE_ID" in tps53685_identify() rather than creating one tps53685_identify_multiphase() - Link to v1: https://lore.kernel.org/all/CAJCfHmVy3O4-nz2_PKF7TcXYr+HqTte1-bdUWLBmV7JOS7He1g@mail.gmail.com/ Documentation/hwmon/tps53679.rst | 8 +++++++ drivers/hwmon/pmbus/tps53679.c | 37 ++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/Documentation/hwmon/tps53679.rst b/Documentation/hwmon/tps53679.rst index 3b9561648c24..dd5e4a37375d 100644 --- a/Documentation/hwmon/tps53679.rst +++ b/Documentation/hwmon/tps53679.rst @@ -43,6 +43,14 @@ Supported chips: Datasheet: https://www.ti.com/lit/gpn/TPS53681 + * Texas Instruments TPS53685 + + Prefix: 'tps53685' + + Addresses scanned: - + + Datasheet: https://www.ti.com/lit/gpn/TPS53685 + * Texas Instruments TPS53688 Prefix: 'tps53688' diff --git a/drivers/hwmon/pmbus/tps53679.c b/drivers/hwmon/pmbus/tps53679.c index 63524dff5e75..47c28a8e25a5 100644 --- a/drivers/hwmon/pmbus/tps53679.c +++ b/drivers/hwmon/pmbus/tps53679.c @@ -16,7 +16,7 @@ #include "pmbus.h" enum chips { - tps53647, tps53667, tps53676, tps53679, tps53681, tps53688 + tps53647, tps53667, tps53676, tps53679, tps53681, tps53685, tps53688 }; #define TPS53647_PAGE_NUM 1 @@ -31,7 +31,8 @@ enum chips { #define TPS53679_PROT_VR13_5MV 0x07 /* VR13.0 mode, 5-mV DAC */ #define TPS53679_PAGE_NUM 2 -#define TPS53681_DEVICE_ID 0x81 +#define TPS53681_DEVICE_ID "\x81" +#define TPS53685_DEVICE_ID "TIShP" #define TPS53681_PMBUS_REVISION 0x33 @@ -86,10 +87,12 @@ static int tps53679_identify_phases(struct i2c_client *client, } static int tps53679_identify_chip(struct i2c_client *client, - u8 revision, u16 id) + u8 revision, char *id) { u8 buf[I2C_SMBUS_BLOCK_MAX]; int ret; + int buf_len; + int id_len; ret = pmbus_read_byte_data(client, 0, PMBUS_REVISION); if (ret < 0) @@ -102,8 +105,14 @@ static int tps53679_identify_chip(struct i2c_client *client, ret = i2c_smbus_read_block_data(client, PMBUS_IC_DEVICE_ID, buf); if (ret < 0) return ret; - if (ret != 1 || buf[0] != id) { - dev_err(&client->dev, "Unexpected device ID 0x%x\n", buf[0]); + + /* Adjust length if null terminator if present */ + buf_len = (buf[ret - 1] != '\x00' ? ret : ret - 1); + + id_len = strlen(id); + + if (buf_len != id_len || strncmp(id, buf, id_len)) { + dev_err(&client->dev, "Unexpected device ID: %*ph\n", ret, buf); return -ENODEV; } return 0; @@ -117,7 +126,7 @@ static int tps53679_identify_chip(struct i2c_client *client, */ static int tps53679_identify_multiphase(struct i2c_client *client, struct pmbus_driver_info *info, - int pmbus_rev, int device_id) + int pmbus_rev, char *device_id) { int ret; @@ -138,6 +147,16 @@ static int tps53679_identify(struct i2c_client *client, return tps53679_identify_mode(client, info); } +static int tps53685_identify(struct i2c_client *client, + struct pmbus_driver_info *info) +{ + info->func[1] |= PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | PMBUS_HAVE_PIN | + PMBUS_HAVE_STATUS_INPUT; + info->format[PSC_VOLTAGE_OUT] = linear; + return tps53679_identify_chip(client, TPS53681_PMBUS_REVISION, + TPS53685_DEVICE_ID); +} + static int tps53681_identify(struct i2c_client *client, struct pmbus_driver_info *info) { @@ -263,6 +282,10 @@ static int tps53679_probe(struct i2c_client *client) info->identify = tps53681_identify; info->read_word_data = tps53681_read_word_data; break; + case tps53685: + info->pages = TPS53679_PAGE_NUM; + info->identify = tps53685_identify; + break; default: return -ENODEV; } @@ -277,6 +300,7 @@ static const struct i2c_device_id tps53679_id[] = { {"tps53676", tps53676}, {"tps53679", tps53679}, {"tps53681", tps53681}, + {"tps53685", tps53685}, {"tps53688", tps53688}, {} }; @@ -289,6 +313,7 @@ static const struct of_device_id __maybe_unused tps53679_of_match[] = { {.compatible = "ti,tps53676", .data = (void *)tps53676}, {.compatible = "ti,tps53679", .data = (void *)tps53679}, {.compatible = "ti,tps53681", .data = (void *)tps53681}, + {.compatible = "ti,tps53685", .data = (void *)tps53685}, {.compatible = "ti,tps53688", .data = (void *)tps53688}, {} }; -- 2.25.1