From nobody Fri Oct 3 23:02:08 2025 Received: from out-172.mta1.migadu.com (out-172.mta1.migadu.com [95.215.58.172]) (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 74BE7B663 for ; Fri, 22 Aug 2025 13:24:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755869053; cv=none; b=O4icuYUhcUe/fGpdcf4l2DgY4y2ugH0h/WP5N1Mbh/Yn3+/Dk3f5Stn0W5jiWSrudxQvbUhyy6oWEa4Ygo2WqtIjZ7uj9MEbcwpC+mCfxc7orn84PABnFankc5n59GoQ10QeR15Kr3EE1+hMJFiL9jCdX1aDIoqp6CxqTZk2cfk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755869053; c=relaxed/simple; bh=fEvV/+Ani8LY6L3ztHsoTyS0k/1ewvS/N96D8j5c0k0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=De8MMp2nK6lf7wavxYET+vGlWSR0ZJV/4hXU+y6KYJy1Smz55AOzy6GpcxWhLN8r/S9Hvc4T/xzE0gkhRNG9u/FlHllJTK5N2bM0EhdO4Di61egbCOlHGvMzmSbmbN8Hbsv59TGFt3VWoE78cLI6EVQtfA5ZgHu8xFr7mnY8oWo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=watter.com; spf=pass smtp.mailfrom=linux.dev; arc=none smtp.client-ip=95.215.58.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=watter.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Ben Collins Date: Fri, 22 Aug 2025 09:23:50 -0400 Subject: [PATCH v8 1/5] dt-bindings: iio: mcp9600: Set default 3 for thermocouple-type 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: <20250822-upstream-changes-v8-1-40bb1739e3e2@watter.com> References: <20250822-upstream-changes-v8-0-40bb1739e3e2@watter.com> In-Reply-To: <20250822-upstream-changes-v8-0-40bb1739e3e2@watter.com> To: Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Hepp Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Collins , Krzysztof Kozlowski X-Migadu-Flow: FLOW_OUT As is already documented in this file, Type-K is the default, so make that explicit in the dt-bindings. Signed-off-by: Ben Collins Reviewed-by: Krzysztof Kozlowski Reviewed-by: David Lechner --- Documentation/devicetree/bindings/iio/temperature/microchip,mcp9600.yaml |= 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/iio/temperature/microchip,mc= p9600.yaml b/Documentation/devicetree/bindings/iio/temperature/microchip,mc= p9600.yaml index d2cafa38a5442e229be8befb26ae3f34bae44cdb..57b387a1accc776683500949a22= ef0290fc876e8 100644 --- a/Documentation/devicetree/bindings/iio/temperature/microchip,mcp9600.y= aml +++ b/Documentation/devicetree/bindings/iio/temperature/microchip,mcp9600.y= aml @@ -37,6 +37,7 @@ properties: =20 thermocouple-type: $ref: /schemas/types.yaml#/definitions/uint32 + default: 3 description: Type of thermocouple (THERMOCOUPLE_TYPE_K if omitted). Use defines in dt-bindings/iio/temperature/thermocouple.h. --=20 2.39.5 From nobody Fri Oct 3 23:02:08 2025 Received: from out-186.mta1.migadu.com (out-186.mta1.migadu.com [95.215.58.186]) (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 370872FE592 for ; Fri, 22 Aug 2025 13:24:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.186 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755869053; cv=none; b=VpeqGLLNencVP7/4dv2xrepZlK2x8neLqUb6hqKJ4lxsTfuM47lBsCM57fBj8I098ACZxGbxYet1BjV32RITpsTmVxZiunC1Aka56hChy68nRGenN2NQOZiIBdQi1jxrw2b/kkV3TtQ6O+MTlGrs7LYSW6qlQDlkfZwiwmS9CGY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755869053; c=relaxed/simple; bh=OCBS0uYeU2CqHCKiCjnIdltLOiB5T5hlTFvVGOpiRUk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZgxAEHjiL875kxDnFCQepqg+FmlpzqopvVxE0cB8MeQ9cluefRoTnpHqyszqJETCNMLXL33olfU/YzIvPJohHZwemmXzu/ayJZqP2seQv7g0wOF4oPHF2nKeho3gQUPW0lnEK13SEbQjuXVpe36T3pOJ8nXHZZ3zcFef0An6Ufo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=watter.com; spf=pass smtp.mailfrom=linux.dev; arc=none smtp.client-ip=95.215.58.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=watter.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Ben Collins Date: Fri, 22 Aug 2025 09:23:51 -0400 Subject: [PATCH v8 2/5] dt-bindings: iio: mcp9600: Add microchip,mcp9601 and add constraints 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: <20250822-upstream-changes-v8-2-40bb1739e3e2@watter.com> References: <20250822-upstream-changes-v8-0-40bb1739e3e2@watter.com> In-Reply-To: <20250822-upstream-changes-v8-0-40bb1739e3e2@watter.com> To: Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Hepp Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Collins , Krzysztof Kozlowski X-Migadu-Flow: FLOW_OUT Add microchip,mcp9601 compatible in addition to the original microchip,mcp9600 to designate support between these two chips. The current dt-binding has open-circuit and short-circuit as interrupt names, but these are only supported in mcp9601. The OC and SC detection requires that mcp9601 VSENSE be wired up, which not only enables the OC SC interrupts, but also the OC and SC status register bits. Add a microchip,vsense boolean to show the chip is wired for this support. Add constraints so this feature only applies if the mcp9601 compatible is selected. Signed-off-by: Ben Collins Reviewed-by: Krzysztof Kozlowski Reviewed-by: David Lechner --- .../iio/temperature/microchip,mcp9600.yaml | 56 ++++++++++++++++++= ++-- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/iio/temperature/microchip,mc= p9600.yaml b/Documentation/devicetree/bindings/iio/temperature/microchip,mc= p9600.yaml index 57b387a1accc776683500949a22ef0290fc876e8..fb3661c805934255d35f664e101= 8ed2ec91d05f0 100644 --- a/Documentation/devicetree/bindings/iio/temperature/microchip,mcp9600.y= aml +++ b/Documentation/devicetree/bindings/iio/temperature/microchip,mcp9600.y= aml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/iio/temperature/microchip,mcp9600.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# =20 -title: Microchip MCP9600 thermocouple EMF converter +title: Microchip MCP9600 and similar thermocouple EMF converters =20 maintainers: - Andrew Hepp @@ -14,7 +14,11 @@ description: =20 properties: compatible: - const: microchip,mcp9600 + oneOf: + - const: microchip,mcp9600 + - items: + - const: microchip,mcp9601 + - const: microchip,mcp9600 =20 reg: maxItems: 1 @@ -43,8 +47,37 @@ properties: Use defines in dt-bindings/iio/temperature/thermocouple.h. Supported types are B, E, J, K, N, R, S, T. =20 + microchip,vsense: + type: boolean + description: + This flag indicates that the chip has been wired with VSENSE to + enable open and short circuit detect. + vdd-supply: true =20 +allOf: + - if: + properties: + compatible: + not: + contains: + const: microchip,mcp9601 + then: + properties: + interrupts: + minItems: 1 + maxItems: 4 + interrupt-names: + minItems: 1 + maxItems: 4 + items: + enum: + - alert1 + - alert2 + - alert3 + - alert4 + microchip,vsense: false + required: - compatible - reg @@ -64,8 +97,25 @@ examples: reg =3D <0x60>; interrupt-parent =3D <&gpio>; interrupts =3D <25 IRQ_TYPE_EDGE_RISING>; - interrupt-names =3D "open-circuit"; + interrupt-names =3D "alert1"; thermocouple-type =3D ; vdd-supply =3D <&vdd>; }; }; + - | + #include + #include + i2c { + #address-cells =3D <1>; + #size-cells =3D <0>; + + temperature-sensor@62 { + compatible =3D "microchip,mcp9601", "microchip,mcp9600"; + reg =3D <0x62>; + interrupt-parent =3D <&gpio>; + interrupts =3D <22 IRQ_TYPE_EDGE_RISING>, <23 IRQ_TYPE_EDGE_RI= SING>; + interrupt-names =3D "open-circuit", "short-circuit"; + vdd-supply =3D <&vdd>; + microchip,vsense; + }; + }; --=20 2.39.5 From nobody Fri Oct 3 23:02:08 2025 Received: from out-183.mta1.migadu.com (out-183.mta1.migadu.com [95.215.58.183]) (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 E4E3D2FFDF3 for ; Fri, 22 Aug 2025 13:24:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755869055; cv=none; b=IDXb6TfSMCYUtjgUCxZrRZHAr629KktxL+hgxZ5RB48Oqvfb2VyXt5qWzeKThJ+9zhfjtlEqLAn1MKt76CVk/ZVWGx0IihEox4ZGc9+O4nqGvpL86fFtvgsSkFUg2fM0MuPop97er4q8yhmxlFMXqQMgUqrCj5hbabR5+o1QcaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755869055; c=relaxed/simple; bh=fDAVcwzg8PfisaO/909uIAOlBgoscfFwm3+npFTrxTo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ps1XFEOf+JpxxqyVSO2tOWsrd/Q2rRQEkLtu4DckTUX9UL+/oTSingkEatO6NC27g1mgpjlJqiEOaVicXeVYLNQ9A2ZT449Q+rp0FY8K6EY+Vq/cKOBzjDX9KyK2c6vAGmtQH1XUlGbW9EZPd3Sy5naWM4Eb3IDym+r3hzkA+48= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=watter.com; spf=pass smtp.mailfrom=linux.dev; arc=none smtp.client-ip=95.215.58.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=watter.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Ben Collins Date: Fri, 22 Aug 2025 09:23:52 -0400 Subject: [PATCH v8 3/5] iio: mcp9600: White space and fixed width cleanup 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: <20250822-upstream-changes-v8-3-40bb1739e3e2@watter.com> References: <20250822-upstream-changes-v8-0-40bb1739e3e2@watter.com> In-Reply-To: <20250822-upstream-changes-v8-0-40bb1739e3e2@watter.com> To: Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Hepp Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Collins , Andy Shevchenko X-Migadu-Flow: FLOW_OUT Make tabs consistent for register definitions and also fix width to byte size. Signed-off-by: Ben Collins Reviewed-by: David Lechner Reviewed-by: Andy Shevchenko --- drivers/iio/temperature/mcp9600.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/iio/temperature/mcp9600.c b/drivers/iio/temperature/mc= p9600.c index 6e9108d5cf75f3b7a3c45ada1537c446c6853392..40906bb200ec92812a70c2dfb05= 5793d94c7c060 100644 --- a/drivers/iio/temperature/mcp9600.c +++ b/drivers/iio/temperature/mcp9600.c @@ -23,25 +23,25 @@ #include =20 /* MCP9600 registers */ -#define MCP9600_HOT_JUNCTION 0x0 -#define MCP9600_COLD_JUNCTION 0x2 -#define MCP9600_STATUS 0x4 +#define MCP9600_HOT_JUNCTION 0x00 +#define MCP9600_COLD_JUNCTION 0x02 +#define MCP9600_STATUS 0x04 #define MCP9600_STATUS_ALERT(x) BIT(x) -#define MCP9600_ALERT_CFG1 0x8 +#define MCP9600_ALERT_CFG1 0x08 #define MCP9600_ALERT_CFG(x) (MCP9600_ALERT_CFG1 + (x - 1)) #define MCP9600_ALERT_CFG_ENABLE BIT(0) #define MCP9600_ALERT_CFG_ACTIVE_HIGH BIT(2) #define MCP9600_ALERT_CFG_FALLING BIT(3) #define MCP9600_ALERT_CFG_COLD_JUNCTION BIT(4) -#define MCP9600_ALERT_HYSTERESIS1 0xc +#define MCP9600_ALERT_HYSTERESIS1 0x0c #define MCP9600_ALERT_HYSTERESIS(x) (MCP9600_ALERT_HYSTERESIS1 + (x - 1)) #define MCP9600_ALERT_LIMIT1 0x10 #define MCP9600_ALERT_LIMIT(x) (MCP9600_ALERT_LIMIT1 + (x - 1)) #define MCP9600_ALERT_LIMIT_MASK GENMASK(15, 2) -#define MCP9600_DEVICE_ID 0x20 +#define MCP9600_DEVICE_ID 0x20 =20 /* MCP9600 device id value */ -#define MCP9600_DEVICE_ID_MCP9600 0x40 +#define MCP9600_DEVICE_ID_MCP9600 0x40 =20 #define MCP9600_ALERT_COUNT 4 =20 --=20 2.39.5 From nobody Fri Oct 3 23:02:08 2025 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) (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 A4F33302CB1 for ; Fri, 22 Aug 2025 13:24:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755869057; cv=none; b=P6h47eBbiVXB6C0PhI827S3UC8815P+CCSmIlwq/tDcLx3SVwnZOLjVv4ahA+vR9Vi1uSO4paENPEKQ0MyRgxjDZytzuqQm/DtY+vtdngC97hfF9CSKp3MoqPMWYAgwa1NOkNsUBTMK5AFgIs+5QiIxl1VOo/aRH0z3CymMNkR8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755869057; c=relaxed/simple; bh=+kahL0pcEwOGjHEJ57RpurvwhbeD/eX+uPwT+yFMWCo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RZkjGiGFD0jqdWbkQtqyD6PwnHhAj1jRcEw6HkOwWPWckPuwYXaRhoY5xOUwHvACMpzpzJDfKEInWiN+iiTRh2HyuEEYjz5FLCF3VUzz9LuCv0nVhZC6uE9ylrn1VnrgEfkq1q3iC6d/sj7ujYJ31M3zXGsjtOmoHgIAyM9sqxk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=watter.com; spf=pass smtp.mailfrom=linux.dev; arc=none smtp.client-ip=95.215.58.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=watter.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Ben Collins Date: Fri, 22 Aug 2025 09:23:53 -0400 Subject: [PATCH v8 4/5] iio: mcp9600: Recognize chip id for mcp9601 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: <20250822-upstream-changes-v8-4-40bb1739e3e2@watter.com> References: <20250822-upstream-changes-v8-0-40bb1739e3e2@watter.com> In-Reply-To: <20250822-upstream-changes-v8-0-40bb1739e3e2@watter.com> To: Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Hepp Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Collins X-Migadu-Flow: FLOW_OUT The current driver works with mcp9601, but emits a warning because it does not recognize the chip id. MCP9601 is a superset of MCP9600. The drivers works without changes on this chipset. However, the 9601 chip supports open/closed-circuit detection if wired properly, so we'll need to be able to differentiate between them. Moved "struct mcp9600_data" up in the file since a later patch will need it and chip_info before the declarations. Signed-off-by: Ben Collins Reviewed-by: David Lechner --- drivers/iio/temperature/Kconfig | 8 +++-- drivers/iio/temperature/mcp9600.c | 68 ++++++++++++++++++++++++++++++-----= ---- 2 files changed, 57 insertions(+), 19 deletions(-) diff --git a/drivers/iio/temperature/Kconfig b/drivers/iio/temperature/Kcon= fig index 1244d8e17d504ab23425f0c33f5f2d06dadba663..9328b2250aced6dffb2ea509280= dcd66ca772241 100644 --- a/drivers/iio/temperature/Kconfig +++ b/drivers/iio/temperature/Kconfig @@ -173,11 +173,13 @@ config MAX31865 will be called max31865. =20 config MCP9600 - tristate "MCP9600 thermocouple EMF converter" + tristate "MCP9600 and similar thermocouple EMF converters" depends on I2C help - If you say yes here you get support for MCP9600 - thermocouple EMF converter connected via I2C. + If you say yes here you get support for... + - MCP9600 + - MCP9601 + ...thermocouple EMF converters connected via I2C. =20 This driver can also be built as a module. If so, the module will be called mcp9600. diff --git a/drivers/iio/temperature/mcp9600.c b/drivers/iio/temperature/mc= p9600.c index 40906bb200ec92812a70c2dfb055793d94c7c060..51ed780ea72fa552884cf170def= 1450ce017b197 100644 --- a/drivers/iio/temperature/mcp9600.c +++ b/drivers/iio/temperature/mcp9600.c @@ -42,6 +42,7 @@ =20 /* MCP9600 device id value */ #define MCP9600_DEVICE_ID_MCP9600 0x40 +#define MCP9600_DEVICE_ID_MCP9601 0x41 =20 #define MCP9600_ALERT_COUNT 4 =20 @@ -82,6 +83,15 @@ static const struct iio_event_spec mcp9600_events[] =3D { }, }; =20 +struct mcp_chip_info { + u8 chip_id; + const char *chip_name; +}; + +struct mcp9600_data { + struct i2c_client *client; +}; + #define MCP9600_CHANNELS(hj_num_ev, hj_ev_spec_off, cj_num_ev, cj_ev_spec_= off) \ { \ { \ @@ -123,10 +133,6 @@ static const struct iio_chan_spec mcp9600_channels[][2= ] =3D { MCP9600_CHANNELS(2, 0, 2, 0), /* Alerts: 1 2 3 4 */ }; =20 -struct mcp9600_data { - struct i2c_client *client; -}; - static int mcp9600_read(struct mcp9600_data *data, struct iio_chan_spec const *chan, int *val) { @@ -416,18 +422,36 @@ static int mcp9600_probe_alerts(struct iio_dev *indio= _dev) =20 static int mcp9600_probe(struct i2c_client *client) { + struct device *dev =3D &client->dev; + const struct mcp_chip_info *chip_info; struct iio_dev *indio_dev; struct mcp9600_data *data; - int ret, ch_sel; + int ch_sel, dev_id; + + chip_info =3D i2c_get_match_data(client); + if (!chip_info) + return dev_err_probe(dev, -ENODEV, + "No chip-info found for device\n"); + + dev_id =3D i2c_smbus_read_byte_data(client, MCP9600_DEVICE_ID); + if (dev_id < 0) + return dev_err_probe(dev, dev_id, "Failed to read device ID\n"); + + switch (dev_id) { + case MCP9600_DEVICE_ID_MCP9600: + case MCP9600_DEVICE_ID_MCP9601: + if (dev_id !=3D chip_info->chip_id) + dev_warn(dev, + "Expected id %02x, but device responded with %02x\n", + chip_info->chip_id, dev_id); + break; =20 - ret =3D i2c_smbus_read_byte_data(client, MCP9600_DEVICE_ID); - if (ret < 0) - return dev_err_probe(&client->dev, ret, "Failed to read device ID\n"); - if (ret !=3D MCP9600_DEVICE_ID_MCP9600) - dev_warn(&client->dev, "Expected ID %x, got %x\n", - MCP9600_DEVICE_ID_MCP9600, ret); + default: + dev_warn(dev, "Unknown id %x, using %x\n", dev_id, + chip_info->chip_id); + } =20 - indio_dev =3D devm_iio_device_alloc(&client->dev, sizeof(*data)); + indio_dev =3D devm_iio_device_alloc(dev, sizeof(*data)); if (!indio_dev) return -ENOMEM; =20 @@ -439,22 +463,34 @@ static int mcp9600_probe(struct i2c_client *client) return ch_sel; =20 indio_dev->info =3D &mcp9600_info; - indio_dev->name =3D "mcp9600"; + indio_dev->name =3D chip_info->chip_name; indio_dev->modes =3D INDIO_DIRECT_MODE; indio_dev->channels =3D mcp9600_channels[ch_sel]; indio_dev->num_channels =3D ARRAY_SIZE(mcp9600_channels[ch_sel]); =20 - return devm_iio_device_register(&client->dev, indio_dev); + return devm_iio_device_register(dev, indio_dev); } =20 +static const struct mcp_chip_info mcp9600_chip_info =3D { + .chip_id =3D MCP9600_DEVICE_ID_MCP9600, + .chip_name =3D "mcp9600", +}; + +static const struct mcp_chip_info mcp9601_chip_info =3D { + .chip_id =3D MCP9600_DEVICE_ID_MCP9601, + .chip_name =3D "mcp9601", +}; + static const struct i2c_device_id mcp9600_id[] =3D { - { "mcp9600" }, + { "mcp9600", .driver_data =3D (kernel_ulong_t)&mcp9600_chip_info }, + { "mcp9601", .driver_data =3D (kernel_ulong_t)&mcp9601_chip_info }, { } }; MODULE_DEVICE_TABLE(i2c, mcp9600_id); =20 static const struct of_device_id mcp9600_of_match[] =3D { - { .compatible =3D "microchip,mcp9600" }, + { .compatible =3D "microchip,mcp9600", .data =3D &mcp9600_chip_info }, + { .compatible =3D "microchip,mcp9601", .data =3D &mcp9601_chip_info }, { } }; MODULE_DEVICE_TABLE(of, mcp9600_of_match); --=20 2.39.5 From nobody Fri Oct 3 23:02:08 2025 Received: from out-178.mta1.migadu.com (out-178.mta1.migadu.com [95.215.58.178]) (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 71F4E3043C2; Fri, 22 Aug 2025 13:24:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755869061; cv=none; b=jzCK+TrQ4b05tso+Cq/5A3W/vERKM510JC3yND0rUP7EFdtW/lNXequPHWGkgSyhh80B9TblwYN0M+Xg9DvMsKHFfUDeWFNqJIxuqBOodPHvCTsvZSTU0rWdPJ3DX+VB6NbQSmq86D1wuSQ+FjdyQpBor7EiQRWMCGSmdD0X2nY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755869061; c=relaxed/simple; bh=K3dvV3hHtVq2GH4RACTwrXN89G9DUiZyDBzsjhUIZvY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nHYNa8xCisqslBmkZ9tY+2ZM+x8XdUncUD0sQ9/TJ8TCPkgQTCqaYEHxgOk6jCH1D2fEQwmVAYPi4Mlr8g5sgnLxFe4noR//PkdT8Q46aCSr3wn9hov4OGe/slEZy67gcVUmNuZWxmCZj9XK39uURMWIO8lePsm8w7cwPNRX5TE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=watter.com; spf=pass smtp.mailfrom=linux.dev; arc=none smtp.client-ip=95.215.58.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=watter.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Ben Collins Date: Fri, 22 Aug 2025 09:23:54 -0400 Subject: [PATCH v8 5/5] iio: mcp9600: Add support for thermocouple-type 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: <20250822-upstream-changes-v8-5-40bb1739e3e2@watter.com> References: <20250822-upstream-changes-v8-0-40bb1739e3e2@watter.com> In-Reply-To: <20250822-upstream-changes-v8-0-40bb1739e3e2@watter.com> To: Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andrew Hepp Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Collins X-Migadu-Flow: FLOW_OUT dt-bindings documentation for this driver claims to support thermocouple-type, but the driver does not actually make use of the property. Implement usage of the property to configure the chip for the selected thermocouple-type. Signed-off-by: Ben Collins Reviewed-by: David Lechner --- drivers/iio/temperature/mcp9600.c | 71 +++++++++++++++++++++++++++++++++++= +++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/drivers/iio/temperature/mcp9600.c b/drivers/iio/temperature/mc= p9600.c index 51ed780ea72fa552884cf170def1450ce017b197..aa42c2b1a369edbd36e0d6d6d17= 38ed0069fd990 100644 --- a/drivers/iio/temperature/mcp9600.c +++ b/drivers/iio/temperature/mcp9600.c @@ -22,11 +22,15 @@ #include #include =20 +#include + /* MCP9600 registers */ #define MCP9600_HOT_JUNCTION 0x00 #define MCP9600_COLD_JUNCTION 0x02 #define MCP9600_STATUS 0x04 #define MCP9600_STATUS_ALERT(x) BIT(x) +#define MCP9600_SENSOR_CFG 0x05 +#define MCP9600_SENSOR_TYPE_MASK GENMASK(6, 4) #define MCP9600_ALERT_CFG1 0x08 #define MCP9600_ALERT_CFG(x) (MCP9600_ALERT_CFG1 + (x - 1)) #define MCP9600_ALERT_CFG_ENABLE BIT(0) @@ -66,6 +70,30 @@ static const char * const mcp9600_alert_name[MCP9600_ALE= RT_COUNT] =3D { [MCP9600_ALERT4] =3D "alert4", }; =20 +/* Map between dt-bindings enum and the chip's type value */ +static const unsigned int mcp9600_type_map[] =3D { + [THERMOCOUPLE_TYPE_K] =3D 0, + [THERMOCOUPLE_TYPE_J] =3D 1, + [THERMOCOUPLE_TYPE_T] =3D 2, + [THERMOCOUPLE_TYPE_N] =3D 3, + [THERMOCOUPLE_TYPE_S] =3D 4, + [THERMOCOUPLE_TYPE_E] =3D 5, + [THERMOCOUPLE_TYPE_B] =3D 6, + [THERMOCOUPLE_TYPE_R] =3D 7, +}; + +/* Map thermocouple type to a char for iio info in sysfs */ +static const int mcp9600_tc_types[] =3D { + [THERMOCOUPLE_TYPE_K] =3D 'K', + [THERMOCOUPLE_TYPE_J] =3D 'J', + [THERMOCOUPLE_TYPE_T] =3D 'T', + [THERMOCOUPLE_TYPE_N] =3D 'N', + [THERMOCOUPLE_TYPE_S] =3D 'S', + [THERMOCOUPLE_TYPE_E] =3D 'E', + [THERMOCOUPLE_TYPE_B] =3D 'B', + [THERMOCOUPLE_TYPE_R] =3D 'R', +}; + static const struct iio_event_spec mcp9600_events[] =3D { { .type =3D IIO_EV_TYPE_THRESH, @@ -90,14 +118,34 @@ struct mcp_chip_info { =20 struct mcp9600_data { struct i2c_client *client; + u32 thermocouple_type; }; =20 +static int mcp9600_config(struct mcp9600_data *data) +{ + struct i2c_client *client =3D data->client; + int ret; + u8 cfg; + + cfg =3D FIELD_PREP(MCP9600_SENSOR_TYPE_MASK, + mcp9600_type_map[data->thermocouple_type]); + + ret =3D i2c_smbus_write_byte_data(client, MCP9600_SENSOR_CFG, cfg); + if (ret < 0) { + dev_err(&client->dev, "Failed to set sensor configuration\n"); + return ret; + } + + return 0; +} + #define MCP9600_CHANNELS(hj_num_ev, hj_ev_spec_off, cj_num_ev, cj_ev_spec_= off) \ { \ { \ .type =3D IIO_TEMP, \ .address =3D MCP9600_HOT_JUNCTION, \ .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_THERMOCOUPLE_TYPE) | \ BIT(IIO_CHAN_INFO_SCALE), \ .event_spec =3D &mcp9600_events[hj_ev_spec_off], \ .num_event_specs =3D hj_num_ev, \ @@ -165,6 +213,9 @@ static int mcp9600_read_raw(struct iio_dev *indio_dev, *val =3D 62; *val2 =3D 500000; return IIO_VAL_INT_PLUS_MICRO; + case IIO_CHAN_INFO_THERMOCOUPLE_TYPE: + *val =3D mcp9600_tc_types[data->thermocouple_type]; + return IIO_VAL_CHAR; default: return -EINVAL; } @@ -426,7 +477,7 @@ static int mcp9600_probe(struct i2c_client *client) const struct mcp_chip_info *chip_info; struct iio_dev *indio_dev; struct mcp9600_data *data; - int ch_sel, dev_id; + int ch_sel, dev_id, ret; =20 chip_info =3D i2c_get_match_data(client); if (!chip_info) @@ -458,6 +509,24 @@ static int mcp9600_probe(struct i2c_client *client) data =3D iio_priv(indio_dev); data->client =3D client; =20 + /* Accept type from dt with default of Type-K. */ + data->thermocouple_type =3D THERMOCOUPLE_TYPE_K; + ret =3D device_property_read_u32(dev, "thermocouple-type", + &data->thermocouple_type); + if (ret && ret !=3D -EINVAL) + return dev_err_probe(dev, ret, + "Error reading thermocouple-type property\n"); + + if (data->thermocouple_type >=3D ARRAY_SIZE(mcp9600_type_map)) + return dev_err_probe(dev, -EINVAL, + "Invalid thermocouple-type property %u.\n", + data->thermocouple_type); + + /* Set initial config. */ + ret =3D mcp9600_config(data); + if (ret) + return ret; + ch_sel =3D mcp9600_probe_alerts(indio_dev); if (ch_sel < 0) return ch_sel; --=20 2.39.5