]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
can: tcan4x5x: add option for selecting nWKRQ voltage
authorSean Nyekjaer <sean@geanix.com>
Thu, 14 Nov 2024 09:14:50 +0000 (10:14 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 24 Jul 2025 06:56:31 +0000 (08:56 +0200)
[ Upstream commit 36131b72fb1c62bc61e86068618de304763b8ac7 ]

The nWKRQ pin supports an output voltage of either the internal reference
voltage (3.6V) or the reference voltage of
the digital interface 0-6V (VIO).
Add the devicetree option ti,nwkrq-voltage-vio to set it to VIO.

If this property is omitted the reset default, the internal reference
voltage, is used.

Signed-off-by: Sean Nyekjaer <sean@geanix.com>
Reviewed-by: Marc Kleine-Budde <mkl@pengutronix.de>
Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://patch.msgid.link/20241114-tcan-wkrqv-v5-2-a2d50833ed71@geanix.com
[mkl: remove unused variable in tcan4x5x_get_dt_data()]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Stable-dep-of: 0f97a7588db7 ("can: tcan4x5x: fix reset gpio usage during probe")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/can/m_can/tcan4x5x-core.c
drivers/net/can/m_can/tcan4x5x.h

index b6c5c8bab7390f092eaec6b66f0555bbfccd95e5..7062a2939f5018e3c7bf3028ec984f6a5c7c909d 100644 (file)
@@ -92,6 +92,8 @@
 #define TCAN4X5X_MODE_STANDBY BIT(6)
 #define TCAN4X5X_MODE_NORMAL BIT(7)
 
+#define TCAN4X5X_NWKRQ_VOLTAGE_VIO BIT(19)
+
 #define TCAN4X5X_DISABLE_WAKE_MSK      (BIT(31) | BIT(30))
 #define TCAN4X5X_DISABLE_INH_MSK       BIT(9)
 
@@ -267,6 +269,13 @@ static int tcan4x5x_init(struct m_can_classdev *cdev)
        if (ret)
                return ret;
 
+       if (tcan4x5x->nwkrq_voltage_vio) {
+               ret = regmap_set_bits(tcan4x5x->regmap, TCAN4X5X_CONFIG,
+                                     TCAN4X5X_NWKRQ_VOLTAGE_VIO);
+               if (ret)
+                       return ret;
+       }
+
        return ret;
 }
 
@@ -318,6 +327,14 @@ static const struct tcan4x5x_version_info
        return &tcan4x5x_versions[TCAN4X5X];
 }
 
+static void tcan4x5x_get_dt_data(struct m_can_classdev *cdev)
+{
+       struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev);
+
+       tcan4x5x->nwkrq_voltage_vio =
+               of_property_read_bool(cdev->dev->of_node, "ti,nwkrq-voltage-vio");
+}
+
 static int tcan4x5x_get_gpios(struct m_can_classdev *cdev,
                              const struct tcan4x5x_version_info *version_info)
 {
@@ -454,6 +471,8 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
                goto out_power;
        }
 
+       tcan4x5x_get_dt_data(mcan_class);
+
        tcan4x5x_check_wake(priv);
 
        ret = tcan4x5x_write_tcan_reg(mcan_class, TCAN4X5X_INT_EN, 0);
index e62c030d3e1e5a713c997e7c8ecad4a44aff4e6a..203399d5e8ccf3fd7a26b54d8356fca9d398524c 100644 (file)
@@ -42,6 +42,8 @@ struct tcan4x5x_priv {
 
        struct tcan4x5x_map_buf map_buf_rx;
        struct tcan4x5x_map_buf map_buf_tx;
+
+       bool nwkrq_voltage_vio;
 };
 
 static inline void