| Message ID | 20230707162822.676024-1-cristian.ciocaltea@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: rockchip: Update sound card label on rk3588-rock-5b | expand |
On Fri, 7 Jul 2023 19:28:22 +0300, Cristian Ciocaltea wrote: > The audio-graph-card driver uses the 'label' property to register the > sound card in the system, but the currently assigned string is too > generic and cannot be supported by alsa-project/alsa-ucm-conf: > > card 0: Analog [Analog] > > Use the more specific naming "rk3588-es8316", which is still generic > enough to be shared with other compatible boards, e.g. Rock 5A. The > audio card will be listed as: > > [...] Applied, thanks! [1/1] arm64: dts: rockchip: Update sound card label on rk3588-rock-5b commit: 7efcaf997ae624caeccd046b6266fc2b7c0b91dc Best regards,
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 51537030f8e3..87f4d5e9458d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -18,17 +18,9 @@ chosen { stdout-path = "serial2:1500000n8"; }; - fan: pwm-fan { - compatible = "pwm-fan"; - cooling-levels = <0 95 145 195 255>; - fan-supply = <&vcc5v0_sys>; - pwms = <&pwm1 0 50000 0>; - #cooling-cells = <2>; - }; - - sound { + analog-sound { compatible = "audio-graph-card"; - label = "Analog"; + label = "rk3588-es8316"; widgets = "Microphone", "Mic Jack", "Headphone", "Headphones"; @@ -43,6 +35,14 @@ sound { pinctrl-0 = <&hp_detect>; }; + fan: pwm-fan { + compatible = "pwm-fan"; + cooling-levels = <0 95 145 195 255>; + fan-supply = <&vcc5v0_sys>; + pwms = <&pwm1 0 50000 0>; + #cooling-cells = <2>; + }; + vcc5v0_sys: vcc5v0-sys-regulator { compatible = "regulator-fixed"; regulator-name = "vcc5v0_sys";
The audio-graph-card driver uses the 'label' property to register the sound card in the system, but the currently assigned string is too generic and cannot be supported by alsa-project/alsa-ucm-conf: card 0: Analog [Analog] Use the more specific naming "rk3588-es8316", which is still generic enough to be shared with other compatible boards, e.g. Rock 5A. The audio card will be listed as: card 0: rk3588es8316 [rk3588-es8316] While at it, update also the DT node name, as there will be additional sound related nodes available, i.e. for HDMI. Note that this involves moving the node one position up, to preserve the alphabetical order. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)