| Message ID | 20180312155753.9478-2-codekipper@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 12, 2018 at 04:57:48PM +0100, codekipper@gmail.com wrote: > Some codecs require a different amount of a bit clocks per frame > than what is calculated by using the sample width. Use a slot > width override property to provide this mechanism. If this is a CODEC requirement we should really be working this out from the CODEC rather than adding a DT property on the I2S controller, or at the very least putting this in the machine drivers. The generic drivers already have support for mclk-fs and there's an operation set_bclk_ratio() for them to use though we don't have a DT binding for that yet.
Hi Marcus, On Tue, Mar 13, 2018 at 2:57 AM, <codekipper@gmail.com> wrote: > From: Marcus Cooper <codekipper@gmail.com> > > Some codecs require a different amount of a bit clocks per frame > than what is calculated by using the sample width. Use a slot > width override property to provide this mechanism. > > Signed-off-by: Marcus Cooper <codekipper@gmail.com> > --- > Documentation/devicetree/bindings/sound/sun4i-i2s.txt | 5 +++++ > sound/soc/sunxi/sun4i-i2s.c | 15 ++++++++++++--- > 2 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt > index b9d50d6cdef3..48addef65b8f 100644 > --- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt > +++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt > @@ -28,6 +28,11 @@ Required properties for the following compatibles: > - "allwinner,sun8i-h3-i2s" > - resets: phandle to the reset line for this codec > > +Optional properties: > +- allwinner,slot-width-override:if this property is present then the dai is > + configured to extend the slot width to the > + value specified. Min 8, Max 32. > + This sounds like something that would be useful for other I2S controllers. Thanks,
diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt index b9d50d6cdef3..48addef65b8f 100644 --- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt +++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt @@ -28,6 +28,11 @@ Required properties for the following compatibles: - "allwinner,sun8i-h3-i2s" - resets: phandle to the reset line for this codec +Optional properties: +- allwinner,slot-width-override:if this property is present then the dai is + configured to extend the slot width to the + value specified. Min 8, Max 32. + Example: i2s0: i2s@1c22400 { diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index a4aa931ebfae..873054a6c3be 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -193,6 +193,8 @@ struct sun4i_i2s { struct regmap_field *field_rxchansel; const struct sun4i_i2s_quirks *variant; + + unsigned int slot_width; }; struct sun4i_i2s_clk_div { @@ -344,7 +346,7 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai, if (i2s->variant->has_fmt_set_lrck_period) regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG, SUN8I_I2S_FMT0_LRCK_PERIOD_MASK, - SUN8I_I2S_FMT0_LRCK_PERIOD(32)); + SUN8I_I2S_FMT0_LRCK_PERIOD(word_size)); return 0; } @@ -418,7 +420,8 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream, sr + i2s->variant->fmt_offset); return sun4i_i2s_set_clk_rate(dai, params_rate(params), - params_width(params)); + i2s->slot_width ? + i2s->slot_width : params_width(params)); } static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) @@ -1029,7 +1032,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev) struct sun4i_i2s *i2s; struct resource *res; void __iomem *regs; - int irq, ret; + int irq, ret, val; i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL); if (!i2s) @@ -1096,6 +1099,12 @@ static int sun4i_i2s_probe(struct platform_device *pdev) i2s->capture_dma_data.addr = res->start + SUN4I_I2S_FIFO_RX_REG; i2s->capture_dma_data.maxburst = 8; + if (!of_property_read_u32(pdev->dev.of_node, + "allwinner,slot-width-override", &val)) { + if (val >= 8 && val <= 32) + i2s->slot_width = val; + } + pm_runtime_enable(&pdev->dev); if (!pm_runtime_enabled(&pdev->dev)) { ret = sun4i_i2s_runtime_resume(&pdev->dev);