dt-bindings: tcan4x5x: Make wake-gpio an optional gpio
Subsystems (3)
PATCH 1/2 dt-bindings: tcan4x5x: Make wake-gpio an optional gpio
The wake-up of the device can be configured as an optional feature of the device. Move the wake-up gpio from a requried property to an optional property.
--- Documentation/devicetree/bindings/net/can/tcan4x5x.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/net/can/tcan4x5x.txt +1 -1
@@ -10,7 +10,6 @@ Required properties: - #size-cells: 0 - spi-max-frequency: Maximum frequency of the SPI bus the chip can operate at should be less than or equal to 18 MHz. - - device-wake-gpios: Wake up GPIO to wake up the TCAN device. - interrupt-parent: the phandle to the interrupt controller which provides the interrupt. - interrupts: interrupt specification for data-ready.
@@ -23,6 +22,7 @@ Optional properties: reset. - device-state-gpios: Input GPIO that indicates if the device is in a sleep state or if the device is active. + - device-wake-gpios: Wake up GPIO to wake up the TCAN device. Example: tcan4x5x: tcan4x5x@0 {
Signature · 1 line
2.23.0
PATCH 2/2 net: m_can: Make wake-up gpio an optional
The device has the ability to disable the wake-up pin option. The wake-up pin can be either force to GND or Vsup and does not have to be tied to a GPIO. In order for the device to not use the wake-up feature write the register to disable the WAKE_CONFIG option.
--- drivers/net/can/m_can/tcan4x5x.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
drivers/net/can/m_can/tcan4x5x.c +19 -6
@@ -101,6 +101,8 @@#define TCAN4X5X_MODE_STANDBY BIT(6)#define TCAN4X5X_MODE_NORMAL BIT(7) +#define TCAN4X5X_DISABLE_WAKE_MSK (BIT(31) | BIT(30)) +#define TCAN4X5X_SW_RESET BIT(2)#define TCAN4X5X_MCAN_CONFIGURED BIT(5)
@@ -338,6 +340,15 @@ static int tcan4x5x_init(struct m_can_classdev *cdev)return ret; } +static int tcan4x5x_disable_wake (struct m_can_classdev *cdev) +{ +struct tcan4x5x_priv *tcan4x5x = cdev->device_data; + +return regmap_update_bits (tcan4x5x->regmap,TCAN4X5X_CONFIG , +TCAN4X5X_DISABLE_WAKE_MSK ,0x00 ); + +} +static int tcan4x5x_parse_config (struct m_can_classdev *cdev) {struct tcan4x5x_priv *tcan4x5x = cdev->device_data;
@@ -345,8 +356,10 @@ static int tcan4x5x_parse_config(struct m_can_classdev *cdev) tcan4x5x->device_wake_gpio =devm_gpiod_get (cdev->dev,"device-wake" ,GPIOD_OUT_HIGH );if (IS_ERR (tcan4x5x->device_wake_gpio)) { -dev_err (cdev->dev,"device-wake gpio not defined\n" ); -return -EINVAL ; +if (PTR_ERR (tcan4x5x->power) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + +tcan4x5x_disable_wake (cdev); } tcan4x5x->reset_gpio = devm_gpiod_get_optional(cdev->dev, "reset",
@@ -428,10 +441,6 @@ static int tcan4x5x_can_probe(struct spi_device *spi)spi_set_drvdata (spi, priv); - ret =tcan4x5x_parse_config (mcan_class); -if (ret) - goto out_clk; -/* Configure the SPI bus */ spi->bits_per_word =32 ; ret =spi_setup (spi);
@@ -441,6 +450,10 @@ static int tcan4x5x_can_probe(struct spi_device *spi) priv->regmap =devm_regmap_init (&spi->dev, &tcan4x5x_bus, &spi->dev, &tcan4x5x_regmap); + ret =tcan4x5x_parse_config (mcan_class); +if (ret) + goto out_clk; +tcan4x5x_power_enable (priv->power,1 ); ret =m_can_class_register (mcan_class);
Signature · 1 line
2.23.0
Re: [PATCH 2/2] net: m_can: Make wake-up gpio an optional
Quoted 7 lines · Dan Murphy
The device has the ability to disable the wake-up pin option. The wake-up pin can be either force to GND or Vsup and does not have to be tied to a GPIO. In order for the device to not use the wake-up feature write the register to disable the
WAKE_CONFIGoption.Signed-off-by Dan Murphy <[email protected]>CC Sean Nyekjaer <[email protected]>
Quoted 1 line
---
Hi Dan,
I would add tcan4x5x to the subject of this patch -> "net: m_can: tcan4x5x Make wake-up gpio an optional"
Will be testing this during this or the next week...
/Sean
Re: [PATCH 2/2] net: m_can: Make wake-up gpio an optional
Marc
Quoted 10 lines · Sean Nyekjaer
Quoted 7 lines · Dan Murphy
The device has the ability to disable the wake-up pin option. The wake-up pin can be either force to GND or Vsup and does not have to be tied to a GPIO. In order for the device to not use the wake-up feature write the register to disable the
WAKE_CONFIGoption.Signed-off-by Dan Murphy <[email protected]>CC Sean Nyekjaer <[email protected]>
Quoted 9 lines
Reviewed-by Sean Nyekjaer <[email protected]>Quoted 1 line
---
Hi Dan,
I would add tcan4x5x to the subject of this patch -> "net:
m_can: tcan4x5x Make wake-up gpio an optional"
Do you want me to submit v2 with the $subject change?
Or would you fix it up when committing it?
Dan
Marc Kleine-Budde
maintainerRe: [PATCH 2/2] net: m_can: Make wake-up gpio an optional
Quoted 16 lines · Dan Murphy
Quoted 15 lines · Sean Nyekjaer
Quoted 8 lines · Dan Murphy
The device has the ability to disable the wake-up pin option. The wake-up pin can be either force to GND or Vsup and does not have to be tied to a GPIO. In order for the device to not use the wake-up feature
write the register to disable theWAKE_CONFIGoption.Signed-off-by Dan Murphy <[email protected]>CC Sean Nyekjaer <[email protected]>Reviewed-by Sean Nyekjaer <[email protected]>Quoted 1 line
---
Quoted 8 lines
Quoted 5 lines
Hi Dan,
I would add tcan4x5x to the subject of this patch -> "net:
m_can: tcan4x5x Make wake-up gpio an optional"Do you want me to submit v2 with the $subject change?
Or would you fix it up when committing it?
I'll change the subject while applying.
Dan, what about maintainerchip of the tcan4x5?
regards,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH 2/2] net: m_can: Make wake-up gpio an optional
Marc
Quoted 20 lines · Marc Kleine-Budde
Quoted 19 lines · Dan Murphy
Quoted 18 lines · Sean Nyekjaer
Quoted 8 lines · Dan Murphy
The device has the ability to disable the wake-up pin option. The wake-up pin can be either force to GND or Vsup and does not have to be tied to a GPIO. In order for the device to not use the wake-up feature
write the register to disable theWAKE_CONFIGoption.Signed-off-by Dan Murphy <[email protected]>CC Sean Nyekjaer <[email protected]>Reviewed-by Sean Nyekjaer <[email protected]>Quoted 1 line
---
Hi Dan,
I would add tcan4x5x to the subject of this patch -> "net:
m_can: tcan4x5x Make wake-up gpio an optional"
Quoted 6 lines
Quoted 3 lines
Do you want me to submit v2 with the $subject change?
Or would you fix it up when committing it?
I'll change the subject while applying.
Dan, what about maintainerchip of the tcan4x5?
Ooops that was buried in my inbox.
It only makes sense for someone from TI to take maintainership of the TCAN device.
Do I need to submit a patch to the maintainers file or is the authorship enough?
As far as a device what country do you reside in?
Dan
Quoted 3 lines
regards,
Marc
Marc Kleine-Budde
maintainerRe: [PATCH 2/2] net: m_can: Make wake-up gpio an optional
Quoted 6 lines · Dan Murphy
Quoted 1 line
Dan, what about maintainerchip of the tcan4x5?
Ooops that was buried in my inbox.
It only makes sense for someone from TI to take maintainership of the TCAN device.
Sriram Dash (Cc'ed) is maintainer of the MMIO driver:
Review
Quoted 4 lines
(quoted diff) +4
-0+F: Documentation/devicetree/bindings/net/can/m_can.txt +F: drivers/net/can/m_can/m_can.c +F: drivers/net/can/m_can/m_can.h +F: drivers/net/can/m_can/m_can_platform.c
See:
Quoted 2 lines
Do I need to submit a patch to the maintainers file or is the authorship enough?
Yes, please send a patch, see Sriram's patch as an example:
Quoted 3 lines
As far as a device what country do you reside in?
Germany, I'll drop you the address in a private Mail.
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH 2/2] net: m_can: Make wake-up gpio an optional
In reply to Marc Kleine-BuddeMarc
Quoted 20 lines · Marc Kleine-Budde
Quoted 19 lines · Dan Murphy
Quoted 18 lines · Sean Nyekjaer
Quoted 8 lines · Dan Murphy
The device has the ability to disable the wake-up pin option. The wake-up pin can be either force to GND or Vsup and does not have to be tied to a GPIO. In order for the device to not use the wake-up feature
write the register to disable theWAKE_CONFIGoption.Signed-off-by Dan Murphy <[email protected]>CC Sean Nyekjaer <[email protected]>Reviewed-by Sean Nyekjaer <[email protected]>Quoted 1 line
---
Hi Dan,
I would add tcan4x5x to the subject of this patch -> "net:
m_can: tcan4x5x Make wake-up gpio an optional"
Quoted 6 lines
Quoted 3 lines
Do you want me to submit v2 with the $subject change?
Or would you fix it up when committing it?
I'll change the subject while applying.
Dan, what about maintainerchip of the tcan4x5?
Do you know when you will be applying these?
I have 2 patches I need to put on top.
Dan
Quoted 3 lines
regards,
Marc
Marc Kleine-Budde
maintainerRe: [PATCH 2/2] net: m_can: Make wake-up gpio an optional
Quoted 11 lines · Dan Murphy
Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
I would add tcan4x5x to the subject of this patch -> "net:
m_can: tcan4x5x Make wake-up gpio an optional"Do you want me to submit v2 with the $subject change?
Or would you fix it up when committing it?
I'll change the subject while applying.
Dan, what about maintainerchip of the tcan4x5?
Do you know when you will be applying these?
The patch is already upstream. See linux-can/mater:
https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git/log/
Quoted 1 line
I have 2 patches I need to put on top.
Please post them as linux-can/master as base.
regards,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH 2/2] net: m_can: Make wake-up gpio an optional
Marc
Quoted 9 lines · Marc Kleine-Budde
Quoted 8 lines · Dan Murphy
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
I would add tcan4x5x to the subject of this patch -> "net:
m_can: tcan4x5x Make wake-up gpio an optional"Do you want me to submit v2 with the $subject change?
Or would you fix it up when committing it?
I'll change the subject while applying.
Quoted 7 lines
Quoted 2 lines
Quoted 1 line
Dan, what about maintainerchip of the tcan4x5?
Do you know when you will be applying these?
The patch is already upstream. See linux-can/mater:
https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git/log/
Ah I was looking here
https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
Quoted 1 line
Marc Kleine-Budde
maintainerRe: [PATCH 2/2] net: m_can: Make wake-up gpio an optional
Quoted 10 lines · Dan Murphy
Quoted 6 lines
Quoted 1 line
Do you know when you will be applying these?
The patch is already upstream. See linux-can/mater:
https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git/log/
Ah I was looking here
https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
Bugfixes go to linux-can. New features to linux-can-next.
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Quoted 6 lines · Dan Murphy
The wake-up of the device can be configured as an optional feature of the device. Move the wake-up gpio from a requried property to an optional property.
Signed-off-by Dan Murphy <[email protected]>CC Rob Herring <[email protected]>
Quoted 25 lines
--- Documentation/devicetree/bindings/net/can/tcan4x5x.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Documentation/devicetree/bindings/net/can/tcan4x5x.txt +1
-1@@ -10,7 +10,6 @@ Required properties: - #size-cells: 0 - spi-max-frequency: Maximum frequency of the SPI bus the chip can operate at should be less than or equal to 18 MHz. - - device-wake-gpios: Wake up GPIO to wake up the TCAN device. - interrupt-parent: the phandle to the interrupt controller which provides the interrupt. - interrupts: interrupt specification for data-ready.@@ -23,6 +22,7 @@ Optional properties: reset. - device-state-gpios: Input GPIO that indicates if the device is in a sleep state or if the device is active. + - device-wake-gpios: Wake up GPIO to wake up the TCAN device. Example: tcan4x5x: tcan4x5x@0 {
Sean Nyekjaer
Tested-byQuoted 10 lines · Sean Nyekjaer
Quoted 6 lines · Dan Murphy
The wake-up of the device can be configured as an optional feature of the device. Move the wake-up gpio from a requried property to an optional property.
Signed-off-by Dan Murphy <[email protected]>CC Rob Herring <[email protected]>Reviewed-by Sean Nyekjaer <[email protected]>
Quoted 24 lines
Quoted 24 lines
---
Documentation/devicetree/bindings/net/can/tcan4x5x.txt| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)Documentation/devicetree/bindings/net/can/tcan4x5x.txt +0
-0@@ -10,7 +10,6 @@ Required properties:- #size-cells: 0
- spi-max-frequency: Maximum frequency of the SPI bus the chip can operate at should be less than or equal to 18 MHz. - - device-wake-gpios: Wake up GPIO to wake up the TCAN device.
- interrupt-parent: the phandle to the interrupt controller which provides the interrupt.
- interrupts: interrupt specification for data-ready.Documentation/devicetree/bindings/net/can/tcan4x5x.txt +0
-0@@ -23,6 +22,7 @@ Optional properties:reset.
- device-state-gpios: Input GPIO that indicates if the device is in a sleep state or if the device is active. + - device-wake-gpios: Wake up GPIO to wake up the TCAN device. Example:
tcan4x5x: tcan4x5x@0 {
Quoted 6 lines · Dan Murphy
The wake-up of the device can be configured as an optional feature of the device. Move the wake-up gpio from a requried property to an optional property.
Signed-off-by Dan Murphy <[email protected]>CC Rob Herring <[email protected]>
Quoted 25 lines
--- Documentation/devicetree/bindings/net/can/tcan4x5x.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Documentation/devicetree/bindings/net/can/tcan4x5x.txt +1
-1@@ -10,7 +10,6 @@ Required properties: - #size-cells: 0 - spi-max-frequency: Maximum frequency of the SPI bus the chip can operate at should be less than or equal to 18 MHz. - - device-wake-gpios: Wake up GPIO to wake up the TCAN device. - interrupt-parent: the phandle to the interrupt controller which provides the interrupt. - interrupts: interrupt specification for data-ready.@@ -23,6 +22,7 @@ Optional properties: reset. - device-state-gpios: Input GPIO that indicates if the device is in a sleep state or if the device is active. + - device-wake-gpios: Wake up GPIO to wake up the TCAN device. Example: tcan4x5x: tcan4x5x@0 {