From patchwork Mon Nov 11 08:54:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Nyekjaer X-Patchwork-Id: 13870422 X-Patchwork-Delegate: kuba@kernel.org Received: from www530.your-server.de (www530.your-server.de [188.40.30.78]) (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 6485A15B115; Mon, 11 Nov 2024 08:55:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=188.40.30.78 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731315324; cv=none; b=tpKaZ8cxIwmnD0mZjTdYMB+W334g1cGwh7c4QL6C1kPoQNlhcpVntQsZ+wRBJj83cpZrj5XGEwTVbjmeTvhZex73Q5S4RMEwGU3JRtPVbfrvaQAHnVrUNT1LR4KLFk/kwjT8hTvWsMVPvubsskgXOWL//bzpq2KluVU9wqCRB4E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731315324; c=relaxed/simple; bh=P8aq+HrtTPGRe6NulJzZWkkCydI6pkQrnnOE2fEBAWI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mi0hmor2U1ZfHjqk84AwojMVa3JSCR6ZKYi0yqIKdmAVbjt9GZ+Qs/Qhdt57Uq0RhtYJRJO7f8Kbbwx99vgAHSfUsCmE1d2xxynTZE6F1nS+ma0xVNpiUWJApdgBefj9zHC1OIx5n1DDL7/lrD7mUgKVXhhuzm7aPJ2gCatCaVM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=geanix.com; spf=pass smtp.mailfrom=geanix.com; dkim=pass (2048-bit key) header.d=geanix.com header.i=@geanix.com header.b=ouDArh71; arc=none smtp.client-ip=188.40.30.78 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=geanix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=geanix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=geanix.com header.i=@geanix.com header.b="ouDArh71" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=geanix.com; s=default2211; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID; bh=hInpEUHJpNi2swX8P3rneq+VBn2Cer+loje2Tu7kAPA=; b=ouDArh71QLaFUl1ssHJ/lEOkOT ki4KV+Ajty6lR70ToiqQOGt6OikOTzWz2SYde0tUAtr3xIX/5Fp8+g/DqX98SM2I7NNeos3mFyl7B vK9PNrUy28wl9/DzWxUz90Uo7iQMl5PbUwI11mZWNLVT6Ak1LL4eSVBaorP4Ez3QiJUY4b/jsAHt/ OJGzADWpJ4tMy/fBZhRFaM/EVerYguQ8QWKWBuVeUxDHoc/9YHn5gjRCTA54UY09Sj3NH8uptCRLM oIM7NPMB6lfraB119NHyCvaqLahD8RBTQl3hGYtZ4/RH6eo6Hi1zPG78dCdY0CYdhAMOSuZOvk9mF BEU8Nekg==; Received: from sslproxy01.your-server.de ([78.46.139.224]) by www530.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1tAQCV-0005w5-Qz; Mon, 11 Nov 2024 09:55:11 +0100 Received: from [185.17.218.86] (helo=zen.localdomain) by sslproxy01.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tAQCV-000LxI-09; Mon, 11 Nov 2024 09:55:11 +0100 From: Sean Nyekjaer Date: Mon, 11 Nov 2024 09:54:49 +0100 Subject: [PATCH v2 1/2] can: tcan4x5x: add option for selecting nWKRQ voltage Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241111-tcan-wkrqv-v2-1-9763519b5252@geanix.com> References: <20241111-tcan-wkrqv-v2-0-9763519b5252@geanix.com> In-Reply-To: <20241111-tcan-wkrqv-v2-0-9763519b5252@geanix.com> To: Marc Kleine-Budde , Vincent Mailhol , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sean Nyekjaer X-Mailer: b4 0.14.2 X-Authenticated-Sender: sean@geanix.com X-Virus-Scanned: Clear (ClamAV 0.103.10/27454/Sun Nov 10 10:45:07 2024) X-Patchwork-Delegate: kuba@kernel.org nWKRQ supports an output voltage of either the internal reference voltage (3.6V) or the reference voltage of the digital interface 0 - 6V. Add the devicetree option ti,nwkrq-voltage-sel to be able to select between them. Default is kept as the internal reference voltage. Signed-off-by: Sean Nyekjaer --- drivers/net/can/m_can/tcan4x5x-core.c | 35 +++++++++++++++++++++++++++++++++++ drivers/net/can/m_can/tcan4x5x.h | 2 ++ 2 files changed, 37 insertions(+) diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c index 2f73bf3abad889c222f15c39a3d43de1a1cf5fbb..264bba830be50033347056da994102f8b614e51b 100644 --- a/drivers/net/can/m_can/tcan4x5x-core.c +++ b/drivers/net/can/m_can/tcan4x5x-core.c @@ -92,6 +92,8 @@ #define TCAN4X5X_MODE_STANDBY BIT(6) #define TCAN4X5X_MODE_NORMAL BIT(7) +#define TCAN4X5X_NWKRQ_VOLTAGE_MASK BIT(19) + #define TCAN4X5X_DISABLE_WAKE_MSK (BIT(31) | BIT(30)) #define TCAN4X5X_DISABLE_INH_MSK BIT(9) @@ -267,6 +269,11 @@ static int tcan4x5x_init(struct m_can_classdev *cdev) if (ret) return ret; + ret = regmap_update_bits(tcan4x5x->regmap, TCAN4X5X_CONFIG, + TCAN4X5X_NWKRQ_VOLTAGE_MASK, tcan4x5x->nwkrq_voltage); + if (ret) + return ret; + return ret; } @@ -318,6 +325,28 @@ static const struct tcan4x5x_version_info return &tcan4x5x_versions[TCAN4X5X]; } +static int tcan4x5x_get_dt_data(struct m_can_classdev *cdev) +{ + struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev); + struct device_node *np = cdev->dev->of_node; + u8 prop; + int ret; + + ret = of_property_read_u8(np, "ti,nwkrq-voltage-sel", &prop); + if (!ret) { + if (prop <= 1) + tcan4x5x->nwkrq_voltage = prop; + else + dev_warn(cdev->dev, + "nwkrq-voltage-sel have invalid option: %u\n", + prop); + } else { + tcan4x5x->nwkrq_voltage = 0; + } + + return 0; +} + static int tcan4x5x_get_gpios(struct m_can_classdev *cdev, const struct tcan4x5x_version_info *version_info) { @@ -453,6 +482,12 @@ static int tcan4x5x_can_probe(struct spi_device *spi) goto out_power; } + ret = tcan4x5x_get_dt_data(mcan_class); + if (ret) { + dev_err(&spi->dev, "Getting dt data failed %pe\n", ERR_PTR(ret)); + goto out_power; + } + tcan4x5x_check_wake(priv); ret = tcan4x5x_write_tcan_reg(mcan_class, TCAN4X5X_INT_EN, 0); diff --git a/drivers/net/can/m_can/tcan4x5x.h b/drivers/net/can/m_can/tcan4x5x.h index e62c030d3e1e5a713c997e7c8ecad4a44aff4e6a..04ebe5c64f4f7056a62e72e717cb85dd3817ab9c 100644 --- a/drivers/net/can/m_can/tcan4x5x.h +++ b/drivers/net/can/m_can/tcan4x5x.h @@ -42,6 +42,8 @@ struct tcan4x5x_priv { struct tcan4x5x_map_buf map_buf_rx; struct tcan4x5x_map_buf map_buf_tx; + + u8 nwkrq_voltage; }; static inline void From patchwork Mon Nov 11 08:54:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Nyekjaer X-Patchwork-Id: 13870423 X-Patchwork-Delegate: kuba@kernel.org Received: from www530.your-server.de (www530.your-server.de [188.40.30.78]) (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 671AC16A92D; Mon, 11 Nov 2024 08:55:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=188.40.30.78 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731315324; cv=none; b=BCWF3K5n9JgG38BH28ZSidxzHVTjId0XUHdmYKqaIIcwE8VqhidFm44ua8IfHMYwosUB9n+SEHP6NqFcFDcPMhaxILTGfF4wnl4lM9hRtlxL1NQdJhdOEGrM7Ad5o8twK4EKNDAM/IfIzRyvNfIyqmM/YO5ZkEh8bjtfacHj7aA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731315324; c=relaxed/simple; bh=okXkeaudfF6vxLWD7UajzsUYJHTBDszStlEsrOIBidk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oZlhPMFK0eCZQLlHnX+v2N5OGZaGHaU1y8jE3PibuOeZj1pgI2H3ey0GAvCJOx7SW/2ukEfwI2pGHnwtR0hiW6201N8cdxrbKA1WiNB66kJIfbl3YKUuwsXlwPwBaBHkQFySOyAp4MHBzQaryfdRbHEl0sjAAMr1SuzOiYd6skQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=geanix.com; spf=pass smtp.mailfrom=geanix.com; dkim=pass (2048-bit key) header.d=geanix.com header.i=@geanix.com header.b=HE5zLSal; arc=none smtp.client-ip=188.40.30.78 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=geanix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=geanix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=geanix.com header.i=@geanix.com header.b="HE5zLSal" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=geanix.com; s=default2211; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID; bh=tWeoJ2YH0hMM/bpEZuLYgNNrB0jkugiqWSczyaTdFrA=; b=HE5zLSal0mQpRQ74F8X8WmeaN9 KdGMTKrtTaJWZ2y6elbpKzNl3eIfuXY6F7VOsIqbZYmnauC/Xq2W6BeMlmlR9uWdtH2Y8KX91m9vZ J1Xy6vuJILbQdKaW497ikTFX1BtYuJMDflgYkw92l5pOrskgZ0bybkdc0f9AUGcUL7vi//7ILJY2Q LfqCh4rak4MyhZIzkoql+gfDpfbODyNtyhFCXtbRx6aX4U/VG8ou3/cVhkwk0J9hOXyfEhKty2V04 ZDzExQ5IgZzNFxEJ9Oz5uyyhnoeKikh4olGYuYq/DBtfXRbStaxliET9/LMMje/pGpSrV1AfRbiwp AnIw9B/Q==; Received: from sslproxy01.your-server.de ([78.46.139.224]) by www530.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1tAQCW-0005w8-3O; Mon, 11 Nov 2024 09:55:12 +0100 Received: from [185.17.218.86] (helo=zen.localdomain) by sslproxy01.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tAQCV-000LxI-13; Mon, 11 Nov 2024 09:55:11 +0100 From: Sean Nyekjaer Date: Mon, 11 Nov 2024 09:54:50 +0100 Subject: [PATCH v2 2/2] dt-bindings: can: tcan4x5x: Document the ti,nwkrq-voltage-sel option Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241111-tcan-wkrqv-v2-2-9763519b5252@geanix.com> References: <20241111-tcan-wkrqv-v2-0-9763519b5252@geanix.com> In-Reply-To: <20241111-tcan-wkrqv-v2-0-9763519b5252@geanix.com> To: Marc Kleine-Budde , Vincent Mailhol , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sean Nyekjaer X-Mailer: b4 0.14.2 X-Authenticated-Sender: sean@geanix.com X-Virus-Scanned: Clear (ClamAV 0.103.10/27454/Sun Nov 10 10:45:07 2024) X-Patchwork-Delegate: kuba@kernel.org nWKRQ supports an output voltage of either the internal reference voltage (3.6V) or the reference voltage of the digital interface 0 - 6V. Add the devicetree option ti,nwkrq-voltage-sel to be able to select between them. Signed-off-by: Sean Nyekjaer --- Documentation/devicetree/bindings/net/can/ti,tcan4x5x.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Documentation/devicetree/bindings/net/can/ti,tcan4x5x.yaml b/Documentation/devicetree/bindings/net/can/ti,tcan4x5x.yaml index f1d18a5461e05296998ae9bf09bdfa1226580131..a77c560868d689e92ded08b9deb43e5a2b89bf2b 100644 --- a/Documentation/devicetree/bindings/net/can/ti,tcan4x5x.yaml +++ b/Documentation/devicetree/bindings/net/can/ti,tcan4x5x.yaml @@ -106,6 +106,18 @@ properties: Must be half or less of "clocks" frequency. maximum: 18000000 + ti,nwkrq-voltage-sel: + $ref: /schemas/types.yaml#/definitions/uint8 + description: + nWKRQ Pin GPO buffer voltage rail configuration. + The option of this properties will tell which + voltage rail is used for the nWKRQ Pin. + oneOf: + - description: Internal voltage rail + const: 0 + - description: VIO voltage rail + const: 1 + wakeup-source: $ref: /schemas/types.yaml#/definitions/flag description: @@ -157,6 +169,7 @@ examples: device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; device-wake-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; reset-gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>; + ti,nwkrq-voltage-sel = /bits/ 8 <0>; wakeup-source; }; };