* [RESEND PATCH v4 0/4] ASoC: codecs: Add WSA881x Smart Speaker amplifier support
@ 2019-08-22 23:37 Srinivas Kandagatla
2019-08-22 23:37 ` [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings Srinivas Kandagatla
` (3 more replies)
0 siblings, 4 replies; 18+ messages in thread
From: Srinivas Kandagatla @ 2019-08-22 23:37 UTC (permalink / raw)
To: broonie, robh+dt, vkoul
Cc: spapothi, bgoswami, alsa-devel, linux-kernel, lgirdwood,
devicetree, Srinivas Kandagatla
Resending this series due to a typo in yaml filename!
Thanks for reviewing v3 patchset, here is v4 with addressing the comments in v3
This patchset adds support to WSA8810/WSA8815 Class-D Smart Speaker
Amplifier which is SoundWire interfaced.
This also adds support to some missing bits in SoundWire bus layer like
Device Tree support.
This patchset along with DB845c machine driver and WCD934x codec driver
has been tested on SDM845 SoC based DragonBoard DB845c with two
WSA8810 speakers.
Most of the code in this driver is rework of Qualcomm downstream drivers
used in Andriod. Credits to Banajit Goswami and Patrick Lai's Team.
TODO:
Add thermal sensor support in WSA881x.
Thanks,
srini
Changes since v3:
- updated slave bindings according to Rob's Suggestion.
- moved bindings to yaml
Srinivas Kandagatla (4):
dt-bindings: soundwire: add slave bindings
soundwire: core: add device tree support for slave devices
dt-bindings: ASoC: Add WSA881x bindings
ASoC: codecs: add wsa881x amplifier support
.../bindings/sound/qcom,wsa881x.yaml | 44 +
.../soundwire/soundwire-controller.yaml | 75 ++
drivers/soundwire/bus.c | 2 +
drivers/soundwire/bus.h | 1 +
drivers/soundwire/slave.c | 52 +
sound/soc/codecs/Kconfig | 10 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/wsa881x.c | 1134 +++++++++++++++++
8 files changed, 1320 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml
create mode 100644 Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml
create mode 100644 sound/soc/codecs/wsa881x.c
--
2.21.0
^ permalink raw reply [flat|nested] 18+ messages in thread* [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings 2019-08-22 23:37 [RESEND PATCH v4 0/4] ASoC: codecs: Add WSA881x Smart Speaker amplifier support Srinivas Kandagatla @ 2019-08-22 23:37 ` Srinivas Kandagatla 2019-08-23 6:53 ` Vinod Koul 2019-08-23 15:41 ` [alsa-devel] " Pierre-Louis Bossart 2019-08-22 23:37 ` [RESEND PATCH v4 2/4] soundwire: core: add device tree support for slave devices Srinivas Kandagatla ` (2 subsequent siblings) 3 siblings, 2 replies; 18+ messages in thread From: Srinivas Kandagatla @ 2019-08-22 23:37 UTC (permalink / raw) To: broonie, robh+dt, vkoul Cc: spapothi, bgoswami, alsa-devel, linux-kernel, lgirdwood, devicetree, Srinivas Kandagatla This patch adds bindings for Soundwire Slave devices that includes how SoundWire enumeration address and Link ID are used to represented in SoundWire slave device tree nodes. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- .../soundwire/soundwire-controller.yaml | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml diff --git a/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml new file mode 100644 index 000000000000..91aa6c6d6266 --- /dev/null +++ b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml @@ -0,0 +1,75 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soundwire/soundwire-controller.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: SoundWire Controller Generic Binding + +maintainers: + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> + +description: | + SoundWire busses can be described with a node for the SoundWire controller + device and a set of child nodes for each SoundWire slave on the bus. + +properties: + $nodename: + pattern: "^soundwire(@.*|-[0-9a-f])*$" + + "#address-cells": + const: 2 + + "#size-cells": + const: 0 + +patternProperties: + "^.*@[0-9a-f]+$": + type: object + + properties: + compatible: + pattern: "^sdw[0-9][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" + description: + Is the textual representation of SoundWire Enumeration + address. compatible string should contain SoundWire Version ID, + Manufacturer ID, Part ID and Class ID in order and shall be in + lower-case hexadecimal with leading zeroes. + Valid sizes of these fields are + Version ID is 1 nibble, number '0x1' represents SoundWire 1.0 + and '0x2' represents SoundWire 1.1 and so on. + MFD is 4 nibbles + PID is 4 nibbles + CID is 2 nibbles + More Information on detail of encoding of these fields can be + found in MIPI Alliance DisCo & SoundWire 1.0 Specifications. + + reg: + maxItems: 1 + description: + Instance ID and Link ID of SoundWire Device Address. + + required: + - compatible + - reg + +examples: + - | + soundwire@c2d0000 { + #address-cells = <2>; + #size-cells = <0>; + compatible = "qcom,soundwire-v1.5.0"; + reg = <0x0c2d0000 0x2000>; + + speaker@1 { + compatible = "sdw10217201000"; + reg = <1 0>; + }; + + speaker@2 { + compatible = "sdw10217201000"; + reg = <2 0>; + }; + }; + +... -- 2.21.0 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings 2019-08-22 23:37 ` [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings Srinivas Kandagatla @ 2019-08-23 6:53 ` Vinod Koul 2019-08-27 20:20 ` Rob Herring 2019-08-23 15:41 ` [alsa-devel] " Pierre-Louis Bossart 1 sibling, 1 reply; 18+ messages in thread From: Vinod Koul @ 2019-08-23 6:53 UTC (permalink / raw) To: Srinivas Kandagatla Cc: broonie, robh+dt, spapothi, bgoswami, alsa-devel, linux-kernel, lgirdwood, devicetree On 23-08-19, 00:37, Srinivas Kandagatla wrote: > This patch adds bindings for Soundwire Slave devices that includes how > SoundWire enumeration address and Link ID are used to represented in > SoundWire slave device tree nodes. > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > .../soundwire/soundwire-controller.yaml | 75 +++++++++++++++++++ > 1 file changed, 75 insertions(+) > create mode 100644 Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml > > diff --git a/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml > new file mode 100644 > index 000000000000..91aa6c6d6266 > --- /dev/null > +++ b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml > @@ -0,0 +1,75 @@ > +# SPDX-License-Identifier: GPL-2.0 > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/soundwire/soundwire-controller.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: SoundWire Controller Generic Binding Controller does not make sense here, why not use spec terminology and say "SoundWire Slave Generic Binding" > + > +maintainers: > + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > + > +description: | > + SoundWire busses can be described with a node for the SoundWire controller > + device and a set of child nodes for each SoundWire slave on the bus. > + > +properties: > + $nodename: > + pattern: "^soundwire(@.*|-[0-9a-f])*$" > + > + "#address-cells": > + const: 2 > + > + "#size-cells": > + const: 0 > + > +patternProperties: > + "^.*@[0-9a-f]+$": > + type: object > + > + properties: > + compatible: > + pattern: "^sdw[0-9][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" > + description: > + Is the textual representation of SoundWire Enumeration > + address. compatible string should contain SoundWire Version ID, > + Manufacturer ID, Part ID and Class ID in order and shall be in > + lower-case hexadecimal with leading zeroes. > + Valid sizes of these fields are > + Version ID is 1 nibble, number '0x1' represents SoundWire 1.0 > + and '0x2' represents SoundWire 1.1 and so on. > + MFD is 4 nibbles > + PID is 4 nibbles > + CID is 2 nibbles > + More Information on detail of encoding of these fields can be > + found in MIPI Alliance DisCo & SoundWire 1.0 Specifications. > + > + reg: > + maxItems: 1 > + description: > + Instance ID and Link ID of SoundWire Device Address. This looks better :) Thanks. Apart from the minor nit above this looks good to me, I can merge the sdw parts if Rob is fine with them. Thanks > + > + required: > + - compatible > + - reg > + > +examples: > + - | > + soundwire@c2d0000 { > + #address-cells = <2>; > + #size-cells = <0>; > + compatible = "qcom,soundwire-v1.5.0"; > + reg = <0x0c2d0000 0x2000>; > + > + speaker@1 { > + compatible = "sdw10217201000"; > + reg = <1 0>; > + }; > + > + speaker@2 { > + compatible = "sdw10217201000"; > + reg = <2 0>; > + }; > + }; > + > +... > -- > 2.21.0 -- ~Vinod ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings 2019-08-23 6:53 ` Vinod Koul @ 2019-08-27 20:20 ` Rob Herring 2019-08-27 20:28 ` Srinivas Kandagatla 0 siblings, 1 reply; 18+ messages in thread From: Rob Herring @ 2019-08-27 20:20 UTC (permalink / raw) To: Vinod Koul, Srinivas Kandagatla Cc: broonie, spapothi, bgoswami, alsa-devel, linux-kernel, lgirdwood, devicetree On Fri, Aug 23, 2019 at 12:23:40PM +0530, Vinod Koul wrote: > On 23-08-19, 00:37, Srinivas Kandagatla wrote: > > This patch adds bindings for Soundwire Slave devices that includes how > > SoundWire enumeration address and Link ID are used to represented in > > SoundWire slave device tree nodes. > > > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > --- > > .../soundwire/soundwire-controller.yaml | 75 +++++++++++++++++++ > > 1 file changed, 75 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml > > > > diff --git a/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml > > new file mode 100644 > > index 000000000000..91aa6c6d6266 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml > > @@ -0,0 +1,75 @@ > > +# SPDX-License-Identifier: GPL-2.0 > > +%YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/soundwire/soundwire-controller.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: SoundWire Controller Generic Binding > > Controller does not make sense here, why not use spec terminology and > say "SoundWire Slave Generic Binding" It's both IMO. It's describing the structure of child devices of a controller (aka a bus). > > > + > > +maintainers: > > + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > + > > +description: | > > + SoundWire busses can be described with a node for the SoundWire controller > > + device and a set of child nodes for each SoundWire slave on the bus. > > + > > +properties: > > + $nodename: > > + pattern: "^soundwire(@.*|-[0-9a-f])*$" '-[0-9a-f]' was to handle cases like spi-gpio or i2c-gpio. Would a bit banged interface be possible here? > > + > > + "#address-cells": > > + const: 2 > > + > > + "#size-cells": > > + const: 0 > > + > > +patternProperties: > > + "^.*@[0-9a-f]+$": If there are distinct fields in the address, they are typically comma separated in the unit-address. > > + type: object > > + > > + properties: > > + compatible: > > + pattern: "^sdw[0-9][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" > > + description: > > + Is the textual representation of SoundWire Enumeration > > + address. compatible string should contain SoundWire Version ID, > > + Manufacturer ID, Part ID and Class ID in order and shall be in > > + lower-case hexadecimal with leading zeroes. > > + Valid sizes of these fields are > > + Version ID is 1 nibble, number '0x1' represents SoundWire 1.0 > > + and '0x2' represents SoundWire 1.1 and so on. > > + MFD is 4 nibbles > > + PID is 4 nibbles > > + CID is 2 nibbles > > + More Information on detail of encoding of these fields can be > > + found in MIPI Alliance DisCo & SoundWire 1.0 Specifications. > > + > > + reg: > > + maxItems: 1 > > + description: > > + Instance ID and Link ID of SoundWire Device Address. > > This looks better :) Thanks. > > Apart from the minor nit above this looks good to me, I can merge the > sdw parts if Rob is fine with them. > > Thanks > > > + > > + required: > > + - compatible > > + - reg > > + > > +examples: > > + - | > > + soundwire@c2d0000 { > > + #address-cells = <2>; > > + #size-cells = <0>; > > + compatible = "qcom,soundwire-v1.5.0"; This will probably change once I review it. :) > > + reg = <0x0c2d0000 0x2000>; > > + > > + speaker@1 { > > + compatible = "sdw10217201000"; > > + reg = <1 0>; > > + }; > > + > > + speaker@2 { > > + compatible = "sdw10217201000"; > > + reg = <2 0>; > > + }; > > + }; > > + > > +... > > -- > > 2.21.0 > > -- > ~Vinod ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings 2019-08-27 20:20 ` Rob Herring @ 2019-08-27 20:28 ` Srinivas Kandagatla 0 siblings, 0 replies; 18+ messages in thread From: Srinivas Kandagatla @ 2019-08-27 20:28 UTC (permalink / raw) To: Rob Herring, Vinod Koul Cc: broonie, spapothi, bgoswami, alsa-devel, linux-kernel, lgirdwood, devicetree thanks for reviewing the patch! On 27/08/2019 21:20, Rob Herring wrote: > On Fri, Aug 23, 2019 at 12:23:40PM +0530, Vinod Koul wrote: >> On 23-08-19, 00:37, Srinivas Kandagatla wrote: >>> This patch adds bindings for Soundwire Slave devices that includes how >>> SoundWire enumeration address and Link ID are used to represented in >>> SoundWire slave device tree nodes. >>> >>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >>> --- >>> .../soundwire/soundwire-controller.yaml | 75 +++++++++++++++++++ >>> 1 file changed, 75 insertions(+) >>> create mode 100644 Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>> >>> diff --git a/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>> new file mode 100644 >>> index 000000000000..91aa6c6d6266 >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>> @@ -0,0 +1,75 @@ >>> +# SPDX-License-Identifier: GPL-2.0 >>> +%YAML 1.2 >>> +--- >>> +$id: http://devicetree.org/schemas/soundwire/soundwire-controller.yaml# >>> +$schema: http://devicetree.org/meta-schemas/core.yaml# >>> + >>> +title: SoundWire Controller Generic Binding >> >> Controller does not make sense here, why not use spec terminology and >> say "SoundWire Slave Generic Binding" > > It's both IMO. It's describing the structure of child devices of a > controller (aka a bus). > >> >>> + >>> +maintainers: >>> + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >>> + >>> +description: | >>> + SoundWire busses can be described with a node for the SoundWire controller >>> + device and a set of child nodes for each SoundWire slave on the bus. >>> + >>> +properties: >>> + $nodename: >>> + pattern: "^soundwire(@.*|-[0-9a-f])*$" > > '-[0-9a-f]' was to handle cases like spi-gpio or i2c-gpio. Would a > bit banged interface be possible here? Highly unlikely! > >>> + >>> + "#address-cells": >>> + const: 2 >>> + >>> + "#size-cells": >>> + const: 0 >>> + >>> +patternProperties: >>> + "^.*@[0-9a-f]+$": > > If there are distinct fields in the address, they are typically comma > separated in the unit-address. okay, will fix that in next version! > >>> + type: object >>> + >>> + properties: >>> + compatible: >>> + pattern: "^sdw[0-9][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" >>> + description: >>> + Is the textual representation of SoundWire Enumeration >>> + address. compatible string should contain SoundWire Version ID, >>> + Manufacturer ID, Part ID and Class ID in order and shall be in >>> + lower-case hexadecimal with leading zeroes. >>> + Valid sizes of these fields are >>> + Version ID is 1 nibble, number '0x1' represents SoundWire 1.0 >>> + and '0x2' represents SoundWire 1.1 and so on. >>> + MFD is 4 nibbles >>> + PID is 4 nibbles >>> + CID is 2 nibbles >>> + More Information on detail of encoding of these fields can be >>> + found in MIPI Alliance DisCo & SoundWire 1.0 Specifications. >>> + >>> + reg: >>> + maxItems: 1 >>> + description: >>> + Instance ID and Link ID of SoundWire Device Address. >> >> This looks better :) Thanks. >> >> Apart from the minor nit above this looks good to me, I can merge the >> sdw parts if Rob is fine with them. >> >> Thanks >> >>> + >>> + required: >>> + - compatible >>> + - reg >>> + >>> +examples: >>> + - | >>> + soundwire@c2d0000 { >>> + #address-cells = <2>; >>> + #size-cells = <0>; >>> + compatible = "qcom,soundwire-v1.5.0"; > > This will probably change once I review it. :) :-) thanks, srini > >>> + reg = <0x0c2d0000 0x2000>; >>> + >>> + speaker@1 { >>> + compatible = "sdw10217201000"; >>> + reg = <1 0>; >>> + }; >>> + >>> + speaker@2 { >>> + compatible = "sdw10217201000"; >>> + reg = <2 0>; >>> + }; >>> + }; >>> + >>> +... >>> -- >>> 2.21.0 >> >> -- >> ~Vinod ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [alsa-devel] [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings 2019-08-22 23:37 ` [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings Srinivas Kandagatla 2019-08-23 6:53 ` Vinod Koul @ 2019-08-23 15:41 ` Pierre-Louis Bossart 2019-08-23 15:57 ` Srinivas Kandagatla 1 sibling, 1 reply; 18+ messages in thread From: Pierre-Louis Bossart @ 2019-08-23 15:41 UTC (permalink / raw) To: Srinivas Kandagatla, broonie, robh+dt, vkoul Cc: devicetree, alsa-devel, bgoswami, spapothi, lgirdwood, linux-kernel On 8/22/19 6:37 PM, Srinivas Kandagatla wrote: > This patch adds bindings for Soundwire Slave devices that includes how > SoundWire enumeration address and Link ID are used to represented in > SoundWire slave device tree nodes. > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > .../soundwire/soundwire-controller.yaml | 75 +++++++++++++++++++ > 1 file changed, 75 insertions(+) > create mode 100644 Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml > > diff --git a/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml > new file mode 100644 > index 000000000000..91aa6c6d6266 > --- /dev/null > +++ b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml > @@ -0,0 +1,75 @@ > +# SPDX-License-Identifier: GPL-2.0 > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/soundwire/soundwire-controller.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: SoundWire Controller Generic Binding > + > +maintainers: > + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > + > +description: | > + SoundWire busses can be described with a node for the SoundWire controller > + device and a set of child nodes for each SoundWire slave on the bus. > + > +properties: > + $nodename: > + pattern: "^soundwire(@.*|-[0-9a-f])*$" > + > + "#address-cells": > + const: 2 > + > + "#size-cells": > + const: 0 > + > +patternProperties: > + "^.*@[0-9a-f]+$": > + type: object > + > + properties: > + compatible: > + pattern: "^sdw[0-9][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" So is this a 64-bit value, as in the MIPI spec, or is this part of the _ADR description? I also don't get why the first item in in base10? > + description: > + Is the textual representation of SoundWire Enumeration > + address. compatible string should contain SoundWire Version ID, > + Manufacturer ID, Part ID and Class ID in order and shall be in > + lower-case hexadecimal with leading zeroes. > + Valid sizes of these fields are > + Version ID is 1 nibble, number '0x1' represents SoundWire 1.0 > + and '0x2' represents SoundWire 1.1 and so on. > + MFD is 4 nibbles > + PID is 4 nibbles > + CID is 2 nibbles > + More Information on detail of encoding of these fields can be > + found in MIPI Alliance DisCo & SoundWire 1.0 Specifications. > + > + reg: > + maxItems: 1 > + description: > + Instance ID and Link ID of SoundWire Device Address. > + > + required: > + - compatible > + - reg > + > +examples: > + - | > + soundwire@c2d0000 { > + #address-cells = <2>; > + #size-cells = <0>; > + compatible = "qcom,soundwire-v1.5.0"; > + reg = <0x0c2d0000 0x2000>; > + > + speaker@1 { > + compatible = "sdw10217201000"; > + reg = <1 0>; > + }; > + > + speaker@2 { > + compatible = "sdw10217201000"; > + reg = <2 0>; > + }; > + }; > + > +... > ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [alsa-devel] [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings 2019-08-23 15:41 ` [alsa-devel] " Pierre-Louis Bossart @ 2019-08-23 15:57 ` Srinivas Kandagatla 2019-08-23 16:44 ` Pierre-Louis Bossart 0 siblings, 1 reply; 18+ messages in thread From: Srinivas Kandagatla @ 2019-08-23 15:57 UTC (permalink / raw) To: Pierre-Louis Bossart, broonie, robh+dt, vkoul Cc: devicetree, alsa-devel, bgoswami, spapothi, lgirdwood, linux-kernel On 23/08/2019 16:41, Pierre-Louis Bossart wrote: > > > On 8/22/19 6:37 PM, Srinivas Kandagatla wrote: >> This patch adds bindings for Soundwire Slave devices that includes how >> SoundWire enumeration address and Link ID are used to represented in >> SoundWire slave device tree nodes. >> >> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >> --- >> .../soundwire/soundwire-controller.yaml | 75 +++++++++++++++++++ >> 1 file changed, 75 insertions(+) >> create mode 100644 >> Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >> >> diff --git >> a/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >> >> new file mode 100644 >> index 000000000000..91aa6c6d6266 >> --- /dev/null >> +++ >> b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >> @@ -0,0 +1,75 @@ >> +# SPDX-License-Identifier: GPL-2.0 >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/soundwire/soundwire-controller.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: SoundWire Controller Generic Binding >> + >> +maintainers: >> + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >> + >> +description: | >> + SoundWire busses can be described with a node for the SoundWire >> controller >> + device and a set of child nodes for each SoundWire slave on the bus. >> + >> +properties: >> + $nodename: >> + pattern: "^soundwire(@.*|-[0-9a-f])*$" >> + >> + "#address-cells": >> + const: 2 >> + >> + "#size-cells": >> + const: 0 >> + >> +patternProperties: >> + "^.*@[0-9a-f]+$": >> + type: object >> + >> + properties: >> + compatible: >> + pattern: "^sdw[0-9][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" > > So is this a 64-bit value, as in the MIPI spec, or is this part of the > _ADR description? Rob did not like encoding compatible string exactly like _ADR encoding. https://lkml.org/lkml/2019/8/22/490 > I also don't get why the first item in in base10? > As this corresponds to Soundwire Version, and I have no visibility of version number encoding after reaching number 9 in this field. This can be updated once we have more info on how the Version encoding will look like in future. Idea of limiting regex to [0-9] for version is to enforce some checking! --srini > >> + description: >> + Is the textual representation of SoundWire Enumeration >> + address. compatible string should contain SoundWire Version ID, >> + Manufacturer ID, Part ID and Class ID in order and shall be in >> + lower-case hexadecimal with leading zeroes. >> + Valid sizes of these fields are >> + Version ID is 1 nibble, number '0x1' represents SoundWire 1.0 >> + and '0x2' represents SoundWire 1.1 and so on. >> + MFD is 4 nibbles >> + PID is 4 nibbles >> + CID is 2 nibbles >> + More Information on detail of encoding of these fields can be >> + found in MIPI Alliance DisCo & SoundWire 1.0 Specifications. >> + >> + reg: >> + maxItems: 1 >> + description: >> + Instance ID and Link ID of SoundWire Device Address. >> + >> + required: >> + - compatible >> + - reg >> + >> +examples: >> + - | >> + soundwire@c2d0000 { >> + #address-cells = <2>; >> + #size-cells = <0>; >> + compatible = "qcom,soundwire-v1.5.0"; >> + reg = <0x0c2d0000 0x2000>; >> + >> + speaker@1 { >> + compatible = "sdw10217201000"; >> + reg = <1 0>; >> + }; >> + >> + speaker@2 { >> + compatible = "sdw10217201000"; >> + reg = <2 0>; >> + }; >> + }; >> + >> +... >> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [alsa-devel] [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings 2019-08-23 15:57 ` Srinivas Kandagatla @ 2019-08-23 16:44 ` Pierre-Louis Bossart 2019-08-24 9:28 ` Srinivas Kandagatla 0 siblings, 1 reply; 18+ messages in thread From: Pierre-Louis Bossart @ 2019-08-23 16:44 UTC (permalink / raw) To: Srinivas Kandagatla, broonie, robh+dt, vkoul Cc: devicetree, alsa-devel, bgoswami, spapothi, lgirdwood, linux-kernel On 8/23/19 10:57 AM, Srinivas Kandagatla wrote: > > > On 23/08/2019 16:41, Pierre-Louis Bossart wrote: >> >> >> On 8/22/19 6:37 PM, Srinivas Kandagatla wrote: >>> This patch adds bindings for Soundwire Slave devices that includes how >>> SoundWire enumeration address and Link ID are used to represented in >>> SoundWire slave device tree nodes. >>> >>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >>> --- >>> .../soundwire/soundwire-controller.yaml | 75 +++++++++++++++++++ >>> 1 file changed, 75 insertions(+) >>> create mode 100644 >>> Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>> >>> diff --git >>> a/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>> b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>> new file mode 100644 >>> index 000000000000..91aa6c6d6266 >>> --- /dev/null >>> +++ >>> b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>> @@ -0,0 +1,75 @@ >>> +# SPDX-License-Identifier: GPL-2.0 >>> +%YAML 1.2 >>> +--- >>> +$id: http://devicetree.org/schemas/soundwire/soundwire-controller.yaml# >>> +$schema: http://devicetree.org/meta-schemas/core.yaml# >>> + >>> +title: SoundWire Controller Generic Binding >>> + >>> +maintainers: >>> + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >>> + >>> +description: | >>> + SoundWire busses can be described with a node for the SoundWire >>> controller >>> + device and a set of child nodes for each SoundWire slave on the bus. >>> + >>> +properties: >>> + $nodename: >>> + pattern: "^soundwire(@.*|-[0-9a-f])*$" re-reading this, it looks like you are defining the controller bindings, but there are no real controller-level properties except for the fact that they include slave bindings? In MIPI the notion of controller is that it can deal with multiple links, each of which having specific properties (clock speed, clock stop properties, etc). >>> + >>> + "#address-cells": >>> + const: 2 >>> + >>> + "#size-cells": >>> + const: 0 >>> + >>> +patternProperties: >>> + "^.*@[0-9a-f]+$": >>> + type: object >>> + >>> + properties: >>> + compatible: >>> + pattern: "^sdw[0-9][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" >> >> So is this a 64-bit value, as in the MIPI spec, or is this part of the >> _ADR description? > > Rob did not like encoding compatible string exactly like _ADR encoding. > > https://lkml.org/lkml/2019/8/22/490 Wondering if we are talking about different concepts? Rob's point was about the InstanceID "Assuming you could have more than 1 of the same device on the bus, then you need some way to distinguish them and the way that's done for DT is unit-address/reg. And compatible strings should be constant for each instance." You can use the MIPI encoding *except* for the InstanceID, that'd be fine. It'll just be a bit weird since the Slave device will report the 48 bits that include the Instance ID, so you'll have to special case this field, but if this is a DT requirement then fine. Rob's point does not apply to the link ID - which is used when you have multiple masters in your controller. The Slave device is attached in one location and will never move, so that is a constant value. > >> I also don't get why the first item in in base10? >> > > As this corresponds to Soundwire Version, and I have no visibility of > version number encoding after reaching number 9 in this field. > > This can be updated once we have more info on how the Version encoding > will look like in future. > > Idea of limiting regex to [0-9] for version is to enforce some checking! the version is a 4 bit value starting at 1 for SoundWire 1.0. There is nothing in the spec that talks about a limit to 9. It's unlikely we'll ever reach that but you are interpreting a spec here. plus just below you mention all fields as being hexadecimal. > > --srini > >> >>> + description: >>> + Is the textual representation of SoundWire Enumeration >>> + address. compatible string should contain SoundWire Version ID, >>> + Manufacturer ID, Part ID and Class ID in order and shall be in >>> + lower-case hexadecimal with leading zeroes. >>> + Valid sizes of these fields are >>> + Version ID is 1 nibble, number '0x1' represents SoundWire 1.0 >>> + and '0x2' represents SoundWire 1.1 and so on. >>> + MFD is 4 nibbles >>> + PID is 4 nibbles >>> + CID is 2 nibbles >>> + More Information on detail of encoding of these fields can be >>> + found in MIPI Alliance DisCo & SoundWire 1.0 Specifications. >>> + >>> + reg: >>> + maxItems: 1 >>> + description: >>> + Instance ID and Link ID of SoundWire Device Address. >>> + >>> + required: >>> + - compatible >>> + - reg >>> + >>> +examples: >>> + - | >>> + soundwire@c2d0000 { >>> + #address-cells = <2>; >>> + #size-cells = <0>; >>> + compatible = "qcom,soundwire-v1.5.0"; >>> + reg = <0x0c2d0000 0x2000>; >>> + >>> + speaker@1 { >>> + compatible = "sdw10217201000"; >>> + reg = <1 0>; >>> + }; >>> + >>> + speaker@2 { >>> + compatible = "sdw10217201000"; >>> + reg = <2 0>; >>> + }; >>> + }; >>> + >>> +... >>> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [alsa-devel] [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings 2019-08-23 16:44 ` Pierre-Louis Bossart @ 2019-08-24 9:28 ` Srinivas Kandagatla 2019-08-26 16:22 ` Pierre-Louis Bossart 0 siblings, 1 reply; 18+ messages in thread From: Srinivas Kandagatla @ 2019-08-24 9:28 UTC (permalink / raw) To: Pierre-Louis Bossart, broonie, robh+dt, vkoul Cc: devicetree, alsa-devel, bgoswami, spapothi, lgirdwood, linux-kernel On 23/08/2019 17:44, Pierre-Louis Bossart wrote: > > > On 8/23/19 10:57 AM, Srinivas Kandagatla wrote: >> >> >> On 23/08/2019 16:41, Pierre-Louis Bossart wrote: >>> >>> >>> On 8/22/19 6:37 PM, Srinivas Kandagatla wrote: >>>> This patch adds bindings for Soundwire Slave devices that includes how >>>> SoundWire enumeration address and Link ID are used to represented in >>>> SoundWire slave device tree nodes. >>>> >>>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >>>> --- >>>> .../soundwire/soundwire-controller.yaml | 75 >>>> +++++++++++++++++++ >>>> 1 file changed, 75 insertions(+) >>>> create mode 100644 >>>> Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>>> >>>> diff --git >>>> a/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>>> b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>>> new file mode 100644 >>>> index 000000000000..91aa6c6d6266 >>>> --- /dev/null >>>> +++ >>>> b/Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml >>>> @@ -0,0 +1,75 @@ >>>> +# SPDX-License-Identifier: GPL-2.0 >>>> +%YAML 1.2 >>>> +--- >>>> +$id: >>>> http://devicetree.org/schemas/soundwire/soundwire-controller.yaml# >>>> +$schema: http://devicetree.org/meta-schemas/core.yaml# >>>> + >>>> +title: SoundWire Controller Generic Binding >>>> + >>>> +maintainers: >>>> + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >>>> + >>>> +description: | >>>> + SoundWire busses can be described with a node for the SoundWire >>>> controller >>>> + device and a set of child nodes for each SoundWire slave on the bus. >>>> + >>>> +properties: >>>> + $nodename: >>>> + pattern: "^soundwire(@.*|-[0-9a-f])*$" > > re-reading this, it looks like you are defining the controller bindings, > but there are no real controller-level properties except for the fact > that they include slave bindings? > Yes, Each vendor specific master can have there specific properties here, this is just to represent how slave nodes represented w.r.t to master nodes. > In MIPI the notion of controller is that it can deal with multiple > links, each of which having specific properties (clock speed, clock stop > properties, etc). > >>>> + >>>> + "#address-cells": >>>> + const: 2 >>>> + >>>> + "#size-cells": >>>> + const: 0 >>>> + >>>> +patternProperties: >>>> + "^.*@[0-9a-f]+$": >>>> + type: object >>>> + >>>> + properties: >>>> + compatible: >>>> + pattern: "^sdw[0-9][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" >>> >>> So is this a 64-bit value, as in the MIPI spec, or is this part of >>> the _ADR description? >> >> Rob did not like encoding compatible string exactly like _ADR encoding. >> >> https://lkml.org/lkml/2019/8/22/490 > > Wondering if we are talking about different concepts? > > Rob's point was about the InstanceID > > "Assuming you could have more than 1 of the same device on the bus, > then you need some way to distinguish them and the way that's done for > DT is unit-address/reg. And compatible strings should be constant for > each instance." > > You can use the MIPI encoding *except* for the InstanceID, that'd be > fine. It'll just be a bit weird since the Slave device will report the > 48 bits that include the Instance ID, so you'll have to special case > this field, but if this is a DT requirement then fine. > > Rob's point does not apply to the link ID - which is used when you have > multiple masters in your controller. The Slave device is attached in one > location and will never move, so that is a constant value. Point is that this compatible is for slave device, it should not matter where and how the slave is connected, compatible should be constant irrespective of Link ID. Lets say for example if WSA881x slave device is connected to a single-Link Controller and the same device is connected to a MultiLink-controller then we would endup in more than one compatible string for WSA881x driver. From Disco Specic it clearly says that LinkID values are relative to the immediate parent Device. So having LinkID in compatible string is very fragile. > >> >>> I also don't get why the first item in in base10? >>> >> >> As this corresponds to Soundwire Version, and I have no visibility of >> version number encoding after reaching number 9 in this field. >> >> This can be updated once we have more info on how the Version encoding >> will look like in future. >> >> Idea of limiting regex to [0-9] for version is to enforce some checking! > > the version is a 4 bit value starting at 1 for SoundWire 1.0. There is > nothing in the spec that talks about a limit to 9. > > It's unlikely we'll ever reach that but you are interpreting a spec > here. plus just below you mention all fields as being hexadecimal. > Am happy to change this to pattern: "^sdw[0-9a-f][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" if you are okay with rest of the stuff. thanks, srini >> >> --srini >> >>> >>>> + description: >>>> + Is the textual representation of SoundWire Enumeration >>>> + address. compatible string should contain SoundWire Version ID, >>>> + Manufacturer ID, Part ID and Class ID in order and shall be in >>>> + lower-case hexadecimal with leading zeroes. >>>> + Valid sizes of these fields are >>>> + Version ID is 1 nibble, number '0x1' represents SoundWire 1.0 >>>> + and '0x2' represents SoundWire 1.1 and so on. >>>> + MFD is 4 nibbles >>>> + PID is 4 nibbles >>>> + CID is 2 nibbles >>>> + More Information on detail of encoding of these fields can be >>>> + found in MIPI Alliance DisCo & SoundWire 1.0 Specifications. >>>> + >>>> + reg: >>>> + maxItems: 1 >>>> + description: >>>> + Instance ID and Link ID of SoundWire Device Address. >>>> + >>>> + required: >>>> + - compatible >>>> + - reg >>>> + >>>> +examples: >>>> + - | >>>> + soundwire@c2d0000 { >>>> + #address-cells = <2>; >>>> + #size-cells = <0>; >>>> + compatible = "qcom,soundwire-v1.5.0"; >>>> + reg = <0x0c2d0000 0x2000>; >>>> + >>>> + speaker@1 { >>>> + compatible = "sdw10217201000"; >>>> + reg = <1 0>; >>>> + }; >>>> + >>>> + speaker@2 { >>>> + compatible = "sdw10217201000"; >>>> + reg = <2 0>; >>>> + }; >>>> + }; >>>> + >>>> +... >>>> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [alsa-devel] [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings 2019-08-24 9:28 ` Srinivas Kandagatla @ 2019-08-26 16:22 ` Pierre-Louis Bossart 2019-08-27 21:21 ` Srinivas Kandagatla 0 siblings, 1 reply; 18+ messages in thread From: Pierre-Louis Bossart @ 2019-08-26 16:22 UTC (permalink / raw) To: Srinivas Kandagatla, broonie, robh+dt, vkoul Cc: devicetree, alsa-devel, bgoswami, spapothi, lgirdwood, linux-kernel >>>>> +title: SoundWire Controller Generic Binding >>>>> + >>>>> +maintainers: >>>>> + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >>>>> + >>>>> +description: | >>>>> + SoundWire busses can be described with a node for the SoundWire >>>>> controller >>>>> + device and a set of child nodes for each SoundWire slave on the >>>>> bus. >>>>> + >>>>> +properties: >>>>> + $nodename: >>>>> + pattern: "^soundwire(@.*|-[0-9a-f])*$" >> >> re-reading this, it looks like you are defining the controller >> bindings, but there are no real controller-level properties except for >> the fact that they include slave bindings? >> > Yes, Each vendor specific master can have there specific properties > here, this is just to represent how slave nodes represented w.r.t to > master nodes. I am not clear on how a vendor would document those controller properties then? And the number of links doesn't seem like a vendor-specific definition, if you include the linkID in the register information below it'd help to known how many links can be enabled, which ones are used (if there is any pin-mux) and check if the configurations are correct. > >> In MIPI the notion of controller is that it can deal with multiple >> links, each of which having specific properties (clock speed, clock >> stop properties, etc). >> >>>>> + >>>>> + "#address-cells": >>>>> + const: 2 >>>>> + >>>>> + "#size-cells": >>>>> + const: 0 >>>>> + >>>>> +patternProperties: >>>>> + "^.*@[0-9a-f]+$": >>>>> + type: object >>>>> + >>>>> + properties: >>>>> + compatible: >>>>> + pattern: "^sdw[0-9][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" >>>> >>>> So is this a 64-bit value, as in the MIPI spec, or is this part of >>>> the _ADR description? >>> >>> Rob did not like encoding compatible string exactly like _ADR encoding. >>> >>> https://lkml.org/lkml/2019/8/22/490 >> >> Wondering if we are talking about different concepts? >> >> Rob's point was about the InstanceID >> >> "Assuming you could have more than 1 of the same device on the bus, >> then you need some way to distinguish them and the way that's done for >> DT is unit-address/reg. And compatible strings should be constant for >> each instance." >> >> You can use the MIPI encoding *except* for the InstanceID, that'd be >> fine. It'll just be a bit weird since the Slave device will report the >> 48 bits that include the Instance ID, so you'll have to special case >> this field, but if this is a DT requirement then fine. >> >> Rob's point does not apply to the link ID - which is used when you >> have multiple masters in your controller. The Slave device is attached >> in one location and will never move, so that is a constant value. > > Point is that this compatible is for slave device, it should not matter > where and how the slave is connected, compatible should be constant > irrespective of Link ID. > Lets say for example if WSA881x slave device is connected to a > single-Link Controller and the same device is connected to a > MultiLink-controller then we would endup in more than one compatible > string for WSA881x driver. > > > From Disco Specic it clearly says that LinkID values are relative > to the immediate parent Device. So having LinkID in compatible string is > very fragile. ok, fine then. > >> >>> >>>> I also don't get why the first item in in base10? >>>> >>> >>> As this corresponds to Soundwire Version, and I have no visibility of >>> version number encoding after reaching number 9 in this field. >>> >>> This can be updated once we have more info on how the Version >>> encoding will look like in future. >>> >>> Idea of limiting regex to [0-9] for version is to enforce some checking! >> >> the version is a 4 bit value starting at 1 for SoundWire 1.0. There is >> nothing in the spec that talks about a limit to 9. >> >> It's unlikely we'll ever reach that but you are interpreting a spec >> here. plus just below you mention all fields as being hexadecimal. >> > Am happy to change this to > > pattern: "^sdw[0-9a-f][0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$" > > if you are okay with rest of the stuff. yes, ok. > > thanks, > srini >>> >>> --srini >>> >>>> >>>>> + description: >>>>> + Is the textual representation of SoundWire Enumeration >>>>> + address. compatible string should contain SoundWire Version ID, >>>>> + Manufacturer ID, Part ID and Class ID in order and shall be in >>>>> + lower-case hexadecimal with leading zeroes. >>>>> + Valid sizes of these fields are >>>>> + Version ID is 1 nibble, number '0x1' represents SoundWire 1.0 >>>>> + and '0x2' represents SoundWire 1.1 and so on. >>>>> + MFD is 4 nibbles >>>>> + PID is 4 nibbles >>>>> + CID is 2 nibbles >>>>> + More Information on detail of encoding of these fields can be >>>>> + found in MIPI Alliance DisCo & SoundWire 1.0 Specifications. >>>>> + >>>>> + reg: >>>>> + maxItems: 1 >>>>> + description: >>>>> + Instance ID and Link ID of SoundWire Device Address. maybe put link first and make it clear that both are required. >>>>> + >>>>> + required: >>>>> + - compatible >>>>> + - reg >>>>> + >>>>> +examples: >>>>> + - | >>>>> + soundwire@c2d0000 { >>>>> + #address-cells = <2>; >>>>> + #size-cells = <0>; >>>>> + compatible = "qcom,soundwire-v1.5.0"; >>>>> + reg = <0x0c2d0000 0x2000>; >>>>> + >>>>> + speaker@1 { >>>>> + compatible = "sdw10217201000"; >>>>> + reg = <1 0>; >>>>> + }; >>>>> + >>>>> + speaker@2 { >>>>> + compatible = "sdw10217201000"; >>>>> + reg = <2 0>; >>>>> + }; >>>>> + }; >>>>> + >>>>> +... >>>>> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [alsa-devel] [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings 2019-08-26 16:22 ` Pierre-Louis Bossart @ 2019-08-27 21:21 ` Srinivas Kandagatla 0 siblings, 0 replies; 18+ messages in thread From: Srinivas Kandagatla @ 2019-08-27 21:21 UTC (permalink / raw) To: Pierre-Louis Bossart, broonie, robh+dt, vkoul Cc: devicetree, alsa-devel, bgoswami, spapothi, lgirdwood, linux-kernel On 26/08/2019 17:22, Pierre-Louis Bossart wrote: >>>>> >>>>>> + description: >>>>>> + Is the textual representation of SoundWire Enumeration >>>>>> + address. compatible string should contain SoundWire Version >>>>>> ID, >>>>>> + Manufacturer ID, Part ID and Class ID in order and shall be in >>>>>> + lower-case hexadecimal with leading zeroes. >>>>>> + Valid sizes of these fields are >>>>>> + Version ID is 1 nibble, number '0x1' represents SoundWire 1.0 >>>>>> + and '0x2' represents SoundWire 1.1 and so on. >>>>>> + MFD is 4 nibbles >>>>>> + PID is 4 nibbles >>>>>> + CID is 2 nibbles >>>>>> + More Information on detail of encoding of these fields can be >>>>>> + found in MIPI Alliance DisCo & SoundWire 1.0 Specifications. >>>>>> + >>>>>> + reg: >>>>>> + maxItems: 1 >>>>>> + description: >>>>>> + Instance ID and Link ID of SoundWire Device Address. > > maybe put link first and make it clear that both are required. Okay, I will give that a go in next version! thanks, srini ^ permalink raw reply [flat|nested] 18+ messages in thread
* [RESEND PATCH v4 2/4] soundwire: core: add device tree support for slave devices 2019-08-22 23:37 [RESEND PATCH v4 0/4] ASoC: codecs: Add WSA881x Smart Speaker amplifier support Srinivas Kandagatla 2019-08-22 23:37 ` [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings Srinivas Kandagatla @ 2019-08-22 23:37 ` Srinivas Kandagatla 2019-08-23 15:44 ` [alsa-devel] " Pierre-Louis Bossart 2019-08-22 23:37 ` [RESEND PATCH v4 3/4] dt-bindings: ASoC: Add WSA881x bindings Srinivas Kandagatla 2019-08-22 23:37 ` [RESEND PATCH v4 4/4] ASoC: codecs: add wsa881x amplifier support Srinivas Kandagatla 3 siblings, 1 reply; 18+ messages in thread From: Srinivas Kandagatla @ 2019-08-22 23:37 UTC (permalink / raw) To: broonie, robh+dt, vkoul Cc: spapothi, bgoswami, alsa-devel, linux-kernel, lgirdwood, devicetree, Srinivas Kandagatla This patch adds support to parsing device tree based SoundWire slave devices. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- drivers/soundwire/bus.c | 2 ++ drivers/soundwire/bus.h | 1 + drivers/soundwire/slave.c | 52 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 49f64b2115b9..c2eaeb5c38ed 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -77,6 +77,8 @@ int sdw_add_bus_master(struct sdw_bus *bus) */ if (IS_ENABLED(CONFIG_ACPI) && ACPI_HANDLE(bus->dev)) ret = sdw_acpi_find_slaves(bus); + else if (IS_ENABLED(CONFIG_OF) && bus->dev->of_node) + ret = sdw_of_find_slaves(bus); else ret = -ENOTSUPP; /* No ACPI/DT so error out */ diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h index 3048ca153f22..ee46befedbd1 100644 --- a/drivers/soundwire/bus.h +++ b/drivers/soundwire/bus.h @@ -15,6 +15,7 @@ static inline int sdw_acpi_find_slaves(struct sdw_bus *bus) } #endif +int sdw_of_find_slaves(struct sdw_bus *bus); void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id); diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c index f39a5815e25d..3ef265d2ee89 100644 --- a/drivers/soundwire/slave.c +++ b/drivers/soundwire/slave.c @@ -2,6 +2,7 @@ // Copyright(c) 2015-17 Intel Corporation. #include <linux/acpi.h> +#include <linux/of.h> #include <linux/soundwire/sdw.h> #include <linux/soundwire/sdw_type.h> #include "bus.h" @@ -35,6 +36,7 @@ static int sdw_slave_add(struct sdw_bus *bus, slave->dev.release = sdw_slave_release; slave->dev.bus = &sdw_bus_type; + slave->dev.of_node = of_node_get(to_of_node(fwnode)); slave->bus = bus; slave->status = SDW_SLAVE_UNATTACHED; slave->dev_num = 0; @@ -112,3 +114,53 @@ int sdw_acpi_find_slaves(struct sdw_bus *bus) } #endif + +/* + * sdw_of_find_slaves() - Find Slave devices in master device tree node + * @bus: SDW bus instance + * + * Scans Master DT node for SDW child Slave devices and registers it. + */ +int sdw_of_find_slaves(struct sdw_bus *bus) +{ + struct device *dev = bus->dev; + struct device_node *node; + + for_each_child_of_node(bus->dev->of_node, node) { + int link_id, sdw_version, ret, len; + const char *compat = NULL; + struct sdw_slave_id id; + const __be32 *addr; + + compat = of_get_property(node, "compatible", NULL); + if (!compat) + continue; + + ret = sscanf(compat, "sdw%01x%04hx%04hx%02hhx", &sdw_version, + &id.mfg_id, &id.part_id, &id.class_id); + + if (ret != 4) { + dev_err(dev, "Invalid compatible string found %s\n", + compat); + continue; + } + + addr = of_get_property(node, "reg", &len); + if (!addr || (len < 2 * sizeof(u32))) { + dev_err(dev, "Invalid Instance and Link ID\n"); + continue; + } + + id.unique_id = be32_to_cpup(addr++); + link_id = be32_to_cpup(addr); + id.sdw_version = sdw_version; + + /* Check for link_id match */ + if (link_id != bus->link_id) + continue; + + sdw_slave_add(bus, &id, of_fwnode_handle(node)); + } + + return 0; +} -- 2.21.0 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [alsa-devel] [RESEND PATCH v4 2/4] soundwire: core: add device tree support for slave devices 2019-08-22 23:37 ` [RESEND PATCH v4 2/4] soundwire: core: add device tree support for slave devices Srinivas Kandagatla @ 2019-08-23 15:44 ` Pierre-Louis Bossart 2019-08-23 15:47 ` Srinivas Kandagatla 0 siblings, 1 reply; 18+ messages in thread From: Pierre-Louis Bossart @ 2019-08-23 15:44 UTC (permalink / raw) To: Srinivas Kandagatla, broonie, robh+dt, vkoul Cc: devicetree, alsa-devel, bgoswami, spapothi, lgirdwood, linux-kernel On 8/22/19 6:37 PM, Srinivas Kandagatla wrote: > This patch adds support to parsing device tree based > SoundWire slave devices. > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > drivers/soundwire/bus.c | 2 ++ > drivers/soundwire/bus.h | 1 + > drivers/soundwire/slave.c | 52 +++++++++++++++++++++++++++++++++++++++ > 3 files changed, 55 insertions(+) > > diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c > index 49f64b2115b9..c2eaeb5c38ed 100644 > --- a/drivers/soundwire/bus.c > +++ b/drivers/soundwire/bus.c > @@ -77,6 +77,8 @@ int sdw_add_bus_master(struct sdw_bus *bus) > */ > if (IS_ENABLED(CONFIG_ACPI) && ACPI_HANDLE(bus->dev)) > ret = sdw_acpi_find_slaves(bus); > + else if (IS_ENABLED(CONFIG_OF) && bus->dev->of_node) > + ret = sdw_of_find_slaves(bus); > else > ret = -ENOTSUPP; /* No ACPI/DT so error out */ > > diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h > index 3048ca153f22..ee46befedbd1 100644 > --- a/drivers/soundwire/bus.h > +++ b/drivers/soundwire/bus.h > @@ -15,6 +15,7 @@ static inline int sdw_acpi_find_slaves(struct sdw_bus *bus) > } > #endif > > +int sdw_of_find_slaves(struct sdw_bus *bus); > void sdw_extract_slave_id(struct sdw_bus *bus, > u64 addr, struct sdw_slave_id *id); > > diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c > index f39a5815e25d..3ef265d2ee89 100644 > --- a/drivers/soundwire/slave.c > +++ b/drivers/soundwire/slave.c > @@ -2,6 +2,7 @@ > // Copyright(c) 2015-17 Intel Corporation. > > #include <linux/acpi.h> > +#include <linux/of.h> > #include <linux/soundwire/sdw.h> > #include <linux/soundwire/sdw_type.h> > #include "bus.h" > @@ -35,6 +36,7 @@ static int sdw_slave_add(struct sdw_bus *bus, > > slave->dev.release = sdw_slave_release; > slave->dev.bus = &sdw_bus_type; > + slave->dev.of_node = of_node_get(to_of_node(fwnode)); > slave->bus = bus; > slave->status = SDW_SLAVE_UNATTACHED; > slave->dev_num = 0; > @@ -112,3 +114,53 @@ int sdw_acpi_find_slaves(struct sdw_bus *bus) > } > > #endif > + > +/* > + * sdw_of_find_slaves() - Find Slave devices in master device tree node > + * @bus: SDW bus instance > + * > + * Scans Master DT node for SDW child Slave devices and registers it. > + */ > +int sdw_of_find_slaves(struct sdw_bus *bus) > +{ > + struct device *dev = bus->dev; > + struct device_node *node; > + > + for_each_child_of_node(bus->dev->of_node, node) { > + int link_id, sdw_version, ret, len; > + const char *compat = NULL; > + struct sdw_slave_id id; > + const __be32 *addr; > + > + compat = of_get_property(node, "compatible", NULL); > + if (!compat) > + continue; > + > + ret = sscanf(compat, "sdw%01x%04hx%04hx%02hhx", &sdw_version, > + &id.mfg_id, &id.part_id, &id.class_id); > + > + if (ret != 4) { > + dev_err(dev, "Invalid compatible string found %s\n", > + compat); > + continue; > + } > + > + addr = of_get_property(node, "reg", &len); > + if (!addr || (len < 2 * sizeof(u32))) { > + dev_err(dev, "Invalid Instance and Link ID\n"); > + continue; > + } > + > + id.unique_id = be32_to_cpup(addr++); > + link_id = be32_to_cpup(addr); So here the link ID is obviously not in the address, so you are not using the MIPI spec as we discussed initially? > + id.sdw_version = sdw_version; > + > + /* Check for link_id match */ > + if (link_id != bus->link_id) > + continue; > + > + sdw_slave_add(bus, &id, of_fwnode_handle(node)); > + } > + > + return 0; > +} > ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [alsa-devel] [RESEND PATCH v4 2/4] soundwire: core: add device tree support for slave devices 2019-08-23 15:44 ` [alsa-devel] " Pierre-Louis Bossart @ 2019-08-23 15:47 ` Srinivas Kandagatla 0 siblings, 0 replies; 18+ messages in thread From: Srinivas Kandagatla @ 2019-08-23 15:47 UTC (permalink / raw) To: Pierre-Louis Bossart, broonie, robh+dt, vkoul Cc: devicetree, alsa-devel, bgoswami, spapothi, lgirdwood, linux-kernel On 23/08/2019 16:44, Pierre-Louis Bossart wrote: > > > On 8/22/19 6:37 PM, Srinivas Kandagatla wrote: >> This patch adds support to parsing device tree based >> SoundWire slave devices. >> >> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >> --- >> drivers/soundwire/bus.c | 2 ++ >> drivers/soundwire/bus.h | 1 + >> drivers/soundwire/slave.c | 52 +++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 55 insertions(+) >> >> diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c >> index 49f64b2115b9..c2eaeb5c38ed 100644 >> --- a/drivers/soundwire/bus.c >> +++ b/drivers/soundwire/bus.c >> @@ -77,6 +77,8 @@ int sdw_add_bus_master(struct sdw_bus *bus) >> */ >> if (IS_ENABLED(CONFIG_ACPI) && ACPI_HANDLE(bus->dev)) >> ret = sdw_acpi_find_slaves(bus); >> + else if (IS_ENABLED(CONFIG_OF) && bus->dev->of_node) >> + ret = sdw_of_find_slaves(bus); >> else >> ret = -ENOTSUPP; /* No ACPI/DT so error out */ >> diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h >> index 3048ca153f22..ee46befedbd1 100644 >> --- a/drivers/soundwire/bus.h >> +++ b/drivers/soundwire/bus.h >> @@ -15,6 +15,7 @@ static inline int sdw_acpi_find_slaves(struct >> sdw_bus *bus) >> } >> #endif >> +int sdw_of_find_slaves(struct sdw_bus *bus); >> void sdw_extract_slave_id(struct sdw_bus *bus, >> u64 addr, struct sdw_slave_id *id); >> diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c >> index f39a5815e25d..3ef265d2ee89 100644 >> --- a/drivers/soundwire/slave.c >> +++ b/drivers/soundwire/slave.c >> @@ -2,6 +2,7 @@ >> // Copyright(c) 2015-17 Intel Corporation. >> #include <linux/acpi.h> >> +#include <linux/of.h> >> #include <linux/soundwire/sdw.h> >> #include <linux/soundwire/sdw_type.h> >> #include "bus.h" >> @@ -35,6 +36,7 @@ static int sdw_slave_add(struct sdw_bus *bus, >> slave->dev.release = sdw_slave_release; >> slave->dev.bus = &sdw_bus_type; >> + slave->dev.of_node = of_node_get(to_of_node(fwnode)); >> slave->bus = bus; >> slave->status = SDW_SLAVE_UNATTACHED; >> slave->dev_num = 0; >> @@ -112,3 +114,53 @@ int sdw_acpi_find_slaves(struct sdw_bus *bus) >> } >> #endif >> + >> +/* >> + * sdw_of_find_slaves() - Find Slave devices in master device tree node >> + * @bus: SDW bus instance >> + * >> + * Scans Master DT node for SDW child Slave devices and registers it. >> + */ >> +int sdw_of_find_slaves(struct sdw_bus *bus) >> +{ >> + struct device *dev = bus->dev; >> + struct device_node *node; >> + >> + for_each_child_of_node(bus->dev->of_node, node) { >> + int link_id, sdw_version, ret, len; >> + const char *compat = NULL; >> + struct sdw_slave_id id; >> + const __be32 *addr; >> + >> + compat = of_get_property(node, "compatible", NULL); >> + if (!compat) >> + continue; >> + >> + ret = sscanf(compat, "sdw%01x%04hx%04hx%02hhx", &sdw_version, >> + &id.mfg_id, &id.part_id, &id.class_id); >> + >> + if (ret != 4) { >> + dev_err(dev, "Invalid compatible string found %s\n", >> + compat); >> + continue; >> + } >> + >> + addr = of_get_property(node, "reg", &len); >> + if (!addr || (len < 2 * sizeof(u32))) { >> + dev_err(dev, "Invalid Instance and Link ID\n"); >> + continue; >> + } >> + >> + id.unique_id = be32_to_cpup(addr++); >> + link_id = be32_to_cpup(addr); > > So here the link ID is obviously not in the address, so you are not > using the MIPI spec as we discussed initially? No, Rob rejected that approach (https://lkml.org/lkml/2019/8/22/490) with the fact that compatible string should be constant for each instance. --srini > >> + id.sdw_version = sdw_version; >> + >> + /* Check for link_id match */ >> + if (link_id != bus->link_id) >> + continue; >> + >> + sdw_slave_add(bus, &id, of_fwnode_handle(node)); >> + } >> + >> + return 0; >> +} >> ^ permalink raw reply [flat|nested] 18+ messages in thread
* [RESEND PATCH v4 3/4] dt-bindings: ASoC: Add WSA881x bindings 2019-08-22 23:37 [RESEND PATCH v4 0/4] ASoC: codecs: Add WSA881x Smart Speaker amplifier support Srinivas Kandagatla 2019-08-22 23:37 ` [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings Srinivas Kandagatla 2019-08-22 23:37 ` [RESEND PATCH v4 2/4] soundwire: core: add device tree support for slave devices Srinivas Kandagatla @ 2019-08-22 23:37 ` Srinivas Kandagatla 2019-08-27 12:20 ` Rob Herring 2019-08-22 23:37 ` [RESEND PATCH v4 4/4] ASoC: codecs: add wsa881x amplifier support Srinivas Kandagatla 3 siblings, 1 reply; 18+ messages in thread From: Srinivas Kandagatla @ 2019-08-22 23:37 UTC (permalink / raw) To: broonie, robh+dt, vkoul Cc: spapothi, bgoswami, alsa-devel, linux-kernel, lgirdwood, devicetree, Srinivas Kandagatla This patch adds bindings for WSA8810/WSA8815 Class-D Smart Speaker Amplifier. This Amplifier also has a simple thermal sensor for over temperature and speaker protection. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- .../bindings/sound/qcom,wsa881x.yaml | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml diff --git a/Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml b/Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml new file mode 100644 index 000000000000..ad718d75c660 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml @@ -0,0 +1,44 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,wsa881x.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Bindings for Qualcomm WSA8810/WSA8815 Class-D Smart Speaker Amplifier + +maintainers: + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> + +allOf: + - $ref: "soundwire-controller.yaml#" + +properties: + compatible: + const: sdw10217201000 + + reg: + maxItems: 1 + + pd-gpios: + description: GPIO spec for Powerdown/Shutdown line to use + maxItems: 1 + + "#thermal-sensor-cells": + const: 0 + +required: + - compatible + - reg + - pd-gpios + - #thermal-sensor-cells + +examples: + - | + efuse@1c23800 { + compatible = "allwinner,sun4i-a10-sid"; + reg = <0x01c23800 0x10>; + pd-gpios = <&wcdpinctrl 2 0>; + #thermal-sensor-cells = <0>; + }; + +... -- 2.21.0 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [RESEND PATCH v4 3/4] dt-bindings: ASoC: Add WSA881x bindings 2019-08-22 23:37 ` [RESEND PATCH v4 3/4] dt-bindings: ASoC: Add WSA881x bindings Srinivas Kandagatla @ 2019-08-27 12:20 ` Rob Herring 2019-08-27 20:25 ` Srinivas Kandagatla 0 siblings, 1 reply; 18+ messages in thread From: Rob Herring @ 2019-08-27 12:20 UTC (permalink / raw) To: Srinivas Kandagatla Cc: Mark Brown, Vinod, spapothi, Banajit Goswami, Linux-ALSA, linux-kernel, Liam Girdwood, devicetree On Thu, Aug 22, 2019 at 6:38 PM Srinivas Kandagatla <srinivas.kandagatla@linaro.org> wrote: > > This patch adds bindings for WSA8810/WSA8815 Class-D Smart Speaker > Amplifier. This Amplifier also has a simple thermal sensor for > over temperature and speaker protection. > > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > .../bindings/sound/qcom,wsa881x.yaml | 44 +++++++++++++++++++ > 1 file changed, 44 insertions(+) > create mode 100644 Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml > > diff --git a/Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml b/Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml > new file mode 100644 > index 000000000000..ad718d75c660 > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml > @@ -0,0 +1,44 @@ > +# SPDX-License-Identifier: GPL-2.0 > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/sound/qcom,wsa881x.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Bindings for Qualcomm WSA8810/WSA8815 Class-D Smart Speaker Amplifier > + > +maintainers: > + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > + > +allOf: > + - $ref: "soundwire-controller.yaml#" This is not the controller, so this should not be included here. You should get lots of warnings from doing so. You did run 'make dt_binding_check', right? > + > +properties: > + compatible: > + const: sdw10217201000 > + > + reg: > + maxItems: 1 > + > + pd-gpios: powerdown-gpios is the standard name. > + description: GPIO spec for Powerdown/Shutdown line to use > + maxItems: 1 > + > + "#thermal-sensor-cells": > + const: 0 > + > +required: > + - compatible > + - reg > + - pd-gpios > + - #thermal-sensor-cells > + > +examples: > + - | > + efuse@1c23800 { > + compatible = "allwinner,sun4i-a10-sid"; Huh? > + reg = <0x01c23800 0x10>; > + pd-gpios = <&wcdpinctrl 2 0>; > + #thermal-sensor-cells = <0>; > + }; > + > +... > -- > 2.21.0 > ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [RESEND PATCH v4 3/4] dt-bindings: ASoC: Add WSA881x bindings 2019-08-27 12:20 ` Rob Herring @ 2019-08-27 20:25 ` Srinivas Kandagatla 0 siblings, 0 replies; 18+ messages in thread From: Srinivas Kandagatla @ 2019-08-27 20:25 UTC (permalink / raw) To: Rob Herring Cc: Mark Brown, Vinod, spapothi, Banajit Goswami, Linux-ALSA, linux-kernel, Liam Girdwood, devicetree Thanks for taking time to review! On 27/08/2019 13:20, Rob Herring wrote: > On Thu, Aug 22, 2019 at 6:38 PM Srinivas Kandagatla > <srinivas.kandagatla@linaro.org> wrote: >> >> This patch adds bindings for WSA8810/WSA8815 Class-D Smart Speaker >> Amplifier. This Amplifier also has a simple thermal sensor for >> over temperature and speaker protection. >> >> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >> --- >> .../bindings/sound/qcom,wsa881x.yaml | 44 +++++++++++++++++++ >> 1 file changed, 44 insertions(+) >> create mode 100644 Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml >> >> diff --git a/Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml b/Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml >> new file mode 100644 >> index 000000000000..ad718d75c660 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml >> @@ -0,0 +1,44 @@ >> +# SPDX-License-Identifier: GPL-2.0 >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/sound/qcom,wsa881x.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Bindings for Qualcomm WSA8810/WSA8815 Class-D Smart Speaker Amplifier >> + >> +maintainers: >> + - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >> + >> +allOf: >> + - $ref: "soundwire-controller.yaml#" > > This is not the controller, so this should not be included here. You > should get lots of warnings from doing so. You did run 'make > dt_binding_check', right? no, I was not aware of this command! will run that before sending next version. > >> + >> +properties: >> + compatible: >> + const: sdw10217201000 >> + >> + reg: >> + maxItems: 1 >> + >> + pd-gpios: > > powerdown-gpios is the standard name. > sounds good to me, will change this in next version! >> + description: GPIO spec for Powerdown/Shutdown line to use >> + maxItems: 1 >> + >> + "#thermal-sensor-cells": >> + const: 0 >> + >> +required: >> + - compatible >> + - reg >> + - pd-gpios >> + - #thermal-sensor-cells >> + >> +examples: >> + - | >> + efuse@1c23800 { >> + compatible = "allwinner,sun4i-a10-sid"; > > Huh? Opps! copy paste bugs!!! :-) > >> + reg = <0x01c23800 0x10>; >> + pd-gpios = <&wcdpinctrl 2 0>; >> + #thermal-sensor-cells = <0>; >> + }; >> + >> +... >> -- >> 2.21.0 >> ^ permalink raw reply [flat|nested] 18+ messages in thread
* [RESEND PATCH v4 4/4] ASoC: codecs: add wsa881x amplifier support 2019-08-22 23:37 [RESEND PATCH v4 0/4] ASoC: codecs: Add WSA881x Smart Speaker amplifier support Srinivas Kandagatla ` (2 preceding siblings ...) 2019-08-22 23:37 ` [RESEND PATCH v4 3/4] dt-bindings: ASoC: Add WSA881x bindings Srinivas Kandagatla @ 2019-08-22 23:37 ` Srinivas Kandagatla 3 siblings, 0 replies; 18+ messages in thread From: Srinivas Kandagatla @ 2019-08-22 23:37 UTC (permalink / raw) To: broonie, robh+dt, vkoul Cc: spapothi, bgoswami, alsa-devel, linux-kernel, lgirdwood, devicetree, Srinivas Kandagatla This patch adds support to WSA8810/WSA8815 Class-D Smart Speaker Amplifier. This Amplifier is primarily interfaced with SoundWire. One WSA is used for mono speaker configuration and second one would give stereo setup. This patch is tested on SDM845 based DragonBoard DB845c. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- sound/soc/codecs/Kconfig | 10 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wsa881x.c | 1134 ++++++++++++++++++++++++++++++++++++ 3 files changed, 1146 insertions(+) create mode 100644 sound/soc/codecs/wsa881x.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 89238343e34d..9f8fa1016d22 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -203,6 +203,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_UDA134X select SND_SOC_UDA1380 if I2C select SND_SOC_WCD9335 if SLIMBUS + select SND_SOC_WSA881X if SOUNDWIRE select SND_SOC_WL1273 if MFD_WL1273_CORE select SND_SOC_WM0010 if SPI_MASTER select SND_SOC_WM1250_EV1 if I2C @@ -1233,6 +1234,15 @@ config SND_SOC_WCD9335 Qualcomm Technologies, Inc. (QTI) multimedia solutions, including the MSM8996, MSM8976, and MSM8956 chipsets. +config SND_SOC_WSA881X + tristate "WSA881X Codec" + depends on SOUNDWIRE + select REGMAP_SOUNDWIRE + tristate + help + This enables support for Qualcomm WSA8810/WSA8815 Class-D + Smart Speaker Amplifier. + config SND_SOC_WL1273 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index c498373dcc5f..ab07becf31f8 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -216,6 +216,7 @@ snd-soc-uda1334-objs := uda1334.o snd-soc-uda134x-objs := uda134x.o snd-soc-uda1380-objs := uda1380.o snd-soc-wcd9335-objs := wcd-clsh-v2.o wcd9335.o +snd-soc-wsa881x-objs := wsa881x.o snd-soc-wl1273-objs := wl1273.o snd-soc-wm-adsp-objs := wm_adsp.o snd-soc-wm0010-objs := wm0010.o @@ -499,6 +500,7 @@ obj-$(CONFIG_SND_SOC_UDA1334) += snd-soc-uda1334.o obj-$(CONFIG_SND_SOC_UDA134X) += snd-soc-uda134x.o obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o obj-$(CONFIG_SND_SOC_WCD9335) += snd-soc-wcd9335.o +obj-$(CONFIG_SND_SOC_WSA881X) += snd-soc-wsa881x.o obj-$(CONFIG_SND_SOC_WL1273) += snd-soc-wl1273.o obj-$(CONFIG_SND_SOC_WM0010) += snd-soc-wm0010.o obj-$(CONFIG_SND_SOC_WM1250_EV1) += snd-soc-wm1250-ev1.o diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c new file mode 100644 index 000000000000..82bcfb932c2c --- /dev/null +++ b/sound/soc/codecs/wsa881x.c @@ -0,0 +1,1134 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2015-2017, The Linux Foundation. +// Copyright (c) 2019, Linaro Limited + +#include <linux/bitops.h> +#include <linux/gpio.h> +#include <linux/gpio/consumer.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_gpio.h> +#include <linux/regmap.h> +#include <linux/slab.h> +#include <linux/soundwire/sdw.h> +#include <linux/soundwire/sdw_registers.h> +#include <linux/soundwire/sdw_type.h> +#include <sound/soc.h> +#include <sound/tlv.h> + +#define WSA881X_DIGITAL_BASE 0x3000 +#define WSA881X_ANALOG_BASE 0x3100 + +/* Digital register address space */ +#define WSA881X_CHIP_ID0 (WSA881X_DIGITAL_BASE + 0x0000) +#define WSA881X_CHIP_ID1 (WSA881X_DIGITAL_BASE + 0x0001) +#define WSA881X_CHIP_ID2 (WSA881X_DIGITAL_BASE + 0x0002) +#define WSA881X_CHIP_ID3 (WSA881X_DIGITAL_BASE + 0x0003) +#define WSA881X_BUS_ID (WSA881X_DIGITAL_BASE + 0x0004) +#define WSA881X_CDC_RST_CTL (WSA881X_DIGITAL_BASE + 0x0005) +#define WSA881X_CDC_TOP_CLK_CTL (WSA881X_DIGITAL_BASE + 0x0006) +#define WSA881X_CDC_ANA_CLK_CTL (WSA881X_DIGITAL_BASE + 0x0007) +#define WSA881X_CDC_DIG_CLK_CTL (WSA881X_DIGITAL_BASE + 0x0008) +#define WSA881X_CLOCK_CONFIG (WSA881X_DIGITAL_BASE + 0x0009) +#define WSA881X_ANA_CTL (WSA881X_DIGITAL_BASE + 0x000A) +#define WSA881X_SWR_RESET_EN (WSA881X_DIGITAL_BASE + 0x000B) +#define WSA881X_RESET_CTL (WSA881X_DIGITAL_BASE + 0x000C) +#define WSA881X_TADC_VALUE_CTL (WSA881X_DIGITAL_BASE + 0x000F) +#define WSA881X_TEMP_DETECT_CTL (WSA881X_DIGITAL_BASE + 0x0010) +#define WSA881X_TEMP_MSB (WSA881X_DIGITAL_BASE + 0x0011) +#define WSA881X_TEMP_LSB (WSA881X_DIGITAL_BASE + 0x0012) +#define WSA881X_TEMP_CONFIG0 (WSA881X_DIGITAL_BASE + 0x0013) +#define WSA881X_TEMP_CONFIG1 (WSA881X_DIGITAL_BASE + 0x0014) +#define WSA881X_CDC_CLIP_CTL (WSA881X_DIGITAL_BASE + 0x0015) +#define WSA881X_SDM_PDM9_LSB (WSA881X_DIGITAL_BASE + 0x0016) +#define WSA881X_SDM_PDM9_MSB (WSA881X_DIGITAL_BASE + 0x0017) +#define WSA881X_CDC_RX_CTL (WSA881X_DIGITAL_BASE + 0x0018) +#define WSA881X_DEM_BYPASS_DATA0 (WSA881X_DIGITAL_BASE + 0x0019) +#define WSA881X_DEM_BYPASS_DATA1 (WSA881X_DIGITAL_BASE + 0x001A) +#define WSA881X_DEM_BYPASS_DATA2 (WSA881X_DIGITAL_BASE + 0x001B) +#define WSA881X_DEM_BYPASS_DATA3 (WSA881X_DIGITAL_BASE + 0x001C) +#define WSA881X_OTP_CTRL0 (WSA881X_DIGITAL_BASE + 0x001D) +#define WSA881X_OTP_CTRL1 (WSA881X_DIGITAL_BASE + 0x001E) +#define WSA881X_HDRIVE_CTL_GROUP1 (WSA881X_DIGITAL_BASE + 0x001F) +#define WSA881X_INTR_MODE (WSA881X_DIGITAL_BASE + 0x0020) +#define WSA881X_INTR_MASK (WSA881X_DIGITAL_BASE + 0x0021) +#define WSA881X_INTR_STATUS (WSA881X_DIGITAL_BASE + 0x0022) +#define WSA881X_INTR_CLEAR (WSA881X_DIGITAL_BASE + 0x0023) +#define WSA881X_INTR_LEVEL (WSA881X_DIGITAL_BASE + 0x0024) +#define WSA881X_INTR_SET (WSA881X_DIGITAL_BASE + 0x0025) +#define WSA881X_INTR_TEST (WSA881X_DIGITAL_BASE + 0x0026) +#define WSA881X_PDM_TEST_MODE (WSA881X_DIGITAL_BASE + 0x0030) +#define WSA881X_ATE_TEST_MODE (WSA881X_DIGITAL_BASE + 0x0031) +#define WSA881X_PIN_CTL_MODE (WSA881X_DIGITAL_BASE + 0x0032) +#define WSA881X_PIN_CTL_OE (WSA881X_DIGITAL_BASE + 0x0033) +#define WSA881X_PIN_WDATA_IOPAD (WSA881X_DIGITAL_BASE + 0x0034) +#define WSA881X_PIN_STATUS (WSA881X_DIGITAL_BASE + 0x0035) +#define WSA881X_DIG_DEBUG_MODE (WSA881X_DIGITAL_BASE + 0x0037) +#define WSA881X_DIG_DEBUG_SEL (WSA881X_DIGITAL_BASE + 0x0038) +#define WSA881X_DIG_DEBUG_EN (WSA881X_DIGITAL_BASE + 0x0039) +#define WSA881X_SWR_HM_TEST1 (WSA881X_DIGITAL_BASE + 0x003B) +#define WSA881X_SWR_HM_TEST2 (WSA881X_DIGITAL_BASE + 0x003C) +#define WSA881X_TEMP_DETECT_DBG_CTL (WSA881X_DIGITAL_BASE + 0x003D) +#define WSA881X_TEMP_DEBUG_MSB (WSA881X_DIGITAL_BASE + 0x003E) +#define WSA881X_TEMP_DEBUG_LSB (WSA881X_DIGITAL_BASE + 0x003F) +#define WSA881X_SAMPLE_EDGE_SEL (WSA881X_DIGITAL_BASE + 0x0044) +#define WSA881X_IOPAD_CTL (WSA881X_DIGITAL_BASE + 0x0045) +#define WSA881X_SPARE_0 (WSA881X_DIGITAL_BASE + 0x0050) +#define WSA881X_SPARE_1 (WSA881X_DIGITAL_BASE + 0x0051) +#define WSA881X_SPARE_2 (WSA881X_DIGITAL_BASE + 0x0052) +#define WSA881X_OTP_REG_0 (WSA881X_DIGITAL_BASE + 0x0080) +#define WSA881X_OTP_REG_1 (WSA881X_DIGITAL_BASE + 0x0081) +#define WSA881X_OTP_REG_2 (WSA881X_DIGITAL_BASE + 0x0082) +#define WSA881X_OTP_REG_3 (WSA881X_DIGITAL_BASE + 0x0083) +#define WSA881X_OTP_REG_4 (WSA881X_DIGITAL_BASE + 0x0084) +#define WSA881X_OTP_REG_5 (WSA881X_DIGITAL_BASE + 0x0085) +#define WSA881X_OTP_REG_6 (WSA881X_DIGITAL_BASE + 0x0086) +#define WSA881X_OTP_REG_7 (WSA881X_DIGITAL_BASE + 0x0087) +#define WSA881X_OTP_REG_8 (WSA881X_DIGITAL_BASE + 0x0088) +#define WSA881X_OTP_REG_9 (WSA881X_DIGITAL_BASE + 0x0089) +#define WSA881X_OTP_REG_10 (WSA881X_DIGITAL_BASE + 0x008A) +#define WSA881X_OTP_REG_11 (WSA881X_DIGITAL_BASE + 0x008B) +#define WSA881X_OTP_REG_12 (WSA881X_DIGITAL_BASE + 0x008C) +#define WSA881X_OTP_REG_13 (WSA881X_DIGITAL_BASE + 0x008D) +#define WSA881X_OTP_REG_14 (WSA881X_DIGITAL_BASE + 0x008E) +#define WSA881X_OTP_REG_15 (WSA881X_DIGITAL_BASE + 0x008F) +#define WSA881X_OTP_REG_16 (WSA881X_DIGITAL_BASE + 0x0090) +#define WSA881X_OTP_REG_17 (WSA881X_DIGITAL_BASE + 0x0091) +#define WSA881X_OTP_REG_18 (WSA881X_DIGITAL_BASE + 0x0092) +#define WSA881X_OTP_REG_19 (WSA881X_DIGITAL_BASE + 0x0093) +#define WSA881X_OTP_REG_20 (WSA881X_DIGITAL_BASE + 0x0094) +#define WSA881X_OTP_REG_21 (WSA881X_DIGITAL_BASE + 0x0095) +#define WSA881X_OTP_REG_22 (WSA881X_DIGITAL_BASE + 0x0096) +#define WSA881X_OTP_REG_23 (WSA881X_DIGITAL_BASE + 0x0097) +#define WSA881X_OTP_REG_24 (WSA881X_DIGITAL_BASE + 0x0098) +#define WSA881X_OTP_REG_25 (WSA881X_DIGITAL_BASE + 0x0099) +#define WSA881X_OTP_REG_26 (WSA881X_DIGITAL_BASE + 0x009A) +#define WSA881X_OTP_REG_27 (WSA881X_DIGITAL_BASE + 0x009B) +#define WSA881X_OTP_REG_28 (WSA881X_DIGITAL_BASE + 0x009C) +#define WSA881X_OTP_REG_29 (WSA881X_DIGITAL_BASE + 0x009D) +#define WSA881X_OTP_REG_30 (WSA881X_DIGITAL_BASE + 0x009E) +#define WSA881X_OTP_REG_31 (WSA881X_DIGITAL_BASE + 0x009F) +#define WSA881X_OTP_REG_63 (WSA881X_DIGITAL_BASE + 0x00BF) + +/* Analog Register address space */ +#define WSA881X_BIAS_REF_CTRL (WSA881X_ANALOG_BASE + 0x0000) +#define WSA881X_BIAS_TEST (WSA881X_ANALOG_BASE + 0x0001) +#define WSA881X_BIAS_BIAS (WSA881X_ANALOG_BASE + 0x0002) +#define WSA881X_TEMP_OP (WSA881X_ANALOG_BASE + 0x0003) +#define WSA881X_TEMP_IREF_CTRL (WSA881X_ANALOG_BASE + 0x0004) +#define WSA881X_TEMP_ISENS_CTRL (WSA881X_ANALOG_BASE + 0x0005) +#define WSA881X_TEMP_CLK_CTRL (WSA881X_ANALOG_BASE + 0x0006) +#define WSA881X_TEMP_TEST (WSA881X_ANALOG_BASE + 0x0007) +#define WSA881X_TEMP_BIAS (WSA881X_ANALOG_BASE + 0x0008) +#define WSA881X_TEMP_ADC_CTRL (WSA881X_ANALOG_BASE + 0x0009) +#define WSA881X_TEMP_DOUT_MSB (WSA881X_ANALOG_BASE + 0x000A) +#define WSA881X_TEMP_DOUT_LSB (WSA881X_ANALOG_BASE + 0x000B) +#define WSA881X_ADC_EN_MODU_V (WSA881X_ANALOG_BASE + 0x0010) +#define WSA881X_ADC_EN_MODU_I (WSA881X_ANALOG_BASE + 0x0011) +#define WSA881X_ADC_EN_DET_TEST_V (WSA881X_ANALOG_BASE + 0x0012) +#define WSA881X_ADC_EN_DET_TEST_I (WSA881X_ANALOG_BASE + 0x0013) +#define WSA881X_ADC_SEL_IBIAS (WSA881X_ANALOG_BASE + 0x0014) +#define WSA881X_ADC_EN_SEL_IBAIS (WSA881X_ANALOG_BASE + 0x0015) +#define WSA881X_SPKR_DRV_EN (WSA881X_ANALOG_BASE + 0x001A) +#define WSA881X_SPKR_DRV_GAIN (WSA881X_ANALOG_BASE + 0x001B) +#define WSA881X_SPKR_DAC_CTL (WSA881X_ANALOG_BASE + 0x001C) +#define WSA881X_SPKR_DRV_DBG (WSA881X_ANALOG_BASE + 0x001D) +#define WSA881X_SPKR_PWRSTG_DBG (WSA881X_ANALOG_BASE + 0x001E) +#define WSA881X_SPKR_OCP_CTL (WSA881X_ANALOG_BASE + 0x001F) +#define WSA881X_SPKR_CLIP_CTL (WSA881X_ANALOG_BASE + 0x0020) +#define WSA881X_SPKR_BBM_CTL (WSA881X_ANALOG_BASE + 0x0021) +#define WSA881X_SPKR_MISC_CTL1 (WSA881X_ANALOG_BASE + 0x0022) +#define WSA881X_SPKR_MISC_CTL2 (WSA881X_ANALOG_BASE + 0x0023) +#define WSA881X_SPKR_BIAS_INT (WSA881X_ANALOG_BASE + 0x0024) +#define WSA881X_SPKR_PA_INT (WSA881X_ANALOG_BASE + 0x0025) +#define WSA881X_SPKR_BIAS_CAL (WSA881X_ANALOG_BASE + 0x0026) +#define WSA881X_SPKR_BIAS_PSRR (WSA881X_ANALOG_BASE + 0x0027) +#define WSA881X_SPKR_STATUS1 (WSA881X_ANALOG_BASE + 0x0028) +#define WSA881X_SPKR_STATUS2 (WSA881X_ANALOG_BASE + 0x0029) +#define WSA881X_BOOST_EN_CTL (WSA881X_ANALOG_BASE + 0x002A) +#define WSA881X_BOOST_CURRENT_LIMIT (WSA881X_ANALOG_BASE + 0x002B) +#define WSA881X_BOOST_PS_CTL (WSA881X_ANALOG_BASE + 0x002C) +#define WSA881X_BOOST_PRESET_OUT1 (WSA881X_ANALOG_BASE + 0x002D) +#define WSA881X_BOOST_PRESET_OUT2 (WSA881X_ANALOG_BASE + 0x002E) +#define WSA881X_BOOST_FORCE_OUT (WSA881X_ANALOG_BASE + 0x002F) +#define WSA881X_BOOST_LDO_PROG (WSA881X_ANALOG_BASE + 0x0030) +#define WSA881X_BOOST_SLOPE_COMP_ISENSE_FB (WSA881X_ANALOG_BASE + 0x0031) +#define WSA881X_BOOST_RON_CTL (WSA881X_ANALOG_BASE + 0x0032) +#define WSA881X_BOOST_LOOP_STABILITY (WSA881X_ANALOG_BASE + 0x0033) +#define WSA881X_BOOST_ZX_CTL (WSA881X_ANALOG_BASE + 0x0034) +#define WSA881X_BOOST_START_CTL (WSA881X_ANALOG_BASE + 0x0035) +#define WSA881X_BOOST_MISC1_CTL (WSA881X_ANALOG_BASE + 0x0036) +#define WSA881X_BOOST_MISC2_CTL (WSA881X_ANALOG_BASE + 0x0037) +#define WSA881X_BOOST_MISC3_CTL (WSA881X_ANALOG_BASE + 0x0038) +#define WSA881X_BOOST_ATEST_CTL (WSA881X_ANALOG_BASE + 0x0039) +#define WSA881X_SPKR_PROT_FE_GAIN (WSA881X_ANALOG_BASE + 0x003A) +#define WSA881X_SPKR_PROT_FE_CM_LDO_SET (WSA881X_ANALOG_BASE + 0x003B) +#define WSA881X_SPKR_PROT_FE_ISENSE_BIAS_SET1 (WSA881X_ANALOG_BASE + 0x003C) +#define WSA881X_SPKR_PROT_FE_ISENSE_BIAS_SET2 (WSA881X_ANALOG_BASE + 0x003D) +#define WSA881X_SPKR_PROT_ATEST1 (WSA881X_ANALOG_BASE + 0x003E) +#define WSA881X_SPKR_PROT_ATEST2 (WSA881X_ANALOG_BASE + 0x003F) +#define WSA881X_SPKR_PROT_FE_VSENSE_VCM (WSA881X_ANALOG_BASE + 0x0040) +#define WSA881X_SPKR_PROT_FE_VSENSE_BIAS_SET1 (WSA881X_ANALOG_BASE + 0x0041) +#define WSA881X_BONGO_RESRV_REG1 (WSA881X_ANALOG_BASE + 0x0042) +#define WSA881X_BONGO_RESRV_REG2 (WSA881X_ANALOG_BASE + 0x0043) +#define WSA881X_SPKR_PROT_SAR (WSA881X_ANALOG_BASE + 0x0044) +#define WSA881X_SPKR_STATUS3 (WSA881X_ANALOG_BASE + 0x0045) + +#define SWRS_SCP_FRAME_CTRL_BANK(m) (0x60 + 0x10 * (m)) +#define SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(m) (0xE0 + 0x10 * (m)) + +#define WSA881X_NUM_REGISTERS (WSA881X_SPKR_STATUS3 + 1) +#define WSA881X_MAX_REGISTER (WSA881X_NUM_REGISTERS - 1) +#define WSA881X_CACHE_SIZE WSA881X_NUM_REGISTERS +#define SWR_SLV_MAX_REG_ADDR 0x390 +#define SWR_SLV_START_REG_ADDR 0x40 +#define SWR_SLV_MAX_BUF_LEN 20 +#define BYTES_PER_LINE 12 +#define SWR_SLV_RD_BUF_LEN 8 +#define SWR_SLV_WR_BUF_LEN 32 +#define SWR_SLV_MAX_DEVICES 2 +#define WSA881X_MAX_SWR_PORTS 4 +#define WSA881X_VERSION_ENTRY_SIZE 27 +#define WSA881X_OCP_CTL_TIMER_SEC 2 +#define WSA881X_OCP_CTL_TEMP_CELSIUS 25 +#define WSA881X_OCP_CTL_POLL_TIMER_SEC 60 + +#define WSA881X_PA_GAIN_TLV(xname, reg, shift, max, invert, tlv_array) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ + .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ + SNDRV_CTL_ELEM_ACCESS_READWRITE,\ + .tlv.p = (tlv_array), \ + .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\ + .put = wsa881x_put_pa_gain, \ + .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) } + +static const u8 wsa881x_reg_readable[WSA881X_CACHE_SIZE] = { + [WSA881X_CHIP_ID0] = 1, + [WSA881X_CHIP_ID1] = 1, + [WSA881X_CHIP_ID2] = 1, + [WSA881X_CHIP_ID3] = 1, + [WSA881X_BUS_ID] = 1, + [WSA881X_CDC_RST_CTL] = 1, + [WSA881X_CDC_TOP_CLK_CTL] = 1, + [WSA881X_CDC_ANA_CLK_CTL] = 1, + [WSA881X_CDC_DIG_CLK_CTL] = 1, + [WSA881X_CLOCK_CONFIG] = 1, + [WSA881X_ANA_CTL] = 1, + [WSA881X_SWR_RESET_EN] = 1, + [WSA881X_RESET_CTL] = 1, + [WSA881X_TADC_VALUE_CTL] = 1, + [WSA881X_TEMP_DETECT_CTL] = 1, + [WSA881X_TEMP_MSB] = 1, + [WSA881X_TEMP_LSB] = 1, + [WSA881X_TEMP_CONFIG0] = 1, + [WSA881X_TEMP_CONFIG1] = 1, + [WSA881X_CDC_CLIP_CTL] = 1, + [WSA881X_SDM_PDM9_LSB] = 1, + [WSA881X_SDM_PDM9_MSB] = 1, + [WSA881X_CDC_RX_CTL] = 1, + [WSA881X_DEM_BYPASS_DATA0] = 1, + [WSA881X_DEM_BYPASS_DATA1] = 1, + [WSA881X_DEM_BYPASS_DATA2] = 1, + [WSA881X_DEM_BYPASS_DATA3] = 1, + [WSA881X_OTP_CTRL0] = 1, + [WSA881X_OTP_CTRL1] = 1, + [WSA881X_HDRIVE_CTL_GROUP1] = 1, + [WSA881X_INTR_MODE] = 1, + [WSA881X_INTR_MASK] = 1, + [WSA881X_INTR_STATUS] = 1, + [WSA881X_INTR_CLEAR] = 1, + [WSA881X_INTR_LEVEL] = 1, + [WSA881X_INTR_SET] = 1, + [WSA881X_INTR_TEST] = 1, + [WSA881X_PDM_TEST_MODE] = 1, + [WSA881X_ATE_TEST_MODE] = 1, + [WSA881X_PIN_CTL_MODE] = 1, + [WSA881X_PIN_CTL_OE] = 1, + [WSA881X_PIN_WDATA_IOPAD] = 1, + [WSA881X_PIN_STATUS] = 1, + [WSA881X_DIG_DEBUG_MODE] = 1, + [WSA881X_DIG_DEBUG_SEL] = 1, + [WSA881X_DIG_DEBUG_EN] = 1, + [WSA881X_SWR_HM_TEST1] = 1, + [WSA881X_SWR_HM_TEST2] = 1, + [WSA881X_TEMP_DETECT_DBG_CTL] = 1, + [WSA881X_TEMP_DEBUG_MSB] = 1, + [WSA881X_TEMP_DEBUG_LSB] = 1, + [WSA881X_SAMPLE_EDGE_SEL] = 1, + [WSA881X_IOPAD_CTL] = 1, + [WSA881X_SPARE_0] = 1, + [WSA881X_SPARE_1] = 1, + [WSA881X_SPARE_2] = 1, + [WSA881X_OTP_REG_0] = 1, + [WSA881X_OTP_REG_1] = 1, + [WSA881X_OTP_REG_2] = 1, + [WSA881X_OTP_REG_3] = 1, + [WSA881X_OTP_REG_4] = 1, + [WSA881X_OTP_REG_5] = 1, + [WSA881X_OTP_REG_6] = 1, + [WSA881X_OTP_REG_7] = 1, + [WSA881X_OTP_REG_8] = 1, + [WSA881X_OTP_REG_9] = 1, + [WSA881X_OTP_REG_10] = 1, + [WSA881X_OTP_REG_11] = 1, + [WSA881X_OTP_REG_12] = 1, + [WSA881X_OTP_REG_13] = 1, + [WSA881X_OTP_REG_14] = 1, + [WSA881X_OTP_REG_15] = 1, + [WSA881X_OTP_REG_16] = 1, + [WSA881X_OTP_REG_17] = 1, + [WSA881X_OTP_REG_18] = 1, + [WSA881X_OTP_REG_19] = 1, + [WSA881X_OTP_REG_20] = 1, + [WSA881X_OTP_REG_21] = 1, + [WSA881X_OTP_REG_22] = 1, + [WSA881X_OTP_REG_23] = 1, + [WSA881X_OTP_REG_24] = 1, + [WSA881X_OTP_REG_25] = 1, + [WSA881X_OTP_REG_26] = 1, + [WSA881X_OTP_REG_27] = 1, + [WSA881X_OTP_REG_28] = 1, + [WSA881X_OTP_REG_29] = 1, + [WSA881X_OTP_REG_30] = 1, + [WSA881X_OTP_REG_31] = 1, + [WSA881X_OTP_REG_63] = 1, + /* Analog Registers */ + [WSA881X_BIAS_REF_CTRL] = 1, + [WSA881X_BIAS_TEST] = 1, + [WSA881X_BIAS_BIAS] = 1, + [WSA881X_TEMP_OP] = 1, + [WSA881X_TEMP_IREF_CTRL] = 1, + [WSA881X_TEMP_ISENS_CTRL] = 1, + [WSA881X_TEMP_CLK_CTRL] = 1, + [WSA881X_TEMP_TEST] = 1, + [WSA881X_TEMP_BIAS] = 1, + [WSA881X_TEMP_ADC_CTRL] = 1, + [WSA881X_TEMP_DOUT_MSB] = 1, + [WSA881X_TEMP_DOUT_LSB] = 1, + [WSA881X_ADC_EN_MODU_V] = 1, + [WSA881X_ADC_EN_MODU_I] = 1, + [WSA881X_ADC_EN_DET_TEST_V] = 1, + [WSA881X_ADC_EN_DET_TEST_I] = 1, + [WSA881X_ADC_SEL_IBIAS] = 1, + [WSA881X_ADC_EN_SEL_IBAIS] = 1, + [WSA881X_SPKR_DRV_EN] = 1, + [WSA881X_SPKR_DRV_GAIN] = 1, + [WSA881X_SPKR_DAC_CTL] = 1, + [WSA881X_SPKR_DRV_DBG] = 1, + [WSA881X_SPKR_PWRSTG_DBG] = 1, + [WSA881X_SPKR_OCP_CTL] = 1, + [WSA881X_SPKR_CLIP_CTL] = 1, + [WSA881X_SPKR_BBM_CTL] = 1, + [WSA881X_SPKR_MISC_CTL1] = 1, + [WSA881X_SPKR_MISC_CTL2] = 1, + [WSA881X_SPKR_BIAS_INT] = 1, + [WSA881X_SPKR_PA_INT] = 1, + [WSA881X_SPKR_BIAS_CAL] = 1, + [WSA881X_SPKR_BIAS_PSRR] = 1, + [WSA881X_SPKR_STATUS1] = 1, + [WSA881X_SPKR_STATUS2] = 1, + [WSA881X_BOOST_EN_CTL] = 1, + [WSA881X_BOOST_CURRENT_LIMIT] = 1, + [WSA881X_BOOST_PS_CTL] = 1, + [WSA881X_BOOST_PRESET_OUT1] = 1, + [WSA881X_BOOST_PRESET_OUT2] = 1, + [WSA881X_BOOST_FORCE_OUT] = 1, + [WSA881X_BOOST_LDO_PROG] = 1, + [WSA881X_BOOST_SLOPE_COMP_ISENSE_FB] = 1, + [WSA881X_BOOST_RON_CTL] = 1, + [WSA881X_BOOST_LOOP_STABILITY] = 1, + [WSA881X_BOOST_ZX_CTL] = 1, + [WSA881X_BOOST_START_CTL] = 1, + [WSA881X_BOOST_MISC1_CTL] = 1, + [WSA881X_BOOST_MISC2_CTL] = 1, + [WSA881X_BOOST_MISC3_CTL] = 1, + [WSA881X_BOOST_ATEST_CTL] = 1, + [WSA881X_SPKR_PROT_FE_GAIN] = 1, + [WSA881X_SPKR_PROT_FE_CM_LDO_SET] = 1, + [WSA881X_SPKR_PROT_FE_ISENSE_BIAS_SET1] = 1, + [WSA881X_SPKR_PROT_FE_ISENSE_BIAS_SET2] = 1, + [WSA881X_SPKR_PROT_ATEST1] = 1, + [WSA881X_SPKR_PROT_ATEST2] = 1, + [WSA881X_SPKR_PROT_FE_VSENSE_VCM] = 1, + [WSA881X_SPKR_PROT_FE_VSENSE_BIAS_SET1] = 1, + [WSA881X_BONGO_RESRV_REG1] = 1, + [WSA881X_BONGO_RESRV_REG2] = 1, + [WSA881X_SPKR_PROT_SAR] = 1, + [WSA881X_SPKR_STATUS3] = 1, +}; + +static struct reg_default wsa881x_defaults[] = { + {WSA881X_CHIP_ID0, 0x00}, + {WSA881X_CHIP_ID1, 0x00}, + {WSA881X_CHIP_ID2, 0x00}, + {WSA881X_CHIP_ID3, 0x02}, + {WSA881X_BUS_ID, 0x00}, + {WSA881X_CDC_RST_CTL, 0x00}, + {WSA881X_CDC_TOP_CLK_CTL, 0x03}, + {WSA881X_CDC_ANA_CLK_CTL, 0x00}, + {WSA881X_CDC_DIG_CLK_CTL, 0x00}, + {WSA881X_CLOCK_CONFIG, 0x00}, + {WSA881X_ANA_CTL, 0x08}, + {WSA881X_SWR_RESET_EN, 0x00}, + {WSA881X_TEMP_DETECT_CTL, 0x01}, + {WSA881X_TEMP_MSB, 0x00}, + {WSA881X_TEMP_LSB, 0x00}, + {WSA881X_TEMP_CONFIG0, 0x00}, + {WSA881X_TEMP_CONFIG1, 0x00}, + {WSA881X_CDC_CLIP_CTL, 0x03}, + {WSA881X_SDM_PDM9_LSB, 0x00}, + {WSA881X_SDM_PDM9_MSB, 0x00}, + {WSA881X_CDC_RX_CTL, 0x7E}, + {WSA881X_DEM_BYPASS_DATA0, 0x00}, + {WSA881X_DEM_BYPASS_DATA1, 0x00}, + {WSA881X_DEM_BYPASS_DATA2, 0x00}, + {WSA881X_DEM_BYPASS_DATA3, 0x00}, + {WSA881X_OTP_CTRL0, 0x00}, + {WSA881X_OTP_CTRL1, 0x00}, + {WSA881X_HDRIVE_CTL_GROUP1, 0x00}, + {WSA881X_INTR_MODE, 0x00}, + {WSA881X_INTR_STATUS, 0x00}, + {WSA881X_INTR_CLEAR, 0x00}, + {WSA881X_INTR_LEVEL, 0x00}, + {WSA881X_INTR_SET, 0x00}, + {WSA881X_INTR_TEST, 0x00}, + {WSA881X_PDM_TEST_MODE, 0x00}, + {WSA881X_ATE_TEST_MODE, 0x00}, + {WSA881X_PIN_CTL_MODE, 0x00}, + {WSA881X_PIN_CTL_OE, 0x00}, + {WSA881X_PIN_WDATA_IOPAD, 0x00}, + {WSA881X_PIN_STATUS, 0x00}, + {WSA881X_DIG_DEBUG_MODE, 0x00}, + {WSA881X_DIG_DEBUG_SEL, 0x00}, + {WSA881X_DIG_DEBUG_EN, 0x00}, + {WSA881X_SWR_HM_TEST1, 0x08}, + {WSA881X_SWR_HM_TEST2, 0x00}, + {WSA881X_TEMP_DETECT_DBG_CTL, 0x00}, + {WSA881X_TEMP_DEBUG_MSB, 0x00}, + {WSA881X_TEMP_DEBUG_LSB, 0x00}, + {WSA881X_SAMPLE_EDGE_SEL, 0x0C}, + {WSA881X_SPARE_0, 0x00}, + {WSA881X_SPARE_1, 0x00}, + {WSA881X_SPARE_2, 0x00}, + {WSA881X_OTP_REG_0, 0x01}, + {WSA881X_OTP_REG_1, 0xFF}, + {WSA881X_OTP_REG_2, 0xC0}, + {WSA881X_OTP_REG_3, 0xFF}, + {WSA881X_OTP_REG_4, 0xC0}, + {WSA881X_OTP_REG_5, 0xFF}, + {WSA881X_OTP_REG_6, 0xFF}, + {WSA881X_OTP_REG_7, 0xFF}, + {WSA881X_OTP_REG_8, 0xFF}, + {WSA881X_OTP_REG_9, 0xFF}, + {WSA881X_OTP_REG_10, 0xFF}, + {WSA881X_OTP_REG_11, 0xFF}, + {WSA881X_OTP_REG_12, 0xFF}, + {WSA881X_OTP_REG_13, 0xFF}, + {WSA881X_OTP_REG_14, 0xFF}, + {WSA881X_OTP_REG_15, 0xFF}, + {WSA881X_OTP_REG_16, 0xFF}, + {WSA881X_OTP_REG_17, 0xFF}, + {WSA881X_OTP_REG_18, 0xFF}, + {WSA881X_OTP_REG_19, 0xFF}, + {WSA881X_OTP_REG_20, 0xFF}, + {WSA881X_OTP_REG_21, 0xFF}, + {WSA881X_OTP_REG_22, 0xFF}, + {WSA881X_OTP_REG_23, 0xFF}, + {WSA881X_OTP_REG_24, 0x03}, + {WSA881X_OTP_REG_25, 0x01}, + {WSA881X_OTP_REG_26, 0x03}, + {WSA881X_OTP_REG_27, 0x11}, + {WSA881X_OTP_REG_63, 0x40}, + /* WSA881x Analog registers */ + {WSA881X_BIAS_REF_CTRL, 0x6C}, + {WSA881X_BIAS_TEST, 0x16}, + {WSA881X_BIAS_BIAS, 0xF0}, + {WSA881X_TEMP_OP, 0x00}, + {WSA881X_TEMP_IREF_CTRL, 0x56}, + {WSA881X_TEMP_ISENS_CTRL, 0x47}, + {WSA881X_TEMP_CLK_CTRL, 0x87}, + {WSA881X_TEMP_TEST, 0x00}, + {WSA881X_TEMP_BIAS, 0x51}, + {WSA881X_TEMP_DOUT_MSB, 0x00}, + {WSA881X_TEMP_DOUT_LSB, 0x00}, + {WSA881X_ADC_EN_MODU_V, 0x00}, + {WSA881X_ADC_EN_MODU_I, 0x00}, + {WSA881X_ADC_EN_DET_TEST_V, 0x00}, + {WSA881X_ADC_EN_DET_TEST_I, 0x00}, + {WSA881X_ADC_EN_SEL_IBAIS, 0x10}, + {WSA881X_SPKR_DRV_EN, 0x74}, + {WSA881X_SPKR_DRV_DBG, 0x15}, + {WSA881X_SPKR_PWRSTG_DBG, 0x00}, + {WSA881X_SPKR_OCP_CTL, 0xD4}, + {WSA881X_SPKR_CLIP_CTL, 0x90}, + {WSA881X_SPKR_PA_INT, 0x54}, + {WSA881X_SPKR_BIAS_CAL, 0xAC}, + {WSA881X_SPKR_STATUS1, 0x00}, + {WSA881X_SPKR_STATUS2, 0x00}, + {WSA881X_BOOST_EN_CTL, 0x18}, + {WSA881X_BOOST_CURRENT_LIMIT, 0x7A}, + {WSA881X_BOOST_PRESET_OUT2, 0x70}, + {WSA881X_BOOST_FORCE_OUT, 0x0E}, + {WSA881X_BOOST_LDO_PROG, 0x16}, + {WSA881X_BOOST_SLOPE_COMP_ISENSE_FB, 0x71}, + {WSA881X_BOOST_RON_CTL, 0x0F}, + {WSA881X_BOOST_ZX_CTL, 0x34}, + {WSA881X_BOOST_START_CTL, 0x23}, + {WSA881X_BOOST_MISC1_CTL, 0x80}, + {WSA881X_BOOST_MISC2_CTL, 0x00}, + {WSA881X_BOOST_MISC3_CTL, 0x00}, + {WSA881X_BOOST_ATEST_CTL, 0x00}, + {WSA881X_SPKR_PROT_FE_GAIN, 0x46}, + {WSA881X_SPKR_PROT_FE_CM_LDO_SET, 0x3B}, + {WSA881X_SPKR_PROT_FE_ISENSE_BIAS_SET1, 0x8D}, + {WSA881X_SPKR_PROT_FE_ISENSE_BIAS_SET2, 0x8D}, + {WSA881X_SPKR_PROT_ATEST1, 0x01}, + {WSA881X_SPKR_PROT_FE_VSENSE_VCM, 0x8D}, + {WSA881X_SPKR_PROT_FE_VSENSE_BIAS_SET1, 0x4D}, + {WSA881X_SPKR_PROT_SAR, 0x00}, + {WSA881X_SPKR_STATUS3, 0x00}, +}; + +static const struct reg_sequence wsa881x_pre_pmu_pa[] = { + {WSA881X_SPKR_DRV_GAIN, 0x41, 0}, + {WSA881X_SPKR_MISC_CTL1, 0x01, 0}, + {WSA881X_ADC_EN_DET_TEST_I, 0x01, 0}, + {WSA881X_ADC_EN_MODU_V, 0x02, 0}, + {WSA881X_ADC_EN_DET_TEST_V, 0x10, 0}, + {WSA881X_SPKR_PWRSTG_DBG, 0xA0, 0}, +}; + +static const struct reg_sequence wsa881x_pre_pmu_pa_2_0[] = { + {WSA881X_SPKR_DRV_GAIN, 0x41, 0}, + {WSA881X_SPKR_MISC_CTL1, 0x87, 0}, +}; + +static const struct reg_sequence wsa881x_post_pmu_pa[] = { + {WSA881X_SPKR_PWRSTG_DBG, 0x00, 0}, + {WSA881X_ADC_EN_DET_TEST_V, 0x00, 0}, + {WSA881X_ADC_EN_MODU_V, 0x00, 0}, + {WSA881X_ADC_EN_DET_TEST_I, 0x00, 0}, +}; + +static const struct reg_sequence wsa881x_vi_txfe_en[] = { + {WSA881X_SPKR_PROT_FE_VSENSE_VCM, 0x85, 0}, + {WSA881X_SPKR_PROT_ATEST2, 0x0A, 0}, + {WSA881X_SPKR_PROT_FE_GAIN, 0xCF, 0}, +}; + +static const struct reg_sequence wsa881x_vi_txfe_en_2_0[] = { + {WSA881X_SPKR_PROT_FE_VSENSE_VCM, 0x85, 0}, + {WSA881X_SPKR_PROT_ATEST2, 0x0A, 0}, + {WSA881X_SPKR_PROT_FE_GAIN, 0x47, 0}, +}; + +/* Default register reset values for WSA881x rev 2.0 */ +static struct reg_sequence wsa881x_rev_2_0[] = { + {WSA881X_RESET_CTL, 0x00, 0x00}, + {WSA881X_TADC_VALUE_CTL, 0x01, 0x00}, + {WSA881X_INTR_MASK, 0x1B, 0x00}, + {WSA881X_IOPAD_CTL, 0x00, 0x00}, + {WSA881X_OTP_REG_28, 0x3F, 0x00}, + {WSA881X_OTP_REG_29, 0x3F, 0x00}, + {WSA881X_OTP_REG_30, 0x01, 0x00}, + {WSA881X_OTP_REG_31, 0x01, 0x00}, + {WSA881X_TEMP_ADC_CTRL, 0x03, 0x00}, + {WSA881X_ADC_SEL_IBIAS, 0x45, 0x00}, + {WSA881X_SPKR_DRV_GAIN, 0xC1, 0x00}, + {WSA881X_SPKR_DAC_CTL, 0x42, 0x00}, + {WSA881X_SPKR_BBM_CTL, 0x02, 0x00}, + {WSA881X_SPKR_MISC_CTL1, 0x40, 0x00}, + {WSA881X_SPKR_MISC_CTL2, 0x07, 0x00}, + {WSA881X_SPKR_BIAS_INT, 0x5F, 0x00}, + {WSA881X_SPKR_BIAS_PSRR, 0x44, 0x00}, + {WSA881X_BOOST_PS_CTL, 0xA0, 0x00}, + {WSA881X_BOOST_PRESET_OUT1, 0xB7, 0x00}, + {WSA881X_BOOST_LOOP_STABILITY, 0x8D, 0x00}, + {WSA881X_SPKR_PROT_ATEST2, 0x02, 0x00}, + {WSA881X_BONGO_RESRV_REG1, 0x5E, 0x00}, + {WSA881X_BONGO_RESRV_REG2, 0x07, 0x00}, +}; + +enum wsa_port_ids { + WSA881X_PORT_DAC, + WSA881X_PORT_COMP, + WSA881X_PORT_BOOST, + WSA881X_PORT_VISENSE, +}; + +/* 4 ports */ +static struct sdw_dpn_prop wsa_sink_dpn_prop[WSA881X_MAX_SWR_PORTS] = { + { + /* DAC */ + .num = 1, + .type = SDW_DPN_SIMPLE, + .min_ch = 1, + .max_ch = 1, + .simple_ch_prep_sm = true, + }, { + /* COMP */ + .num = 2, + .type = SDW_DPN_SIMPLE, + .min_ch = 1, + .max_ch = 1, + .simple_ch_prep_sm = true, + }, { + /* BOOST */ + .num = 3, + .type = SDW_DPN_SIMPLE, + .min_ch = 1, + .max_ch = 1, + .simple_ch_prep_sm = true, + }, { + /* VISENSE */ + .num = 4, + .type = SDW_DPN_SIMPLE, + .min_ch = 1, + .max_ch = 1, + .simple_ch_prep_sm = true, + } +}; + +static bool wsa881x_readable_register(struct device *dev, unsigned int reg) +{ + return wsa881x_reg_readable[reg]; +} + +static bool wsa881x_volatile_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case WSA881X_CHIP_ID0: + case WSA881X_CHIP_ID1: + case WSA881X_CHIP_ID2: + case WSA881X_CHIP_ID3: + case WSA881X_BUS_ID: + case WSA881X_TEMP_MSB: + case WSA881X_TEMP_LSB: + case WSA881X_SDM_PDM9_LSB: + case WSA881X_SDM_PDM9_MSB: + case WSA881X_OTP_CTRL1: + case WSA881X_INTR_STATUS: + case WSA881X_ATE_TEST_MODE: + case WSA881X_PIN_STATUS: + case WSA881X_SWR_HM_TEST2: + case WSA881X_SPKR_STATUS1: + case WSA881X_SPKR_STATUS2: + case WSA881X_SPKR_STATUS3: + case WSA881X_OTP_REG_0: + case WSA881X_OTP_REG_1: + case WSA881X_OTP_REG_2: + case WSA881X_OTP_REG_3: + case WSA881X_OTP_REG_4: + case WSA881X_OTP_REG_5: + case WSA881X_OTP_REG_31: + case WSA881X_TEMP_DOUT_MSB: + case WSA881X_TEMP_DOUT_LSB: + case WSA881X_TEMP_OP: + case WSA881X_SPKR_PROT_SAR: + return true; + default: + return false; + } +} + +static struct regmap_config wsa881x_regmap_config = { + .reg_bits = 32, + .val_bits = 8, + .cache_type = REGCACHE_RBTREE, + .reg_defaults = wsa881x_defaults, + .num_reg_defaults = ARRAY_SIZE(wsa881x_defaults), + .max_register = WSA881X_MAX_REGISTER, + .volatile_reg = wsa881x_volatile_register, + .readable_reg = wsa881x_readable_register, + .reg_format_endian = REGMAP_ENDIAN_NATIVE, + .val_format_endian = REGMAP_ENDIAN_NATIVE, + .can_multi_write = true, +}; + +enum { + G_18DB = 0, + G_16P5DB, + G_15DB, + G_13P5DB, + G_12DB, + G_10P5DB, + G_9DB, + G_7P5DB, + G_6DB, + G_4P5DB, + G_3DB, + G_1P5DB, + G_0DB, +}; + +/* + * Private data Structure for wsa881x. All parameters related to + * WSA881X codec needs to be defined here. + */ +struct wsa881x_priv { + struct regmap *regmap; + struct device *dev; + struct sdw_slave *slave; + struct gpio_desc *sd_n; + int bg_cnt; + int clk_cnt; + int version; + /* bandgap lock */ + struct mutex bg_lock; + /* clk resource lock */ + struct mutex res_lock; + bool port_prepared[WSA881X_MAX_SWR_PORTS]; + u8 pa_gain; +}; + +static void wsa881x_init(struct wsa881x_priv *wsa881x) +{ + struct regmap *rm = wsa881x->regmap; + unsigned int val = 0; + + regmap_read(rm, WSA881X_CHIP_ID1, &wsa881x->version); + regcache_cache_only(rm, true); + regmap_multi_reg_write(rm, wsa881x_rev_2_0, + ARRAY_SIZE(wsa881x_rev_2_0)); + regcache_cache_only(rm, false); + /* Enable software reset output from soundwire slave */ + regmap_update_bits(rm, WSA881X_SWR_RESET_EN, 0x07, 0x07); + /* Bring out of analog reset */ + regmap_update_bits(rm, WSA881X_CDC_RST_CTL, 0x02, 0x02); + /* Bring out of digital reset */ + regmap_update_bits(rm, WSA881X_CDC_RST_CTL, 0x01, 0x01); + regmap_update_bits(rm, WSA881X_CLOCK_CONFIG, 0x10, 0x10); + regmap_update_bits(rm, WSA881X_SPKR_OCP_CTL, 0x02, 0x02); + regmap_update_bits(rm, WSA881X_SPKR_MISC_CTL1, 0xC0, 0x80); + regmap_update_bits(rm, WSA881X_SPKR_MISC_CTL1, 0x06, 0x06); + regmap_update_bits(rm, WSA881X_SPKR_BIAS_INT, 0xFF, 0x00); + regmap_update_bits(rm, WSA881X_SPKR_PA_INT, 0xF0, 0x40); + regmap_update_bits(rm, WSA881X_SPKR_PA_INT, 0x0E, 0x0E); + regmap_update_bits(rm, WSA881X_BOOST_LOOP_STABILITY, 0x03, 0x03); + regmap_update_bits(rm, WSA881X_BOOST_MISC2_CTL, 0xFF, 0x14); + regmap_update_bits(rm, WSA881X_BOOST_START_CTL, 0x80, 0x80); + regmap_update_bits(rm, WSA881X_BOOST_START_CTL, 0x03, 0x00); + regmap_update_bits(rm, WSA881X_BOOST_SLOPE_COMP_ISENSE_FB, 0x0C, 0x04); + regmap_update_bits(rm, WSA881X_BOOST_SLOPE_COMP_ISENSE_FB, 0x03, 0x00); + + regmap_read(rm, WSA881X_OTP_REG_0, &val); + if (val) + regmap_update_bits(rm, WSA881X_BOOST_PRESET_OUT1, 0xF0, 0x70); + + regmap_update_bits(rm, WSA881X_BOOST_PRESET_OUT2, 0xF0, 0x30); + regmap_update_bits(rm, WSA881X_SPKR_DRV_EN, 0x08, 0x08); + regmap_update_bits(rm, WSA881X_BOOST_CURRENT_LIMIT, 0x0F, 0x08); + regmap_update_bits(rm, WSA881X_SPKR_OCP_CTL, 0x30, 0x30); + regmap_update_bits(rm, WSA881X_SPKR_OCP_CTL, 0x0C, 0x00); + regmap_update_bits(rm, WSA881X_OTP_REG_28, 0x3F, 0x3A); + regmap_update_bits(rm, WSA881X_BONGO_RESRV_REG1, 0xFF, 0xB2); + regmap_update_bits(rm, WSA881X_BONGO_RESRV_REG2, 0xFF, 0x05); +} + +static int wsa881x_component_probe(struct snd_soc_component *comp) +{ + struct wsa881x_priv *wsa881x = snd_soc_component_get_drvdata(comp); + + snd_soc_component_init_regmap(comp, wsa881x->regmap); + mutex_init(&wsa881x->bg_lock); + mutex_init(&wsa881x->res_lock); + wsa881x->bg_cnt = 0; + wsa881x->clk_cnt = 0; + + return 0; +} + +static int wsa881x_put_pa_gain(struct snd_kcontrol *kc, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *comp = snd_soc_kcontrol_component(kc); + struct wsa881x_priv *wsa881x = snd_soc_component_get_drvdata(comp); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kc->private_value; + int max = mc->max; + unsigned int mask = (1 << fls(max)) - 1; + + /* + * program actual register just before compander enable and ensure hw + * sequence is followed + */ + wsa881x->pa_gain = (max - ucontrol->value.integer.value[0]) & mask; + + return 0; +} + +static const char * const smart_boost_lvl_text[] = { + "6.625 V", "6.750 V", "6.875 V", "7.000 V", + "7.125 V", "7.250 V", "7.375 V", "7.500 V", + "7.625 V", "7.750 V", "7.875 V", "8.000 V", + "8.125 V", "8.250 V", "8.375 V", "8.500 V" +}; + +static const struct soc_enum smart_boost_lvl_enum = + SOC_ENUM_SINGLE(WSA881X_BOOST_PRESET_OUT1, 0, + ARRAY_SIZE(smart_boost_lvl_text), + smart_boost_lvl_text); + +static const DECLARE_TLV_DB_SCALE(pa_gain, 0, 150, 0); + +static const struct snd_kcontrol_new wsa881x_snd_controls[] = { + SOC_ENUM("Smart Boost Level", smart_boost_lvl_enum), + WSA881X_PA_GAIN_TLV("PA Gain", WSA881X_SPKR_DRV_GAIN, + 4, 0xC, 1, pa_gain), + SOC_SINGLE("PA Mute Switch", WSA881X_SPKR_DRV_EN, 7, 1, 1), +}; + +static const struct snd_soc_dapm_route wsa881x_audio_map[] = { + {"RDAC", NULL, "IN"}, + {"SPKR PGA", NULL, "RDAC"}, + {"SPKR", NULL, "SPKR PGA"}, +}; + +static void wsa881x_clk_ctrl(struct snd_soc_component *comp, bool enable) +{ + struct wsa881x_priv *wsa881x = snd_soc_component_get_drvdata(comp); + + mutex_lock(&wsa881x->res_lock); + if (enable) { + ++wsa881x->clk_cnt; + if (wsa881x->clk_cnt == 1) { + snd_soc_component_write(comp, + WSA881X_CDC_DIG_CLK_CTL, + enable); + snd_soc_component_write(comp, + WSA881X_CDC_ANA_CLK_CTL, + enable); + } + } else { + --wsa881x->clk_cnt; + if (wsa881x->clk_cnt <= 0) { + WARN_ON(wsa881x->clk_cnt < 0); + wsa881x->clk_cnt = 0; + snd_soc_component_write(comp, + WSA881X_CDC_DIG_CLK_CTL, + enable); + snd_soc_component_write(comp, + WSA881X_CDC_ANA_CLK_CTL, + enable); + } + } + mutex_unlock(&wsa881x->res_lock); +} + +static void wsa881x_bandgap_ctrl(struct snd_soc_component *comp, bool enable) +{ + struct wsa881x_priv *wsa881x = snd_soc_component_get_drvdata(comp); + + mutex_lock(&wsa881x->bg_lock); + if (enable) { + ++wsa881x->bg_cnt; + if (wsa881x->bg_cnt == 1) { + snd_soc_component_update_bits(comp, WSA881X_TEMP_OP, + 0x08, 0x08); + /* 400usec sleep is needed as per HW requirement */ + usleep_range(400, 410); + snd_soc_component_update_bits(comp, WSA881X_TEMP_OP, + 0x04, 0x04); + } + } else { + --wsa881x->bg_cnt; + if (wsa881x->bg_cnt <= 0) { + WARN_ON(wsa881x->bg_cnt < 0); + wsa881x->bg_cnt = 0; + snd_soc_component_update_bits(comp, WSA881X_TEMP_OP, + 0x04, 0x00); + snd_soc_component_update_bits(comp, WSA881X_TEMP_OP, + 0x08, 0x00); + } + } + mutex_unlock(&wsa881x->bg_lock); +} + +static int wsa881x_boost_ctrl(struct snd_soc_component *comp, bool enable) +{ + if (enable) + snd_soc_component_update_bits(comp, WSA881X_BOOST_EN_CTL, + 0x80, 0x80); + else + snd_soc_component_update_bits(comp, WSA881X_BOOST_EN_CTL, + 0x80, 0x00); + /* + * 1.5ms sleep is needed after boost enable/disable as per + * HW requirement + */ + usleep_range(1500, 1510); + return 0; +} + +static int32_t wsa881x_resource_acquire(struct snd_soc_component *comp, + bool enable) +{ + wsa881x_clk_ctrl(comp, enable); + wsa881x_bandgap_ctrl(comp, enable); + + return 0; +} + +static int wsa881x_rdac_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); + + switch (event) { + case SND_SOC_DAPM_PRE_PMU: + wsa881x_resource_acquire(comp, true); + wsa881x_boost_ctrl(comp, true); + break; + case SND_SOC_DAPM_POST_PMD: + wsa881x_boost_ctrl(comp, false); + wsa881x_resource_acquire(comp, false); + break; + } + return 0; +} + +static int wsa881x_ramp_pa_gain(struct snd_soc_component *comp, + int min_gain, int max_gain, int udelay) +{ + int val; + + for (val = min_gain; max_gain <= val; val--) { + snd_soc_component_update_bits(comp, WSA881X_SPKR_DRV_GAIN, + 0xF0, val << 4); + /* + * 1ms delay is needed for every step change in gain as per + * HW requirement. + */ + usleep_range(udelay, udelay + 10); + } + return 0; +} + +static int wsa881x_visense_txfe_ctrl(struct snd_soc_component *comp, + bool enable, u8 isense1_gain, + u8 isense2_gain, + u8 vsense_gain) +{ + struct wsa881x_priv *wsa881x = snd_soc_component_get_drvdata(comp); + + if (enable) { + regmap_multi_reg_write(wsa881x->regmap, + wsa881x_vi_txfe_en_2_0, + ARRAY_SIZE(wsa881x_vi_txfe_en_2_0)); + } else { + snd_soc_component_update_bits(comp, + WSA881X_SPKR_PROT_FE_VSENSE_VCM, + 0x08, 0x08); + /* + * 200us sleep is needed after visense txfe disable as per + * HW requirement. + */ + usleep_range(200, 210); + snd_soc_component_update_bits(comp, WSA881X_SPKR_PROT_FE_GAIN, + 0x01, 0x00); + } + return 0; +} + +static int wsa881x_visense_adc_ctrl(struct snd_soc_component *comp, + bool enable) +{ + snd_soc_component_update_bits(comp, WSA881X_ADC_EN_MODU_V, (0x01 << 7), + (enable << 7)); + snd_soc_component_update_bits(comp, WSA881X_ADC_EN_MODU_I, (0x01 << 7), + (enable << 7)); + return 0; +} + +static int wsa881x_spkr_pa_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); + struct wsa881x_priv *wsa881x = snd_soc_component_get_drvdata(comp); + int min_gain, max_gain; + + dev_err(comp->dev, "%s: %s %d\n", __func__, w->name, event); + + switch (event) { + case SND_SOC_DAPM_PRE_PMU: + snd_soc_component_update_bits(comp, WSA881X_SPKR_OCP_CTL, + 0xC0, 0x80); + regmap_multi_reg_write(wsa881x->regmap, + wsa881x_pre_pmu_pa_2_0, + ARRAY_SIZE(wsa881x_pre_pmu_pa_2_0)); + + /* Set register mode if compander is not enabled */ + if (!wsa881x->port_prepared[WSA881X_PORT_COMP]) + snd_soc_component_update_bits(comp, + WSA881X_SPKR_DRV_GAIN, + 0x08, 0x08); + else + snd_soc_component_update_bits(comp, + WSA881X_SPKR_DRV_GAIN, + 0x08, 0x00); + break; + case SND_SOC_DAPM_POST_PMU: + if (!wsa881x->port_prepared[WSA881X_PORT_COMP]) { + max_gain = wsa881x->pa_gain; + /* + * Gain has to set incrementally in 4 steps + * as per HW sequence + */ + if (max_gain > G_4P5DB) + min_gain = G_0DB; + else + min_gain = max_gain + 3; + /* + * 1ms delay is needed before change in gain + * as per HW requirement. + */ + usleep_range(1000, 1010); + wsa881x_ramp_pa_gain(comp, min_gain, max_gain, 1000); + } + + if (wsa881x->port_prepared[WSA881X_PORT_VISENSE]) { + wsa881x_visense_txfe_ctrl(comp, true, + 0x00, 0x03, 0x01); + snd_soc_component_update_bits(comp, + WSA881X_ADC_EN_SEL_IBAIS, + 0x07, 0x01); + wsa881x_visense_adc_ctrl(comp, true); + } + + break; + case SND_SOC_DAPM_POST_PMD: + if (wsa881x->port_prepared[WSA881X_PORT_VISENSE]) { + wsa881x_visense_adc_ctrl(comp, false); + wsa881x_visense_txfe_ctrl(comp, false, + 0x00, 0x01, 0x01); + } + + snd_soc_component_update_bits(comp, WSA881X_SPKR_OCP_CTL, + 0xC0, 0xC0); + break; + } + return 0; +} + +static const struct snd_soc_dapm_widget wsa881x_dapm_widgets[] = { + SND_SOC_DAPM_INPUT("IN"), + SND_SOC_DAPM_DAC_E("RDAC", NULL, WSA881X_SPKR_DAC_CTL, 7, 0, + wsa881x_rdac_event, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), + SND_SOC_DAPM_PGA_E("SPKR PGA", WSA881X_SPKR_DRV_EN, 7, 0, NULL, 0, + wsa881x_spkr_pa_event, SND_SOC_DAPM_PRE_PMU | + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), + SND_SOC_DAPM_OUTPUT("SPKR"), +}; + +static void wsa881x_component_remove(struct snd_soc_component *comp) +{ + struct wsa881x_priv *wsa881x = snd_soc_component_get_drvdata(comp); + + mutex_destroy(&wsa881x->bg_lock); + mutex_destroy(&wsa881x->res_lock); +} + +static const struct snd_soc_component_driver wsa881x_component_drv = { + .probe = wsa881x_component_probe, + .controls = wsa881x_snd_controls, + .num_controls = ARRAY_SIZE(wsa881x_snd_controls), + .remove = wsa881x_component_remove, + .dapm_widgets = wsa881x_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wsa881x_dapm_widgets), + .dapm_routes = wsa881x_audio_map, + .num_dapm_routes = ARRAY_SIZE(wsa881x_audio_map), +}; + +static int wsa881x_update_status(struct sdw_slave *slave, + enum sdw_slave_status status) +{ + struct wsa881x_priv *wsa881x = dev_get_drvdata(&slave->dev); + + if (status == SDW_SLAVE_ATTACHED && slave->dev_num > 0) + wsa881x_init(wsa881x); + + return 0; +} + +static int wsa881x_port_prep(struct sdw_slave *slave, + struct sdw_prepare_ch *prepare_ch, + enum sdw_port_prep_ops state) +{ + struct wsa881x_priv *wsa881x = dev_get_drvdata(&slave->dev); + + if (state == SDW_OPS_PORT_POST_PREP) + wsa881x->port_prepared[prepare_ch->num - 1] = true; + else + wsa881x->port_prepared[prepare_ch->num - 1] = false; + + return 0; +} + +static int wsa881x_bus_config(struct sdw_slave *slave, + struct sdw_bus_params *params) +{ + sdw_write(slave, SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(params->next_bank), + 0x01); + + return 0; +} + +static struct sdw_slave_ops wsa881x_slave_ops = { + .update_status = wsa881x_update_status, + .bus_config = wsa881x_bus_config, + .port_prep = wsa881x_port_prep, +}; + +static int wsa881x_probe(struct sdw_slave *pdev, + const struct sdw_device_id *id) +{ + struct wsa881x_priv *wsa881x; + + wsa881x = devm_kzalloc(&pdev->dev, sizeof(*wsa881x), GFP_KERNEL); + if (!wsa881x) + return -ENOMEM; + + wsa881x->sd_n = devm_gpiod_get_optional(&pdev->dev, "pd", + GPIOD_FLAGS_BIT_NONEXCLUSIVE); + if (IS_ERR(wsa881x->sd_n)) { + dev_err(&pdev->dev, "Shutdown Control GPIO not found\n"); + return PTR_ERR(wsa881x->sd_n); + } + + dev_set_drvdata(&pdev->dev, wsa881x); + wsa881x->slave = pdev; + wsa881x->dev = &pdev->dev; + pdev->prop.sink_ports = GENMASK(WSA881X_MAX_SWR_PORTS, 0); + pdev->prop.sink_dpn_prop = wsa_sink_dpn_prop; + gpiod_set_value(wsa881x->sd_n, 1); + + wsa881x->regmap = devm_regmap_init_sdw(pdev, &wsa881x_regmap_config); + if (IS_ERR(wsa881x->regmap)) { + dev_err(&pdev->dev, "regmap_init failed\n"); + return PTR_ERR(wsa881x->regmap); + } + + return devm_snd_soc_register_component(&pdev->dev, + &wsa881x_component_drv, NULL, 0); +} + +static const struct sdw_device_id wsa881x_slave_id[] = { + SDW_SLAVE_ENTRY(0x0217, 0x2010, 0), + {}, +}; +MODULE_DEVICE_TABLE(sdw, wsa881x_slave_id); + +static struct sdw_driver wsa881x_codec_driver = { + .probe = wsa881x_probe, + .ops = &wsa881x_slave_ops, + .id_table = wsa881x_slave_id, + .driver = { + .name = "wsa881x-codec", + } +}; +module_sdw_driver(wsa881x_codec_driver); + +MODULE_DESCRIPTION("WSA881x codec driver"); +MODULE_LICENSE("GPL v2"); -- 2.21.0 ^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2019-08-27 21:21 UTC | newest] Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-22 23:37 [RESEND PATCH v4 0/4] ASoC: codecs: Add WSA881x Smart Speaker amplifier support Srinivas Kandagatla 2019-08-22 23:37 ` [RESEND PATCH v4 1/4] dt-bindings: soundwire: add slave bindings Srinivas Kandagatla 2019-08-23 6:53 ` Vinod Koul 2019-08-27 20:20 ` Rob Herring 2019-08-27 20:28 ` Srinivas Kandagatla 2019-08-23 15:41 ` [alsa-devel] " Pierre-Louis Bossart 2019-08-23 15:57 ` Srinivas Kandagatla 2019-08-23 16:44 ` Pierre-Louis Bossart 2019-08-24 9:28 ` Srinivas Kandagatla 2019-08-26 16:22 ` Pierre-Louis Bossart 2019-08-27 21:21 ` Srinivas Kandagatla 2019-08-22 23:37 ` [RESEND PATCH v4 2/4] soundwire: core: add device tree support for slave devices Srinivas Kandagatla 2019-08-23 15:44 ` [alsa-devel] " Pierre-Louis Bossart 2019-08-23 15:47 ` Srinivas Kandagatla 2019-08-22 23:37 ` [RESEND PATCH v4 3/4] dt-bindings: ASoC: Add WSA881x bindings Srinivas Kandagatla 2019-08-27 12:20 ` Rob Herring 2019-08-27 20:25 ` Srinivas Kandagatla 2019-08-22 23:37 ` [RESEND PATCH v4 4/4] ASoC: codecs: add wsa881x amplifier support Srinivas Kandagatla
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).