* [PATCH 1/2] arm64: dts: imx: imx8mn-beacon: Drop undocumented clock-names reference
2021-10-18 13:59 [PATCH 0/2] ASoC: wm8962: Conversion to json-schema and fix Geert Uytterhoeven
@ 2021-10-18 13:59 ` Geert Uytterhoeven
2021-11-21 2:27 ` Shawn Guo
2021-10-18 13:59 ` [PATCH 2/2] ASoC: dt-bindings: wlf,wm8962: Convert to json-schema Geert Uytterhoeven
2021-10-25 16:39 ` (subset) [PATCH 0/2] ASoC: wm8962: Conversion to json-schema and fix Mark Brown
2 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2021-10-18 13:59 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Rob Herring, Adam Ford, Shawn Guo, patches
Cc: alsa-devel, devicetree, linux-arm-kernel, Geert Uytterhoeven
The wlf,wm8962 Device Tree bindings do not specify a clock-names
property. Drop it.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
See also commit 190621e0f6094001 ("arm64: dts: imx8mm-beacon: Drop
unused clock-names reference").
---
arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi
index 376ca8ff721331b8..0f40b43ac091c0f9 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi
@@ -126,7 +126,6 @@ wm8962: audio-codec@1a {
compatible = "wlf,wm8962";
reg = <0x1a>;
clocks = <&clk IMX8MN_CLK_SAI3_ROOT>;
- clock-names = "xclk";
DCVDD-supply = <®_audio>;
DBVDD-supply = <®_audio>;
AVDD-supply = <®_audio>;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] ASoC: dt-bindings: wlf,wm8962: Convert to json-schema
2021-10-18 13:59 [PATCH 0/2] ASoC: wm8962: Conversion to json-schema and fix Geert Uytterhoeven
2021-10-18 13:59 ` [PATCH 1/2] arm64: dts: imx: imx8mn-beacon: Drop undocumented clock-names reference Geert Uytterhoeven
@ 2021-10-18 13:59 ` Geert Uytterhoeven
2021-10-20 14:20 ` [PATCH 2/2] ASoC: dt-bindings: wlf, wm8962: " Rob Herring
2021-10-25 10:52 ` Charles Keepax
2021-10-25 16:39 ` (subset) [PATCH 0/2] ASoC: wm8962: Conversion to json-schema and fix Mark Brown
2 siblings, 2 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2021-10-18 13:59 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Rob Herring, Adam Ford, Shawn Guo, patches
Cc: alsa-devel, devicetree, linux-arm-kernel, Geert Uytterhoeven
Convert the Wolfson WM8962 Ultra-Low Power Stereo CODEC Device Tree
binding documentation to json-schema.
Add missing *-supply and port properties.
Update the example.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
.../devicetree/bindings/sound/wlf,wm8962.yaml | 118 ++++++++++++++++++
.../devicetree/bindings/sound/wm8962.txt | 43 -------
2 files changed, 118 insertions(+), 43 deletions(-)
create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8962.yaml
delete mode 100644 Documentation/devicetree/bindings/sound/wm8962.txt
diff --git a/Documentation/devicetree/bindings/sound/wlf,wm8962.yaml b/Documentation/devicetree/bindings/sound/wlf,wm8962.yaml
new file mode 100644
index 0000000000000000..0e6249d7c1330f7e
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/wlf,wm8962.yaml
@@ -0,0 +1,118 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/wlf,wm8962.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Wolfson WM8962 Ultra-Low Power Stereo CODEC
+
+maintainers:
+ - patches@opensource.cirrus.com
+
+properties:
+ compatible:
+ const: wlf,wm8962
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+ "#sound-dai-cells":
+ const: 0
+
+ AVDD-supply:
+ description: Analogue supply.
+
+ CPVDD-supply:
+ description: Charge pump power supply.
+
+ DBVDD-supply:
+ description: Digital Buffer Supply.
+
+ DCVDD-supply:
+ description: Digital Core Supply.
+
+ MICVDD-supply:
+ description: Microphone bias amp supply.
+
+ PLLVDD-supply:
+ description: PLL Supply
+
+ SPKVDD1-supply:
+ description: Supply for left speaker drivers.
+
+ SPKVDD2-supply:
+ description: Supply for right speaker drivers.
+
+ spk-mono:
+ $ref: /schemas/types.yaml#/definitions/flag
+ description:
+ If present, the SPK_MONO bit of R51 (Class D Control 2) gets set,
+ indicating that the speaker is in mono mode.
+
+ mic-cfg:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Default register value for R48 (Additional Control 4).
+ If absent, the default should be the register default.
+
+ gpio-cfg:
+ $ref: /schemas/types.yaml#/definitions/uint32-array
+ minItems: 6
+ maxItems: 6
+ description:
+ A list of GPIO configuration register values. If absent, no
+ configuration of these registers is performed. Note that only values
+ within [0x0, 0xffff] are valid. Any other value is regarded as setting
+ the GPIO register to its reset value 0x0.
+
+ port:
+ $ref: audio-graph-port.yaml#
+ unevaluatedProperties: false
+
+required:
+ - compatible
+ - reg
+ - AVDD-supply
+ - CPVDD-supply
+ - DBVDD-supply
+ - DCVDD-supply
+ - MICVDD-supply
+ - PLLVDD-supply
+ - SPKVDD1-supply
+ - SPKVDD2-supply
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/imx6qdl-clock.h>
+
+ i2c {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ wm8962: codec@1a {
+ compatible = "wlf,wm8962";
+ reg = <0x1a>;
+ clocks = <&clks IMX6QDL_CLK_CKO>;
+ DCVDD-supply = <®_audio>;
+ DBVDD-supply = <®_audio>;
+ AVDD-supply = <®_audio>;
+ CPVDD-supply = <®_audio>;
+ MICVDD-supply = <®_audio>;
+ PLLVDD-supply = <®_audio>;
+ SPKVDD1-supply = <®_audio>;
+ SPKVDD2-supply = <®_audio>;
+ gpio-cfg = <
+ 0x0000 /* 0:Default */
+ 0x0000 /* 1:Default */
+ 0x0013 /* 2:FN_DMICCLK */
+ 0x0000 /* 3:Default */
+ 0x8014 /* 4:FN_DMICCDAT */
+ 0x0000 /* 5:Default */
+ >;
+ };
+ };
diff --git a/Documentation/devicetree/bindings/sound/wm8962.txt b/Documentation/devicetree/bindings/sound/wm8962.txt
deleted file mode 100644
index c36c649ddfd04f37..0000000000000000
--- a/Documentation/devicetree/bindings/sound/wm8962.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-WM8962 audio CODEC
-
-This device supports I2C only.
-
-Required properties:
-
- - compatible : "wlf,wm8962"
-
- - 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.
-
- - mic-cfg : Default register value for R48 (Additional Control 4).
- If absent, the default should be the register default.
-
- - gpio-cfg : A list of GPIO configuration register values. The list must
- be 6 entries long. If absent, no configuration of these registers is
- performed. And note that only the value within [0x0, 0xffff] is valid.
- Any other value is regarded as setting the GPIO register by its reset
- value 0x0.
-
-Example:
-
-wm8962: codec@1a {
- compatible = "wlf,wm8962";
- reg = <0x1a>;
- clocks = <&clks IMX6QDL_CLK_CKO>;
-
- gpio-cfg = <
- 0x0000 /* 0:Default */
- 0x0000 /* 1:Default */
- 0x0013 /* 2:FN_DMICCLK */
- 0x0000 /* 3:Default */
- 0x8014 /* 4:FN_DMICCDAT */
- 0x0000 /* 5:Default */
- >;
-};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: (subset) [PATCH 0/2] ASoC: wm8962: Conversion to json-schema and fix
2021-10-18 13:59 [PATCH 0/2] ASoC: wm8962: Conversion to json-schema and fix Geert Uytterhoeven
2021-10-18 13:59 ` [PATCH 1/2] arm64: dts: imx: imx8mn-beacon: Drop undocumented clock-names reference Geert Uytterhoeven
2021-10-18 13:59 ` [PATCH 2/2] ASoC: dt-bindings: wlf,wm8962: Convert to json-schema Geert Uytterhoeven
@ 2021-10-25 16:39 ` Mark Brown
2 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2021-10-25 16:39 UTC (permalink / raw)
To: patches, Adam Ford, Liam Girdwood, Shawn Guo, Rob Herring,
Geert Uytterhoeven
Cc: Mark Brown, linux-arm-kernel, devicetree, alsa-devel
On Mon, 18 Oct 2021 15:59:01 +0200, Geert Uytterhoeven wrote:
> Hi all,
>
> This patch series converts the Wolfson WM8962 Device Tree binding
> documentation to json-schema, after fixing an issue in the imx8mn-beacon
> DTS file.
>
> Thanks for your comments!
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[2/2] ASoC: dt-bindings: wlf,wm8962: Convert to json-schema
commit: cd51b942f34431a2a2c92a8385e94cdd97e15350
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread