| Message ID | 20170505141553.2605-1-sebastian.reichel@collabora.co.uk |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
Sebastian Reichel <sebastian.reichel@collabora.co.uk> writes: > Motorola Droid 4 uses a WL1285C. With differences between the > chips not being public let's add explicit binding for wl1285 > instead of relying on wl1283 being very similar. > > Reviewed-by: Rob Herring <robh@kernel.org> > Acked-by: Kalle Valo <kvalo@codeaurora.org> > Acked-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> > --- > Hi Dave, > > I previously send this in two patches, but its hard to apply without > requiring multiple kernel releases (the driver must be updated before > the DTS change). Since the actual change is not very complex Marcel > Holtmann & Tony Lindgren suggested, that I send this directly to you > in a single patch for inclusion into 4.12. This also means, that the > remaining series can be queued normally for 4.13. I noticed that Dave set this patch to Awaiting Upstream state on his patchwork: https://patchwork.ozlabs.org/patch/759042/ Which makes me suspect that he is waiting me to apply this (as I normally apply wlcore patches). Dave, should I actually take this patch? What do you prefer? There's a small change to arm directory but I don't see that as a problem as Tony acked it: Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt | 1 + arch/arm/boot/dts/omap4-droid4-xt894.dts | 2 +- drivers/net/wireless/ti/wlcore/sdio.c | 1 + drivers/net/wireless/ti/wlcore/spi.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-)
From: Kalle Valo <kvalo@codeaurora.org> Date: Mon, 22 May 2017 12:28:20 +0300 > Sebastian Reichel <sebastian.reichel@collabora.co.uk> writes: > >> Motorola Droid 4 uses a WL1285C. With differences between the >> chips not being public let's add explicit binding for wl1285 >> instead of relying on wl1283 being very similar. >> >> Reviewed-by: Rob Herring <robh@kernel.org> >> Acked-by: Kalle Valo <kvalo@codeaurora.org> >> Acked-by: Tony Lindgren <tony@atomide.com> >> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> >> --- >> Hi Dave, >> >> I previously send this in two patches, but its hard to apply without >> requiring multiple kernel releases (the driver must be updated before >> the DTS change). Since the actual change is not very complex Marcel >> Holtmann & Tony Lindgren suggested, that I send this directly to you >> in a single patch for inclusion into 4.12. This also means, that the >> remaining series can be queued normally for 4.13. > > I noticed that Dave set this patch to Awaiting Upstream state on his > patchwork: > > https://patchwork.ozlabs.org/patch/759042/ > > Which makes me suspect that he is waiting me to apply this (as I > normally apply wlcore patches). Dave, should I actually take this patch? > What do you prefer? Anything that touches wireless drivers I defer to you, yes.
David Miller <davem@davemloft.net> writes: > From: Kalle Valo <kvalo@codeaurora.org> > Date: Mon, 22 May 2017 12:28:20 +0300 > >> Sebastian Reichel <sebastian.reichel@collabora.co.uk> writes: >> >>> Motorola Droid 4 uses a WL1285C. With differences between the >>> chips not being public let's add explicit binding for wl1285 >>> instead of relying on wl1283 being very similar. >>> >>> Reviewed-by: Rob Herring <robh@kernel.org> >>> Acked-by: Kalle Valo <kvalo@codeaurora.org> >>> Acked-by: Tony Lindgren <tony@atomide.com> >>> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> >>> --- >>> Hi Dave, >>> >>> I previously send this in two patches, but its hard to apply without >>> requiring multiple kernel releases (the driver must be updated before >>> the DTS change). Since the actual change is not very complex Marcel >>> Holtmann & Tony Lindgren suggested, that I send this directly to you >>> in a single patch for inclusion into 4.12. This also means, that the >>> remaining series can be queued normally for 4.13. >> >> I noticed that Dave set this patch to Awaiting Upstream state on his >> patchwork: >> >> https://patchwork.ozlabs.org/patch/759042/ >> >> Which makes me suspect that he is waiting me to apply this (as I >> normally apply wlcore patches). Dave, should I actually take this patch? >> What do you prefer? > > Anything that touches wireless drivers I defer to you, yes. Thanks, I'll take it then. Not sure why Sebastian was suggested to submit this patch via your tree in the first place. https://patchwork.kernel.org/patch/9713645/
Hi, On Mon, May 22, 2017 at 05:44:24PM +0300, Kalle Valo wrote: > David Miller <davem@davemloft.net> writes: > > From: Kalle Valo <kvalo@codeaurora.org> > > Date: Mon, 22 May 2017 12:28:20 +0300 > > > >> Sebastian Reichel <sebastian.reichel@collabora.co.uk> writes: > >> > >>> Motorola Droid 4 uses a WL1285C. With differences between the > >>> chips not being public let's add explicit binding for wl1285 > >>> instead of relying on wl1283 being very similar. > >>> > >>> Reviewed-by: Rob Herring <robh@kernel.org> > >>> Acked-by: Kalle Valo <kvalo@codeaurora.org> > >>> Acked-by: Tony Lindgren <tony@atomide.com> > >>> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> > >>> --- > >>> Hi Dave, > >>> > >>> I previously send this in two patches, but its hard to apply without > >>> requiring multiple kernel releases (the driver must be updated before > >>> the DTS change). Since the actual change is not very complex Marcel > >>> Holtmann & Tony Lindgren suggested, that I send this directly to you > >>> in a single patch for inclusion into 4.12. This also means, that the > >>> remaining series can be queued normally for 4.13. > >> > >> I noticed that Dave set this patch to Awaiting Upstream state on his > >> patchwork: > >> > >> https://patchwork.ozlabs.org/patch/759042/ > >> > >> Which makes me suspect that he is waiting me to apply this (as I > >> normally apply wlcore patches). Dave, should I actually take this patch? > >> What do you prefer? > > > > Anything that touches wireless drivers I defer to you, yes. > > Thanks, I'll take it then. Not sure why Sebastian was suggested to > submit this patch via your tree in the first place. > > https://patchwork.kernel.org/patch/9713645/ Thanks. The idea was to get into early 4.12-rc to avoid merge conflicts in the droid 4 *.dts during 4.13 cycle. This strategy obviously failed :) -- Sebastian
Sebastian Reichel <sebastian.reichel@collabora.co.uk> wrote: > Motorola Droid 4 uses a WL1285C. With differences between the > chips not being public let's add explicit binding for wl1285 > instead of relying on wl1283 being very similar. > > Reviewed-by: Rob Herring <robh@kernel.org> > Acked-by: Kalle Valo <kvalo@codeaurora.org> > Acked-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> A note to patchwork: this is for 4.12
On Mon, May 22, 2017 at 10:21 AM, Sebastian Reichel <sebastian.reichel@collabora.co.uk> wrote: > Hi, > > On Mon, May 22, 2017 at 05:44:24PM +0300, Kalle Valo wrote: >> David Miller <davem@davemloft.net> writes: >> > From: Kalle Valo <kvalo@codeaurora.org> >> > Date: Mon, 22 May 2017 12:28:20 +0300 >> > >> >> Sebastian Reichel <sebastian.reichel@collabora.co.uk> writes: >> >> >> >>> Motorola Droid 4 uses a WL1285C. With differences between the >> >>> chips not being public let's add explicit binding for wl1285 >> >>> instead of relying on wl1283 being very similar. >> >>> >> >>> Reviewed-by: Rob Herring <robh@kernel.org> >> >>> Acked-by: Kalle Valo <kvalo@codeaurora.org> >> >>> Acked-by: Tony Lindgren <tony@atomide.com> >> >>> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> >> >>> --- >> >>> Hi Dave, >> >>> >> >>> I previously send this in two patches, but its hard to apply without >> >>> requiring multiple kernel releases (the driver must be updated before >> >>> the DTS change). Since the actual change is not very complex Marcel >> >>> Holtmann & Tony Lindgren suggested, that I send this directly to you >> >>> in a single patch for inclusion into 4.12. This also means, that the >> >>> remaining series can be queued normally for 4.13. >> >> >> >> I noticed that Dave set this patch to Awaiting Upstream state on his >> >> patchwork: >> >> >> >> https://patchwork.ozlabs.org/patch/759042/ >> >> >> >> Which makes me suspect that he is waiting me to apply this (as I >> >> normally apply wlcore patches). Dave, should I actually take this patch? >> >> What do you prefer? >> > >> > Anything that touches wireless drivers I defer to you, yes. >> >> Thanks, I'll take it then. Not sure why Sebastian was suggested to >> submit this patch via your tree in the first place. >> >> https://patchwork.kernel.org/patch/9713645/ > > Thanks. The idea was to get into early 4.12-rc to avoid merge > conflicts in the droid 4 *.dts during 4.13 cycle. This strategy > obviously failed :) First, I'm not sure why you combined everything. A maintainer can just as easily take a series as a single patch and we prefer binding doc, dts and driver changes all separate. Second, the dts changes could go thru arm-soc and the driver change thru netdev. The binding doc can be thru either. There's no bisecting dependency and things shouldn't break. It just won't all work until you have both branches. Rob
Hi, On Mon, May 22, 2017 at 11:11:49AM -0500, Rob Herring wrote: > On Mon, May 22, 2017 at 10:21 AM, Sebastian Reichel > <sebastian.reichel@collabora.co.uk> wrote: > > Hi, > > > > On Mon, May 22, 2017 at 05:44:24PM +0300, Kalle Valo wrote: > >> David Miller <davem@davemloft.net> writes: > >> > From: Kalle Valo <kvalo@codeaurora.org> > >> > Date: Mon, 22 May 2017 12:28:20 +0300 > >> > > >> >> Sebastian Reichel <sebastian.reichel@collabora.co.uk> writes: > >> >> > >> >>> Motorola Droid 4 uses a WL1285C. With differences between the > >> >>> chips not being public let's add explicit binding for wl1285 > >> >>> instead of relying on wl1283 being very similar. > >> >>> > >> >>> Reviewed-by: Rob Herring <robh@kernel.org> > >> >>> Acked-by: Kalle Valo <kvalo@codeaurora.org> > >> >>> Acked-by: Tony Lindgren <tony@atomide.com> > >> >>> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> > >> >>> --- > >> >>> Hi Dave, > >> >>> > >> >>> I previously send this in two patches, but its hard to apply without > >> >>> requiring multiple kernel releases (the driver must be updated before > >> >>> the DTS change). Since the actual change is not very complex Marcel > >> >>> Holtmann & Tony Lindgren suggested, that I send this directly to you > >> >>> in a single patch for inclusion into 4.12. This also means, that the > >> >>> remaining series can be queued normally for 4.13. > >> >> > >> >> I noticed that Dave set this patch to Awaiting Upstream state on his > >> >> patchwork: > >> >> > >> >> https://patchwork.ozlabs.org/patch/759042/ > >> >> > >> >> Which makes me suspect that he is waiting me to apply this (as I > >> >> normally apply wlcore patches). Dave, should I actually take this patch? > >> >> What do you prefer? > >> > > >> > Anything that touches wireless drivers I defer to you, yes. > >> > >> Thanks, I'll take it then. Not sure why Sebastian was suggested to > >> submit this patch via your tree in the first place. > >> > >> https://patchwork.kernel.org/patch/9713645/ > > > > Thanks. The idea was to get into early 4.12-rc to avoid merge > > conflicts in the droid 4 *.dts during 4.13 cycle. This strategy > > obviously failed :) > > First, I'm not sure why you combined everything. A maintainer can just > as easily take a series as a single patch and we prefer binding doc, > dts and driver changes all separate. > > Second, the dts changes could go thru arm-soc and the driver change > thru netdev. The binding doc can be thru either. There's no bisecting > dependency and things shouldn't break. It just won't all work until > you have both branches. This is only true for new devices. WLAN for droid4 works at the moment using incorrect compatible string. If *.dts is updated and driver is not yet updated WLAN does not work. IMHO that is a bisecting dependency. It would have been fine to sneak the driver change into 4.12 and queue the *.dts change in 4.13, though. IIRC Tony suggest to make it one patch. -- Sebastian
On Mon, May 22, 2017 at 11:21 AM, Sebastian Reichel <sebastian.reichel@collabora.co.uk> wrote: > Hi, > > On Mon, May 22, 2017 at 11:11:49AM -0500, Rob Herring wrote: >> On Mon, May 22, 2017 at 10:21 AM, Sebastian Reichel >> <sebastian.reichel@collabora.co.uk> wrote: >> > Hi, >> > >> > On Mon, May 22, 2017 at 05:44:24PM +0300, Kalle Valo wrote: >> >> David Miller <davem@davemloft.net> writes: >> >> > From: Kalle Valo <kvalo@codeaurora.org> >> >> > Date: Mon, 22 May 2017 12:28:20 +0300 >> >> > >> >> >> Sebastian Reichel <sebastian.reichel@collabora.co.uk> writes: >> >> >> >> >> >>> Motorola Droid 4 uses a WL1285C. With differences between the >> >> >>> chips not being public let's add explicit binding for wl1285 >> >> >>> instead of relying on wl1283 being very similar. >> >> >>> >> >> >>> Reviewed-by: Rob Herring <robh@kernel.org> >> >> >>> Acked-by: Kalle Valo <kvalo@codeaurora.org> >> >> >>> Acked-by: Tony Lindgren <tony@atomide.com> >> >> >>> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> >> >> >>> --- >> >> >>> Hi Dave, >> >> >>> >> >> >>> I previously send this in two patches, but its hard to apply without >> >> >>> requiring multiple kernel releases (the driver must be updated before >> >> >>> the DTS change). Since the actual change is not very complex Marcel >> >> >>> Holtmann & Tony Lindgren suggested, that I send this directly to you >> >> >>> in a single patch for inclusion into 4.12. This also means, that the >> >> >>> remaining series can be queued normally for 4.13. >> >> >> >> >> >> I noticed that Dave set this patch to Awaiting Upstream state on his >> >> >> patchwork: >> >> >> >> >> >> https://patchwork.ozlabs.org/patch/759042/ >> >> >> >> >> >> Which makes me suspect that he is waiting me to apply this (as I >> >> >> normally apply wlcore patches). Dave, should I actually take this patch? >> >> >> What do you prefer? >> >> > >> >> > Anything that touches wireless drivers I defer to you, yes. >> >> >> >> Thanks, I'll take it then. Not sure why Sebastian was suggested to >> >> submit this patch via your tree in the first place. >> >> >> >> https://patchwork.kernel.org/patch/9713645/ >> > >> > Thanks. The idea was to get into early 4.12-rc to avoid merge >> > conflicts in the droid 4 *.dts during 4.13 cycle. This strategy >> > obviously failed :) >> >> First, I'm not sure why you combined everything. A maintainer can just >> as easily take a series as a single patch and we prefer binding doc, >> dts and driver changes all separate. >> >> Second, the dts changes could go thru arm-soc and the driver change >> thru netdev. The binding doc can be thru either. There's no bisecting >> dependency and things shouldn't break. It just won't all work until >> you have both branches. > > This is only true for new devices. WLAN for droid4 works at the > moment using incorrect compatible string. If *.dts is updated and > driver is not yet updated WLAN does not work. IMHO that is a > bisecting dependency. True. That's also breaking compatibility if a new kernel doesn't work with an old DT. Is it just a compatible string change? If so, then just keep the old string as a fallback. Rob
Hi, On Mon, May 22, 2017 at 11:50:04AM -0500, Rob Herring wrote: > [...] > >> >> Thanks, I'll take it then. Not sure why Sebastian was suggested to > >> >> submit this patch via your tree in the first place. > >> >> > >> >> https://patchwork.kernel.org/patch/9713645/ > >> > > >> > Thanks. The idea was to get into early 4.12-rc to avoid merge > >> > conflicts in the droid 4 *.dts during 4.13 cycle. This strategy > >> > obviously failed :) > >> > >> First, I'm not sure why you combined everything. A maintainer can just > >> as easily take a series as a single patch and we prefer binding doc, > >> dts and driver changes all separate. > >> > >> Second, the dts changes could go thru arm-soc and the driver change > >> thru netdev. The binding doc can be thru either. There's no bisecting > >> dependency and things shouldn't break. It just won't all work until > >> you have both branches. > > > > This is only true for new devices. WLAN for droid4 works at the > > moment using incorrect compatible string. If *.dts is updated and > > driver is not yet updated WLAN does not work. IMHO that is a > > bisecting dependency. > > True. That's also breaking compatibility if a new kernel doesn't work > with an old DT. This way around works. It's the other way around, that does not work (new DT with old kernel). > Is it just a compatible string change? If so, then just keep the > old string as a fallback. That should work. -- Sebastian
Sebastian Reichel <sebastian.reichel@collabora.co.uk> wrote: > Motorola Droid 4 uses a WL1285C. With differences between the > chips not being public let's add explicit binding for wl1285 > instead of relying on wl1283 being very similar. > > Reviewed-by: Rob Herring <robh@kernel.org> > Acked-by: Kalle Valo <kvalo@codeaurora.org> > Acked-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> My understanding is that there will be a new version. Please let me know if I misunderstood. Patch set to Changes Requested.
diff --git a/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt b/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt index 2a3d90de18ee..7b2cbb14113e 100644 --- a/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt +++ b/Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt @@ -10,6 +10,7 @@ Required properties: * "ti,wl1273" * "ti,wl1281" * "ti,wl1283" + * "ti,wl1285" * "ti,wl1801" * "ti,wl1805" * "ti,wl1807" diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts index 89eb607f4a9e..c09b51d6ccf7 100644 --- a/arch/arm/boot/dts/omap4-droid4-xt894.dts +++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts @@ -301,7 +301,7 @@ #address-cells = <1>; #size-cells = <0>; wlcore: wlcore@2 { - compatible = "ti,wl1283"; + compatible = "ti,wl1285"; reg = <2>; interrupt-parent = <&gpio4>; interrupts = <4 IRQ_TYPE_LEVEL_HIGH>; /* gpio100 */ diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c index 287023ef4a78..2fb38717346f 100644 --- a/drivers/net/wireless/ti/wlcore/sdio.c +++ b/drivers/net/wireless/ti/wlcore/sdio.c @@ -237,6 +237,7 @@ static const struct of_device_id wlcore_sdio_of_match_table[] = { { .compatible = "ti,wl1273", .data = &wl127x_data }, { .compatible = "ti,wl1281", .data = &wl128x_data }, { .compatible = "ti,wl1283", .data = &wl128x_data }, + { .compatible = "ti,wl1285", .data = &wl128x_data }, { .compatible = "ti,wl1801", .data = &wl18xx_data }, { .compatible = "ti,wl1805", .data = &wl18xx_data }, { .compatible = "ti,wl1807", .data = &wl18xx_data }, diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c index f949ad2bd898..1f5d9ebb0925 100644 --- a/drivers/net/wireless/ti/wlcore/spi.c +++ b/drivers/net/wireless/ti/wlcore/spi.c @@ -433,6 +433,7 @@ static const struct of_device_id wlcore_spi_of_match_table[] = { { .compatible = "ti,wl1273", .data = &wl127x_data}, { .compatible = "ti,wl1281", .data = &wl128x_data}, { .compatible = "ti,wl1283", .data = &wl128x_data}, + { .compatible = "ti,wl1285", .data = &wl128x_data}, { .compatible = "ti,wl1801", .data = &wl18xx_data}, { .compatible = "ti,wl1805", .data = &wl18xx_data}, { .compatible = "ti,wl1807", .data = &wl18xx_data},