| Message ID | 20201217162740.1452000-1-aford173@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e33c93b2206fedee35df756940e07af7b1f29768 |
| Headers | show |
| Series | ASoC: wm8962: Add optional mclk device tree binding | expand |
On Thu, Dec 17, 2020 at 5:27 PM Adam Ford <aford173@gmail.com> wrote: > The driver can request an optional clock for mclk. > Update the txt file to reflect this. > > Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> > Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- a/Documentation/devicetree/bindings/sound/wm8962.txt > +++ b/Documentation/devicetree/bindings/sound/wm8962.txt > @@ -9,6 +9,9 @@ Required properties: > - reg : the I2C address of the device. > > Optional properties: > + This blank line is not needed (but it will probably be removed during a future txt-to-yaml conversion ;-) > + - clocks : The clock source of the mclk > + > - spk-mono: This is a boolean property. If present, the SPK_MONO bit > of R51 (Class D Control 2) gets set, indicating that the speaker is > in mono mode. > @@ -27,6 +30,7 @@ Example: > wm8962: codec@1a { > compatible = "wlf,wm8962"; > reg = <0x1a>; > + clocks = <&clks IMX6QDL_CLK_CKO>; > > gpio-cfg = < > 0x0000 /* 0:Default */ Gr{oetje,eeting}s, Geert
On Thu, 17 Dec 2020 10:27:40 -0600, Adam Ford wrote: > The driver can request an optional clock for mclk. > Update the txt file to reflect this. > > Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> > Signed-off-by: Adam Ford <aford173@gmail.com> > Acked-by: Rob Herring <robh@kernel.org>
On Thu, Dec 17, 2020 at 10:27:40AM -0600, Adam Ford wrote: > The driver can request an optional clock for mclk. > Update the txt file to reflect this. > > Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> > Signed-off-by: Adam Ford <aford173@gmail.com> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Thanks, Charles
On Thu, 17 Dec 2020 10:27:40 -0600, Adam Ford wrote: > The driver can request an optional clock for mclk. > Update the txt file to reflect this. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: wm8962: Add optional mclk device tree binding commit: e33c93b2206fedee35df756940e07af7b1f29768 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/wm8962.txt b/Documentation/devicetree/bindings/sound/wm8962.txt index dcfa9a3369fd..c36c649ddfd0 100644 --- a/Documentation/devicetree/bindings/sound/wm8962.txt +++ b/Documentation/devicetree/bindings/sound/wm8962.txt @@ -9,6 +9,9 @@ Required properties: - reg : the I2C address of the device. Optional properties: + + - clocks : The clock source of the mclk + - spk-mono: This is a boolean property. If present, the SPK_MONO bit of R51 (Class D Control 2) gets set, indicating that the speaker is in mono mode. @@ -27,6 +30,7 @@ Example: wm8962: codec@1a { compatible = "wlf,wm8962"; reg = <0x1a>; + clocks = <&clks IMX6QDL_CLK_CKO>; gpio-cfg = < 0x0000 /* 0:Default */
The driver can request an optional clock for mclk. Update the txt file to reflect this. Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Adam Ford <aford173@gmail.com>