* [PATCH v5] can: m_can: Add support for transceiver as phy
@ 2021-07-24 17:40 Marc Kleine-Budde
2021-07-26 7:30 ` Aswath Govindraju
0 siblings, 1 reply; 3+ messages in thread
From: Marc Kleine-Budde @ 2021-07-24 17:40 UTC (permalink / raw)
To: linux-can; +Cc: Faiz Abbas, Aswath Govindraju, Marc Kleine-Budde
From: Faiz Abbas <faiz_abbas@ti.com>
Add support for implementing transceiver node as phy. The max_bitrate
is obtained by getting a phy attribute.
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Hello,
picking up Aswath Govindraju's work. This iteration adds missing error
handling in m_can_open() and m_can_plat_probe().
regards,
Marc
changes since v4:
- add missing error handling in m_can_open()
- remove error propagation in m_can_close()
- add missing error handling in m_can_plat_probe()
drivers/net/can/m_can/m_can.c | 11 ++++++++++-
drivers/net/can/m_can/m_can.h | 2 ++
drivers/net/can/m_can/m_can_platform.c | 13 +++++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 4a1cd955da14..0cffaad905c2 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -21,6 +21,7 @@
#include <linux/iopoll.h>
#include <linux/can/dev.h>
#include <linux/pinctrl/consumer.h>
+#include <linux/phy/phy.h>
#include "m_can.h"
@@ -1509,6 +1510,8 @@ static int m_can_close(struct net_device *dev)
close_candev(dev);
can_led_event(dev, CAN_LED_EVENT_STOP);
+ phy_power_off(cdev->transceiver);
+
return 0;
}
@@ -1694,10 +1697,14 @@ static int m_can_open(struct net_device *dev)
struct m_can_classdev *cdev = netdev_priv(dev);
int err;
- err = m_can_clk_start(cdev);
+ err = phy_power_on(cdev->transceiver);
if (err)
return err;
+ err = m_can_clk_start(cdev);
+ if (err)
+ goto out_phy_power_off;
+
/* open the can device */
err = open_candev(dev);
if (err) {
@@ -1754,6 +1761,8 @@ static int m_can_open(struct net_device *dev)
close_candev(dev);
exit_disable_clks:
m_can_clk_stop(cdev);
+out_phy_power_off:
+ phy_power_off(cdev->transceiver);
return err;
}
diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h
index ea53322d110e..56e994376a7b 100644
--- a/drivers/net/can/m_can/m_can.h
+++ b/drivers/net/can/m_can/m_can.h
@@ -28,6 +28,7 @@
#include <linux/iopoll.h>
#include <linux/can/dev.h>
#include <linux/pinctrl/consumer.h>
+#include <linux/phy/phy.h>
/* m_can lec values */
enum m_can_lec_type {
@@ -82,6 +83,7 @@ struct m_can_classdev {
struct workqueue_struct *tx_wq;
struct work_struct tx_work;
struct sk_buff *tx_skb;
+ struct phy *transceiver;
struct m_can_ops *ops;
diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c
index 9f8f69aec993..a28c84aa8fa8 100644
--- a/drivers/net/can/m_can/m_can_platform.c
+++ b/drivers/net/can/m_can/m_can_platform.c
@@ -6,6 +6,7 @@
// Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/
#include <linux/platform_device.h>
+#include <linux/phy/phy.h>
#include "m_can.h"
@@ -67,6 +68,7 @@ static int m_can_plat_probe(struct platform_device *pdev)
struct resource *res;
void __iomem *addr;
void __iomem *mram_addr;
+ struct phy *transceiver;
int irq, ret = 0;
mcan_class = m_can_class_allocate_dev(&pdev->dev,
@@ -100,6 +102,16 @@ static int m_can_plat_probe(struct platform_device *pdev)
goto probe_fail;
}
+ transceiver = devm_phy_optional_get(&pdev->dev, NULL);
+ if (IS_ERR(transceiver)) {
+ ret = PTR_ERR(transceiver);
+ dev_err_probe(&pdev->dev, ret, "failed to get phy\n");
+ goto probe_fail;
+ }
+
+ if (transceiver)
+ mcan_class->can.bitrate_max = transceiver->attrs.max_link_rate;
+
priv->base = addr;
priv->mram_base = mram_addr;
@@ -107,6 +119,7 @@ static int m_can_plat_probe(struct platform_device *pdev)
mcan_class->pm_clock_support = 1;
mcan_class->can.clock.freq = clk_get_rate(mcan_class->cclk);
mcan_class->dev = &pdev->dev;
+ mcan_class->transceiver = transceiver;
mcan_class->ops = &m_can_plat_ops;
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v5] can: m_can: Add support for transceiver as phy
2021-07-24 17:40 [PATCH v5] can: m_can: Add support for transceiver as phy Marc Kleine-Budde
@ 2021-07-26 7:30 ` Aswath Govindraju
2021-07-26 7:38 ` Marc Kleine-Budde
0 siblings, 1 reply; 3+ messages in thread
From: Aswath Govindraju @ 2021-07-26 7:30 UTC (permalink / raw)
To: Marc Kleine-Budde, linux-can; +Cc: Faiz Abbas
Hi Marc,
On 24/07/21 11:10 pm, Marc Kleine-Budde wrote:
> From: Faiz Abbas <faiz_abbas@ti.com>
>
> Add support for implementing transceiver node as phy. The max_bitrate
> is obtained by getting a phy attribute.
>
> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
> Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>> ---
> Hello,
>
> picking up Aswath Govindraju's work. This iteration adds missing error
> handling in m_can_open() and m_can_plat_probe().
>
Thank you for posting the respin.
May I know what is the base branch for this patch ? I tried applying it
on top of linux-next/master but I am getting errors.
Thanks,
Aswath
> regards,
> Marc
>
> changes since v4:
> - add missing error handling in m_can_open()
> - remove error propagation in m_can_close()
> - add missing error handling in m_can_plat_probe()
>
> drivers/net/can/m_can/m_can.c | 11 ++++++++++-
> drivers/net/can/m_can/m_can.h | 2 ++
> drivers/net/can/m_can/m_can_platform.c | 13 +++++++++++++
> 3 files changed, 25 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
> index 4a1cd955da14..0cffaad905c2 100644
> --- a/drivers/net/can/m_can/m_can.c
> +++ b/drivers/net/can/m_can/m_can.c
> @@ -21,6 +21,7 @@
> #include <linux/iopoll.h>
> #include <linux/can/dev.h>
> #include <linux/pinctrl/consumer.h>
> +#include <linux/phy/phy.h>
>
> #include "m_can.h"
>
> @@ -1509,6 +1510,8 @@ static int m_can_close(struct net_device *dev)
> close_candev(dev);
> can_led_event(dev, CAN_LED_EVENT_STOP);
>
> + phy_power_off(cdev->transceiver);
> +
> return 0;
> }
>
> @@ -1694,10 +1697,14 @@ static int m_can_open(struct net_device *dev)
> struct m_can_classdev *cdev = netdev_priv(dev);
> int err;
>
> - err = m_can_clk_start(cdev);
> + err = phy_power_on(cdev->transceiver);
> if (err)
> return err;
>
> + err = m_can_clk_start(cdev);
> + if (err)
> + goto out_phy_power_off;
> +
> /* open the can device */
> err = open_candev(dev);
> if (err) {
> @@ -1754,6 +1761,8 @@ static int m_can_open(struct net_device *dev)
> close_candev(dev);
> exit_disable_clks:
> m_can_clk_stop(cdev);
> +out_phy_power_off:
> + phy_power_off(cdev->transceiver);
> return err;
> }
>
> diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h
> index ea53322d110e..56e994376a7b 100644
> --- a/drivers/net/can/m_can/m_can.h
> +++ b/drivers/net/can/m_can/m_can.h
> @@ -28,6 +28,7 @@
> #include <linux/iopoll.h>
> #include <linux/can/dev.h>
> #include <linux/pinctrl/consumer.h>
> +#include <linux/phy/phy.h>
>
> /* m_can lec values */
> enum m_can_lec_type {
> @@ -82,6 +83,7 @@ struct m_can_classdev {
> struct workqueue_struct *tx_wq;
> struct work_struct tx_work;
> struct sk_buff *tx_skb;
> + struct phy *transceiver;
>
> struct m_can_ops *ops;
>
> diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c
> index 9f8f69aec993..a28c84aa8fa8 100644
> --- a/drivers/net/can/m_can/m_can_platform.c
> +++ b/drivers/net/can/m_can/m_can_platform.c
> @@ -6,6 +6,7 @@
> // Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/
>
> #include <linux/platform_device.h>
> +#include <linux/phy/phy.h>
>
> #include "m_can.h"
>
> @@ -67,6 +68,7 @@ static int m_can_plat_probe(struct platform_device *pdev)
> struct resource *res;
> void __iomem *addr;
> void __iomem *mram_addr;
> + struct phy *transceiver;
> int irq, ret = 0;
>
> mcan_class = m_can_class_allocate_dev(&pdev->dev,
> @@ -100,6 +102,16 @@ static int m_can_plat_probe(struct platform_device *pdev)
> goto probe_fail;
> }
>
> + transceiver = devm_phy_optional_get(&pdev->dev, NULL);
> + if (IS_ERR(transceiver)) {
> + ret = PTR_ERR(transceiver);
> + dev_err_probe(&pdev->dev, ret, "failed to get phy\n");
> + goto probe_fail;
> + }
> +
> + if (transceiver)
> + mcan_class->can.bitrate_max = transceiver->attrs.max_link_rate;
> +
> priv->base = addr;
> priv->mram_base = mram_addr;
>
> @@ -107,6 +119,7 @@ static int m_can_plat_probe(struct platform_device *pdev)
> mcan_class->pm_clock_support = 1;
> mcan_class->can.clock.freq = clk_get_rate(mcan_class->cclk);
> mcan_class->dev = &pdev->dev;
> + mcan_class->transceiver = transceiver;
>
> mcan_class->ops = &m_can_plat_ops;
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v5] can: m_can: Add support for transceiver as phy
2021-07-26 7:30 ` Aswath Govindraju
@ 2021-07-26 7:38 ` Marc Kleine-Budde
0 siblings, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2021-07-26 7:38 UTC (permalink / raw)
To: Aswath Govindraju; +Cc: linux-can, Faiz Abbas
[-- Attachment #1: Type: text/plain, Size: 622 bytes --]
On 26.07.2021 13:00:54, Aswath Govindraju wrote:
> May I know what is the base branch for this patch ? I tried applying it
> on top of linux-next/master but I am getting errors.
It's part of my next pull request:
https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git/log/?h=linux-can-next-for-5.15-20210725
regards,
Marc
--
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 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-26 7:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-24 17:40 [PATCH v5] can: m_can: Add support for transceiver as phy Marc Kleine-Budde
2021-07-26 7:30 ` Aswath Govindraju
2021-07-26 7:38 ` Marc Kleine-Budde
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.