Re: [PATCH v4] wlcore: spi: add wl18xx support

[Kalle Valo <kvalo@codeaurora.org>]

"Reizer, Eyal" <eyalr@ti.com> writes:

> Add support for using with both wl12xx and wl18xx.
>
> - all wilink family needs special init command for entering wspi mode.
>   extra clock cycles should be sent after the spi init command while the
>   cs pin is high.
> - Use inverted chip select for sending a dummy 4 bytes command that
>   completes the init stage.
>
> Signed-off-by: Eyal Reizer <eyalr@ti.com>
> ---
> v1->v2:update device tree bindings configuration
> v2->v3:revert from manual gpio manipulation. use inverted chip select instead
> for sending the extra init cycle which, achieves the same hardware purpose.
> update device tree bindings docucmentation accordingly
> v3->v4: Remove redundant data form binding documentation and fix chip select
> number mismatch in wl1271 example

Doesn't apply to wireless-drivers-next, please resend.

Applying: wlcore: spi: add wl18xx support
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ti/wlcore/spi.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ti/wlcore/spi.c
Failed to merge in the changes.
Patch failed at 0001 wlcore: spi: add wl18xx support

-- 
Kalle Valo