Message ID | 20210528105101.508254-1-vincent.knecht@mailoo.org |
---|---|
State | Accepted |
Commit | 513df99993857863e42bf3d7d65d87c191ce9493 |
Headers | show |
Series | [v1,1/4] ASoC: dt-bindings: nxp,tfa989x: Add tfa9897 support | expand |
On Fri, May 28, 2021 at 12:50:58PM +0200, Vincent Knecht wrote: > Document TFA9897 bindings. > > Signed-off-by: Vincent Knecht <vincent.knecht@mailoo.org> Reviewed-by: Stephan Gerhold <stephan@gerhold.net> Thanks! Stephan > --- > Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml b/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml > index 45db5776550c..46ddc1f3fc0c 100644 > --- a/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml > +++ b/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml > @@ -13,6 +13,7 @@ properties: > compatible: > enum: > - nxp,tfa9895 > + - nxp,tfa9897 > > reg: > maxItems: 1 > -- > 2.31.1 > > >
On Fri, May 28, 2021 at 12:50:59PM +0200, Vincent Knecht wrote: > Add specific init function to poke needed registers & values for this IC > > Signed-off-by: Vincent Knecht <vincent.knecht@mailoo.org> > --- > sound/soc/codecs/tfa989x.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/sound/soc/codecs/tfa989x.c b/sound/soc/codecs/tfa989x.c > index 408e26eee108..6d94865c534b 100644 > --- a/sound/soc/codecs/tfa989x.c > +++ b/sound/soc/codecs/tfa989x.c > @@ -44,6 +44,7 @@ > #define TFA989X_CURRENTSENSE4 0x49 > > #define TFA9895_REVISION 0x12 > +#define TFA9897_REVISION 0x97 > > struct tfa989x_rev { > unsigned int rev; > @@ -175,6 +176,29 @@ static const struct tfa989x_rev tfa9895_rev = { > .init = tfa9895_init, > }; > > +static int tfa9897_init(struct regmap *regmap) > +{ > + int ret; > + > + /* Reduce slewrate by clearing iddqtestbst to avoid booster damage */ > + ret = regmap_write(regmap, TFA989X_CURRENTSENSE3, 0x0300); > + if (ret) > + return ret; > + > + /* Enable clipping */ > + ret = regmap_clear_bits(regmap, TFA989X_CURRENTSENSE4, 0x1); > + if (ret) > + return ret; > + > + /* Set required TDM configuration */ > + return regmap_write(regmap, 0x14, 0x0); For reference: Sadly we didn't manage to figure out what exactly this register does. There are several TDM related registers but they are not really documented. Devices usually have fixed register values specified in some configuration file, but it's not clear how to set these in a generic way (e.g. based on dai->set_tdm_slot(), dai->set_tdm_slot() etc). On the device where we tested TFA9897 it's just used with standard I2S so we didn't need any special TDM configuration(?). I suppose we can leave this open for future improvements if someone needs something different here. So: Reviewed-by: Stephan Gerhold <stephan@gerhold.net> Thanks! Stephan > +} > + > +static const struct tfa989x_rev tfa9897_rev = { > + .rev = TFA9897_REVISION, > + .init = tfa9897_init, > +}; > + > /* > * Note: At the moment this driver bypasses the "CoolFlux DSP" built into the > * TFA989X amplifiers. Unfortunately, there seems to be absolutely > @@ -280,6 +304,7 @@ static int tfa989x_i2c_probe(struct i2c_client *i2c) > > static const struct of_device_id tfa989x_of_match[] = { > { .compatible = "nxp,tfa9895", .data = &tfa9895_rev }, > + { .compatible = "nxp,tfa9897", .data = &tfa9897_rev }, > { } > }; > MODULE_DEVICE_TABLE(of, tfa989x_of_match); > -- > 2.31.1 > > >
On Fri, 28 May 2021 12:50:58 +0200, Vincent Knecht wrote:
> Document TFA9897 bindings.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/4] ASoC: dt-bindings: nxp,tfa989x: Add tfa9897 support
commit: 513df99993857863e42bf3d7d65d87c191ce9493
[2/4] ASoC: codecs: tfa989x: Add support for tfa9897
commit: 1ba1d69d8aa938f64cb07604b320a5074c3bb107
[3/4] ASoC: dt-bindings: nxp, tfa989x: Add vddd-supply property
commit: 9cf1a98e2b0171e2586a13197a9a1ad605336166
[4/4] ASoC: codecs: tfa989x: Add support for optional vddd-supply
commit: 8e5607e9941ce915187785bd09805bf7df9f7349
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
diff --git a/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml b/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml index 45db5776550c..46ddc1f3fc0c 100644 --- a/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml +++ b/Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml @@ -13,6 +13,7 @@ properties: compatible: enum: - nxp,tfa9895 + - nxp,tfa9897 reg: maxItems: 1
Document TFA9897 bindings. Signed-off-by: Vincent Knecht <vincent.knecht@mailoo.org> --- Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml | 1 + 1 file changed, 1 insertion(+)