| Message ID | 1484918906-21856-2-git-send-email-sgruszka@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 34db70b92faed22f59fdc1dba766e8cb6248fe9e |
| Delegated to: | Kalle Valo |
| Headers | show |
On Fri, Jan 20, 2017 at 02:28:24PM +0100, Stanislaw Gruszka wrote: > Since clk_get() is not trivial add copy of clk pointer to rt2x00dev > for System On Chip devices and initialize it on probe routine. > > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Acked-by: Daniel Golle <daniel@makrotopia.org>
Stanislaw Gruszka <sgruszka@redhat.com> wrote: > Since clk_get() is not trivial add copy of clk pointer to rt2x00dev > for System On Chip devices and initialize it on probe routine. > > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> > Acked-by: Daniel Golle <daniel@makrotopia.org> 3 patches applied to wireless-drivers-next.git, thanks. 34db70b92fae rt2x00: add copy of clk for soc devices 5c4412e07280 rt2x00: rt2800lib: add support for RT3352 with 20MHz crystal 98e71f44c51d rt2x00: add support for RT5350 WiSoC
On 2017-01-20 14:28, Stanislaw Gruszka wrote: > Since clk_get() is not trivial add copy of clk pointer to rt2x00dev > for System On Chip devices and initialize it on probe routine. > > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> > --- > drivers/net/wireless/ralink/rt2x00/rt2x00.h | 4 ++++ > drivers/net/wireless/ralink/rt2x00/rt2x00soc.c | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h > index bea7ac3..b59e721 100644 > --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h > +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h > @@ -39,6 +39,7 @@ > #include <linux/hrtimer.h> > #include <linux/average.h> > #include <linux/usb.h> > +#include <linux/clk.h> > > #include <net/mac80211.h> > > @@ -1011,6 +1012,9 @@ struct rt2x00_dev { > unsigned int extra_tx_headroom; > > struct usb_anchor *anchor; > + > + /* Clock for System On Chip devices. */ > + struct clk *clk; > }; > > struct rt2x00_bar_list_entry { > diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c > index 69a0cda..362f9d3 100644 > --- a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c > +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c > @@ -92,6 +92,7 @@ int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops) > rt2x00dev->hw = hw; > rt2x00dev->irq = platform_get_irq(pdev, 0); > rt2x00dev->name = pdev->dev.driver->name; > + rt2x00dev->clk = clk_get(&pdev->dev); This looks broken, clk_get takes two parameters, not just one. - Felix
On Sat, Jan 28, 2017 at 08:39:15PM +0100, Felix Fietkau wrote: > > rt2x00dev->hw = hw; > > rt2x00dev->irq = platform_get_irq(pdev, 0); > > rt2x00dev->name = pdev->dev.driver->name; > > + rt2x00dev->clk = clk_get(&pdev->dev); > This looks broken, clk_get takes two parameters, not just one. Err, since patch was already applied in -next, I will post fix in separate patch. Thanks Stanislaw
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h index bea7ac3..b59e721 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h @@ -39,6 +39,7 @@ #include <linux/hrtimer.h> #include <linux/average.h> #include <linux/usb.h> +#include <linux/clk.h> #include <net/mac80211.h> @@ -1011,6 +1012,9 @@ struct rt2x00_dev { unsigned int extra_tx_headroom; struct usb_anchor *anchor; + + /* Clock for System On Chip devices. */ + struct clk *clk; }; struct rt2x00_bar_list_entry { diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c index 69a0cda..362f9d3 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c @@ -92,6 +92,7 @@ int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops) rt2x00dev->hw = hw; rt2x00dev->irq = platform_get_irq(pdev, 0); rt2x00dev->name = pdev->dev.driver->name; + rt2x00dev->clk = clk_get(&pdev->dev); rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_SOC);
Since clk_get() is not trivial add copy of clk pointer to rt2x00dev for System On Chip devices and initialize it on probe routine. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/wireless/ralink/rt2x00/rt2x00.h | 4 ++++ drivers/net/wireless/ralink/rt2x00/rt2x00soc.c | 1 + 2 files changed, 5 insertions(+)