| Message ID | 20211028172322.4021440-4-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Removal of bcm63xx-wdt | expand |
On Thu, Oct 28, 2021 at 10:23:18AM -0700, Florian Fainelli wrote: > The BCM7038 watchdog driver needs to be able to obtain a specific clock > name on BCM63xx platforms which is the "periph" clock ticking at 50MHz. > make it possible to specify the clock name to obtain via platform data. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/bcm7038_wdt.c | 8 +++++++- > include/linux/platform_data/bcm7038_wdt.h | 8 ++++++++ > 2 files changed, 15 insertions(+), 1 deletion(-) > create mode 100644 include/linux/platform_data/bcm7038_wdt.h > > diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c > index acaaa0005d5b..506cd7ef9c77 100644 > --- a/drivers/watchdog/bcm7038_wdt.c > +++ b/drivers/watchdog/bcm7038_wdt.c > @@ -10,6 +10,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/platform_device.h> > +#include <linux/platform_data/bcm7038_wdt.h> > #include <linux/pm.h> > #include <linux/watchdog.h> > > @@ -133,8 +134,10 @@ static void bcm7038_clk_disable_unprepare(void *data) > > static int bcm7038_wdt_probe(struct platform_device *pdev) > { > + struct bcm7038_wdt_platform_data *pdata = pdev->dev.platform_data; > struct device *dev = &pdev->dev; > struct bcm7038_watchdog *wdt; > + const char *clk_name = NULL; > int err; > > wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); > @@ -147,7 +150,10 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) > if (IS_ERR(wdt->base)) > return PTR_ERR(wdt->base); > > - wdt->clk = devm_clk_get(dev, NULL); > + if (pdata && pdata->clk_name) > + clk_name = pdata->clk_name; > + > + wdt->clk = devm_clk_get(dev, clk_name); > /* If unable to get clock, use default frequency */ > if (!IS_ERR(wdt->clk)) { > err = clk_prepare_enable(wdt->clk); > diff --git a/include/linux/platform_data/bcm7038_wdt.h b/include/linux/platform_data/bcm7038_wdt.h > new file mode 100644 > index 000000000000..e18cfd9ec8f9 > --- /dev/null > +++ b/include/linux/platform_data/bcm7038_wdt.h > @@ -0,0 +1,8 @@ > +#ifndef __BCM7038_WDT_PDATA_H > +#define __BCM7038_WDT_PDATA_H > + > +struct bcm7038_wdt_platform_data { > + const char *clk_name; > +}; > + > +#endif /* __BCM7038_WDT_PDATA_H */ > -- > 2.25.1 >
diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index acaaa0005d5b..506cd7ef9c77 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -10,6 +10,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/platform_data/bcm7038_wdt.h> #include <linux/pm.h> #include <linux/watchdog.h> @@ -133,8 +134,10 @@ static void bcm7038_clk_disable_unprepare(void *data) static int bcm7038_wdt_probe(struct platform_device *pdev) { + struct bcm7038_wdt_platform_data *pdata = pdev->dev.platform_data; struct device *dev = &pdev->dev; struct bcm7038_watchdog *wdt; + const char *clk_name = NULL; int err; wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); @@ -147,7 +150,10 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) if (IS_ERR(wdt->base)) return PTR_ERR(wdt->base); - wdt->clk = devm_clk_get(dev, NULL); + if (pdata && pdata->clk_name) + clk_name = pdata->clk_name; + + wdt->clk = devm_clk_get(dev, clk_name); /* If unable to get clock, use default frequency */ if (!IS_ERR(wdt->clk)) { err = clk_prepare_enable(wdt->clk); diff --git a/include/linux/platform_data/bcm7038_wdt.h b/include/linux/platform_data/bcm7038_wdt.h new file mode 100644 index 000000000000..e18cfd9ec8f9 --- /dev/null +++ b/include/linux/platform_data/bcm7038_wdt.h @@ -0,0 +1,8 @@ +#ifndef __BCM7038_WDT_PDATA_H +#define __BCM7038_WDT_PDATA_H + +struct bcm7038_wdt_platform_data { + const char *clk_name; +}; + +#endif /* __BCM7038_WDT_PDATA_H */
The BCM7038 watchdog driver needs to be able to obtain a specific clock name on BCM63xx platforms which is the "periph" clock ticking at 50MHz. make it possible to specify the clock name to obtain via platform data. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/watchdog/bcm7038_wdt.c | 8 +++++++- include/linux/platform_data/bcm7038_wdt.h | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 include/linux/platform_data/bcm7038_wdt.h