- Alsa-devel - mailman.alsa-project.org

[PATCH v2 0/6] ASoC: codecs: wsa88xx: add support for static port mapping.
by srinivas.kandagatla＠linaro.org 15 Aug '24

15 Aug '24

Existing way of allocating soundwire master ports on Qualcommm platforms is dynamic, and in linear order starting from 1 to MAX_PORTS. This will work as long as soundwire device ports are 1:1 mapped linearly. However on most Qcom SoCs like SM8550, SM8650, x1e80100, these are NOT mapped in that order. The result of this is that only one speaker among the pair of speakers is always silent, With recent changes for WSA codec to support codec versions and along with these patches we are able to get all speakers working on these SoCs. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- Changes in v2: - used dev_dbg instead of dev_info - Link to v1: https://lore.kernel.org/r/20240626-port-map-v1-0-bd8987d2b332@linaro.org --- Manikantan R (1): ASoC: dt-bindings: wsa883x: Document port mapping property Srinivas Kandagatla (5): ASoC: codecs: wsa883x: parse port-mapping information ASoC: dt-bindings: wsa8840: Document port mapping property ASoC: codecs: wsa884x: parse port-mapping information arm64: dts: x1e80100-crd: fix wsa soundwire port mapping arm64: dts: x1e80100-qcp: fix wsa soundwire port mapping Documentation/devicetree/bindings/sound/qcom,wsa883x.yaml | 8 ++++++++ Documentation/devicetree/bindings/sound/qcom,wsa8840.yaml | 8 ++++++++ arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 4 ++++ arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 2 ++ sound/soc/codecs/wsa883x.c | 8 ++++++++ sound/soc/codecs/wsa884x.c | 8 ++++++++ 6 files changed, 38 insertions(+) --- base-commit: 9935be184a55dd84fc3275094f2df095491f6ea1 change-id: 20240626-port-map-ef50c3304d4a Best regards, -- Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org>

5 10

[PATCH 0/6] soc: qcom: use scoped device node handling to simplify error paths
by Krzysztof Kozlowski 15 Aug '24

15 Aug '24

Use cleanup.h/scope on device nodes to get rid of of_node_put(). Code is a bit simpler. Best regards, Krzysztof --- Krzysztof Kozlowski (6): soc: qcom: apr: simplify with scoped for each OF child loop soc: qcom: aoss: simplify with scoped for each OF child loop soc: qcom: ice: use scoped device node handling to simplify error paths soc: qcom: ocmem: use scoped device node handling to simplify error paths soc: qcom: pbs: use scoped device node handling to simplify error paths soc: qcom: smp2p: use scoped device node handling to simplify error paths drivers/soc/qcom/apr.c | 5 +---- drivers/soc/qcom/ice.c | 14 +++++--------- drivers/soc/qcom/ocmem.c | 7 ++----- drivers/soc/qcom/qcom-pbs.c | 16 ++++++---------- drivers/soc/qcom/qcom_aoss.c | 8 +++----- drivers/soc/qcom/smp2p.c | 16 ++++------------ 6 files changed, 21 insertions(+), 45 deletions(-) --- base-commit: d54f33dafd9e93367ffaf95318ed371138a6c8c0 change-id: 20240813-b4-cleanup-h-of-node-put-other-7e9c7128abe4 Best regards, -- Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>

2 7

hctltest1.py crashes with utf-8 decoding error on IEC958 "status"
by GitHub issues - edited 15 Aug '24

15 Aug '24

alsa-project/alsa-python issue #13 was edited from tormodvolden: Version 1.2.12, on Ubuntu 24.04, Python 3.12.3. It seems like the "status" member returned by `snd_ctl_elem_value_get_iec958(self->value, iec958);` on pyalsa/alsahcontrol.c line 1053 starts with 0xff then a 0x00. I haven't been able to find a corresponding node under /proc/asound to check this. The relevant aplay -L entry is ``` iec958:CARD=Stereo,DEV=0 Logitech H570e Stereo, USB Audio IEC958 (S/PDIF) Digital Audio Output ``` Here is a dump of /proc/asound/card1 (card 1 is called "Stereo") <details> ``` $ more $(find /proc/asound/card1 -type f) :::::::::::::: /proc/asound/card1/id :::::::::::::: Stereo :::::::::::::: /proc/asound/card1/pcm0c/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: CAPTURE id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 1 :::::::::::::: /proc/asound/card1/pcm0c/sub0/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: CAPTURE id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 1 :::::::::::::: /proc/asound/card1/pcm0c/sub0/status :::::::::::::: closed :::::::::::::: /proc/asound/card1/pcm0c/sub0/hw_params :::::::::::::: closed :::::::::::::: /proc/asound/card1/pcm0c/sub0/sw_params :::::::::::::: closed :::::::::::::: /proc/asound/card1/pcm0p/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: PLAYBACK id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 0 :::::::::::::: /proc/asound/card1/pcm0p/sub0/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: PLAYBACK id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 0 :::::::::::::: /proc/asound/card1/pcm0p/sub0/status :::::::::::::: state: RUNNING owner_pid : 1928 trigger_time: 270044.979966617 tstamp : 309371.219688371 delay : 1872 avail : 31520 avail_max : 32032 ----- hw_ptr : 1887652896 appl_ptr : 1887654144 :::::::::::::: /proc/asound/card1/pcm0p/sub0/hw_params :::::::::::::: access: MMAP_INTERLEAVED format: S16_LE subformat: STD channels: 2 rate: 48000 (48000/1) period_size: 256 buffer_size: 32768 :::::::::::::: /proc/asound/card1/pcm0p/sub0/sw_params :::::::::::::: tstamp_mode: ENABLE period_step: 1 avail_min: 256 start_threshold: 9223372036854775807 stop_threshold: 32768 silence_threshold: 0 silence_size: 0 boundary: 4611686018427387904 :::::::::::::: /proc/asound/card1/usbid :::::::::::::: 046d:0a56 :::::::::::::: /proc/asound/card1/usbbus :::::::::::::: 003/006 :::::::::::::: /proc/asound/card1/stream0 :::::::::::::: Logitech Inc Logitech H570e Stereo at usb-0000:00:14.0-4.4.2, full speed : USB A udio Playback: Status: Running Interface = 2 Altset = 1 Packet Size = 192 Momentary freq = 48000 Hz (0x30.0000) Interface 2 Altset 1 Format: S16_LE Channels: 2 Endpoint: 0x01 (1 OUT) (ADAPTIVE) Rates: 8000, 16000, 24000, 32000, 44100, 48000 Bits: 16 Channel map: FL FR Capture: Status: Stop Interface 1 Altset 1 Format: S16_LE Channels: 2 Endpoint: 0x81 (1 IN) (ASYNC) Rates: 8000, 16000, 24000, 32000, 44100, 48000 Bits: 16 Channel map: FL FR :::::::::::::: /proc/asound/card1/usbmixer :::::::::::::: USB Mixer: usb_id=0x046d0a56, ctrlif=0, ctlerr=0 Card: Logitech Inc Logitech H570e Stereo at usb-0000:00:14.0-4.4.2, full speed Unit: 2 Control: name="Auto Gain Control", index=0 Info: id=2, control=7, cmask=0x0, channels=1, type="BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 Unit: 2 Control: name="Headset Capture Volume", index=0 Info: id=2, control=2, cmask=0x0, channels=1, type="S16" Volume: min=-7680, max=1280, dBmin=-3000, dBmax=500 Unit: 2 Control: name="Headset Capture Switch", index=0 Info: id=2, control=1, cmask=0x0, channels=1, type="INV_BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 Unit: 5 Control: name="Headset Playback Volume", index=0 Info: id=5, control=2, cmask=0x3, channels=2, type="S16" Volume: min=-15360, max=1280, dBmin=-6000, dBmax=500 Unit: 5 Control: name="Headset Playback Switch", index=0 Info: id=5, control=1, cmask=0x0, channels=1, type="INV_BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 Unit: 11 Control: name="Sidetone Playback Volume", index=0 Info: id=11, control=2, cmask=0x0, channels=1, type="S16" Volume: min=0, max=4125, dBmin=0, dBmax=1611 Unit: 11 Control: name="Sidetone Playback Switch", index=0 Info: id=11, control=1, cmask=0x0, channels=1, type="INV_BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 ``` </details> This is the last part of the output from running `python3 test/hctltest1.py ` ``` ***** count: 1 device: 0 dimensions: None element: <alsahcontrol.Element object at 0x7e418ebb9650> id: (19, 2, 0, 0, 'IEC958 Playback Con Mask', 0) index: 0 interface: 2 is_inactive: False is_locked: False is_owner: False is_readable: True is_tlv_Commandable: False is_tlv_Writable: False is_tlv_readable: False is_user: False is_volatile: False is_writable: False name: IEC958 Playback Con Mask numid: 19 owner: -1 subdevice: 0 type: 5 (IEC958) ----- device: 0 element: <alsahcontrol.Element object at 0x7e418ebb9650> get_array: <built-in method get_array of alsahcontrol.Value object at 0x7e418ebb9620> get_tuple: <built-in method get_tuple of alsahcontrol.Value object at 0x7e418ebb9620> id: (19, 2, 0, 0, 'IEC958 Playback Con Mask', 0) index: 0 interface: 2 name: IEC958 Playback Con Mask numid: 19 read: <built-in method read of alsahcontrol.Value object at 0x7e418ebb9620> set_array: <built-in method set_array of alsahcontrol.Value object at 0x7e418ebb9620> set_tuple: <built-in method set_tuple of alsahcontrol.Value object at 0x7e418ebb9620> subdevice: 0 write: <built-in method write of alsahcontrol.Value object at 0x7e418ebb9620> UnicodeDecodeError: 'utf-8' codec can't decode byte 0xff in position 1: invalid start byte The above exception was the direct cause of the following exception: Traceback (most recent call last): File "/home/tormod/SOURCES/pyalsa-debian/python-pyalsa/test/hctltest1.py", line 69, in <module> value(element1) File "/home/tormod/SOURCES/pyalsa-debian/python-pyalsa/test/hctltest1.py", line 36, in value values = value.get_tuple(info.type, info.count) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SystemError: <method 'get_tuple' of 'alsahcontrol.Value' objects> returned a result with an exception set ``` info.type is 5 info.count is 1 Issue URL : https://github.com/alsa-project/alsa-python/issues/13 Repository URL: https://github.com/alsa-project/alsa-python

1 0

hctltest1.py crashes with utf-8 decoding error on IEC958 "status"
by GitHub issues - edited 15 Aug '24

15 Aug '24

alsa-project/alsa-python issue #13 was edited from tormodvolden: Version 1.2.12, on Ubuntu 24.04, Python 3.12. It seems like the "status" member returned by `snd_ctl_elem_value_get_iec958(self->value, iec958);` on pyalsa/alsahcontrol.c line 1053 starts with 0xff then a 0x00. I haven't been able to find a corresponding node under /proc/asound to check this. The relevant aplay -L entry is ``` iec958:CARD=Stereo,DEV=0 Logitech H570e Stereo, USB Audio IEC958 (S/PDIF) Digital Audio Output ``` Here is a dump of /proc/asound/card1 (card 1 is called "Stereo") <details> ``` $ more $(find /proc/asound/card1 -type f) :::::::::::::: /proc/asound/card1/id :::::::::::::: Stereo :::::::::::::: /proc/asound/card1/pcm0c/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: CAPTURE id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 1 :::::::::::::: /proc/asound/card1/pcm0c/sub0/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: CAPTURE id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 1 :::::::::::::: /proc/asound/card1/pcm0c/sub0/status :::::::::::::: closed :::::::::::::: /proc/asound/card1/pcm0c/sub0/hw_params :::::::::::::: closed :::::::::::::: /proc/asound/card1/pcm0c/sub0/sw_params :::::::::::::: closed :::::::::::::: /proc/asound/card1/pcm0p/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: PLAYBACK id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 0 :::::::::::::: /proc/asound/card1/pcm0p/sub0/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: PLAYBACK id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 0 :::::::::::::: /proc/asound/card1/pcm0p/sub0/status :::::::::::::: state: RUNNING owner_pid : 1928 trigger_time: 270044.979966617 tstamp : 309371.219688371 delay : 1872 avail : 31520 avail_max : 32032 ----- hw_ptr : 1887652896 appl_ptr : 1887654144 :::::::::::::: /proc/asound/card1/pcm0p/sub0/hw_params :::::::::::::: access: MMAP_INTERLEAVED format: S16_LE subformat: STD channels: 2 rate: 48000 (48000/1) period_size: 256 buffer_size: 32768 :::::::::::::: /proc/asound/card1/pcm0p/sub0/sw_params :::::::::::::: tstamp_mode: ENABLE period_step: 1 avail_min: 256 start_threshold: 9223372036854775807 stop_threshold: 32768 silence_threshold: 0 silence_size: 0 boundary: 4611686018427387904 :::::::::::::: /proc/asound/card1/usbid :::::::::::::: 046d:0a56 :::::::::::::: /proc/asound/card1/usbbus :::::::::::::: 003/006 :::::::::::::: /proc/asound/card1/stream0 :::::::::::::: Logitech Inc Logitech H570e Stereo at usb-0000:00:14.0-4.4.2, full speed : USB A udio Playback: Status: Running Interface = 2 Altset = 1 Packet Size = 192 Momentary freq = 48000 Hz (0x30.0000) Interface 2 Altset 1 Format: S16_LE Channels: 2 Endpoint: 0x01 (1 OUT) (ADAPTIVE) Rates: 8000, 16000, 24000, 32000, 44100, 48000 Bits: 16 Channel map: FL FR Capture: Status: Stop Interface 1 Altset 1 Format: S16_LE Channels: 2 Endpoint: 0x81 (1 IN) (ASYNC) Rates: 8000, 16000, 24000, 32000, 44100, 48000 Bits: 16 Channel map: FL FR :::::::::::::: /proc/asound/card1/usbmixer :::::::::::::: USB Mixer: usb_id=0x046d0a56, ctrlif=0, ctlerr=0 Card: Logitech Inc Logitech H570e Stereo at usb-0000:00:14.0-4.4.2, full speed Unit: 2 Control: name="Auto Gain Control", index=0 Info: id=2, control=7, cmask=0x0, channels=1, type="BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 Unit: 2 Control: name="Headset Capture Volume", index=0 Info: id=2, control=2, cmask=0x0, channels=1, type="S16" Volume: min=-7680, max=1280, dBmin=-3000, dBmax=500 Unit: 2 Control: name="Headset Capture Switch", index=0 Info: id=2, control=1, cmask=0x0, channels=1, type="INV_BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 Unit: 5 Control: name="Headset Playback Volume", index=0 Info: id=5, control=2, cmask=0x3, channels=2, type="S16" Volume: min=-15360, max=1280, dBmin=-6000, dBmax=500 Unit: 5 Control: name="Headset Playback Switch", index=0 Info: id=5, control=1, cmask=0x0, channels=1, type="INV_BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 Unit: 11 Control: name="Sidetone Playback Volume", index=0 Info: id=11, control=2, cmask=0x0, channels=1, type="S16" Volume: min=0, max=4125, dBmin=0, dBmax=1611 Unit: 11 Control: name="Sidetone Playback Switch", index=0 Info: id=11, control=1, cmask=0x0, channels=1, type="INV_BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 ``` </details> This is the last part of the output from running `python3 test/hctltest1.py ` ``` ***** count: 1 device: 0 dimensions: None element: <alsahcontrol.Element object at 0x7e418ebb9650> id: (19, 2, 0, 0, 'IEC958 Playback Con Mask', 0) index: 0 interface: 2 is_inactive: False is_locked: False is_owner: False is_readable: True is_tlv_Commandable: False is_tlv_Writable: False is_tlv_readable: False is_user: False is_volatile: False is_writable: False name: IEC958 Playback Con Mask numid: 19 owner: -1 subdevice: 0 type: 5 (IEC958) ----- device: 0 element: <alsahcontrol.Element object at 0x7e418ebb9650> get_array: <built-in method get_array of alsahcontrol.Value object at 0x7e418ebb9620> get_tuple: <built-in method get_tuple of alsahcontrol.Value object at 0x7e418ebb9620> id: (19, 2, 0, 0, 'IEC958 Playback Con Mask', 0) index: 0 interface: 2 name: IEC958 Playback Con Mask numid: 19 read: <built-in method read of alsahcontrol.Value object at 0x7e418ebb9620> set_array: <built-in method set_array of alsahcontrol.Value object at 0x7e418ebb9620> set_tuple: <built-in method set_tuple of alsahcontrol.Value object at 0x7e418ebb9620> subdevice: 0 write: <built-in method write of alsahcontrol.Value object at 0x7e418ebb9620> UnicodeDecodeError: 'utf-8' codec can't decode byte 0xff in position 1: invalid start byte The above exception was the direct cause of the following exception: Traceback (most recent call last): File "/home/tormod/SOURCES/pyalsa-debian/python-pyalsa/test/hctltest1.py", line 69, in <module> value(element1) File "/home/tormod/SOURCES/pyalsa-debian/python-pyalsa/test/hctltest1.py", line 36, in value values = value.get_tuple(info.type, info.count) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SystemError: <method 'get_tuple' of 'alsahcontrol.Value' objects> returned a result with an exception set ``` info.type is 5 info.count is 1 Issue URL : https://github.com/alsa-project/alsa-python/issues/13 Repository URL: https://github.com/alsa-project/alsa-python

1 0

hctltest1.py crashes with utf-8 decoding error on IEC958 "status"
by GitHub issues - opened 15 Aug '24

15 Aug '24

alsa-project/alsa-python issue #13 was opened from tormodvolden: It seems like the "status" member returned by `snd_ctl_elem_value_get_iec958(self->value, iec958);` on pyalsa/alsahcontrol.c line 1053 starts with 0xff then a 0x00. I haven't been able to find a corresponding node under /proc/asound to check this. The relevant aplay -L entry is ``` iec958:CARD=Stereo,DEV=0 Logitech H570e Stereo, USB Audio IEC958 (S/PDIF) Digital Audio Output ``` Here is a dump of /proc/asound/card1 (card 1 is called "Stereo") <details> ``` $ more $(find /proc/asound/card1 -type f) :::::::::::::: /proc/asound/card1/id :::::::::::::: Stereo :::::::::::::: /proc/asound/card1/pcm0c/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: CAPTURE id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 1 :::::::::::::: /proc/asound/card1/pcm0c/sub0/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: CAPTURE id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 1 :::::::::::::: /proc/asound/card1/pcm0c/sub0/status :::::::::::::: closed :::::::::::::: /proc/asound/card1/pcm0c/sub0/hw_params :::::::::::::: closed :::::::::::::: /proc/asound/card1/pcm0c/sub0/sw_params :::::::::::::: closed :::::::::::::: /proc/asound/card1/pcm0p/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: PLAYBACK id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 0 :::::::::::::: /proc/asound/card1/pcm0p/sub0/info :::::::::::::: card: 1 device: 0 subdevice: 0 stream: PLAYBACK id: USB Audio name: USB Audio subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 0 :::::::::::::: /proc/asound/card1/pcm0p/sub0/status :::::::::::::: state: RUNNING owner_pid : 1928 trigger_time: 270044.979966617 tstamp : 309371.219688371 delay : 1872 avail : 31520 avail_max : 32032 ----- hw_ptr : 1887652896 appl_ptr : 1887654144 :::::::::::::: /proc/asound/card1/pcm0p/sub0/hw_params :::::::::::::: access: MMAP_INTERLEAVED format: S16_LE subformat: STD channels: 2 rate: 48000 (48000/1) period_size: 256 buffer_size: 32768 :::::::::::::: /proc/asound/card1/pcm0p/sub0/sw_params :::::::::::::: tstamp_mode: ENABLE period_step: 1 avail_min: 256 start_threshold: 9223372036854775807 stop_threshold: 32768 silence_threshold: 0 silence_size: 0 boundary: 4611686018427387904 :::::::::::::: /proc/asound/card1/usbid :::::::::::::: 046d:0a56 :::::::::::::: /proc/asound/card1/usbbus :::::::::::::: 003/006 :::::::::::::: /proc/asound/card1/stream0 :::::::::::::: Logitech Inc Logitech H570e Stereo at usb-0000:00:14.0-4.4.2, full speed : USB A udio Playback: Status: Running Interface = 2 Altset = 1 Packet Size = 192 Momentary freq = 48000 Hz (0x30.0000) Interface 2 Altset 1 Format: S16_LE Channels: 2 Endpoint: 0x01 (1 OUT) (ADAPTIVE) Rates: 8000, 16000, 24000, 32000, 44100, 48000 Bits: 16 Channel map: FL FR Capture: Status: Stop Interface 1 Altset 1 Format: S16_LE Channels: 2 Endpoint: 0x81 (1 IN) (ASYNC) Rates: 8000, 16000, 24000, 32000, 44100, 48000 Bits: 16 Channel map: FL FR :::::::::::::: /proc/asound/card1/usbmixer :::::::::::::: USB Mixer: usb_id=0x046d0a56, ctrlif=0, ctlerr=0 Card: Logitech Inc Logitech H570e Stereo at usb-0000:00:14.0-4.4.2, full speed Unit: 2 Control: name="Auto Gain Control", index=0 Info: id=2, control=7, cmask=0x0, channels=1, type="BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 Unit: 2 Control: name="Headset Capture Volume", index=0 Info: id=2, control=2, cmask=0x0, channels=1, type="S16" Volume: min=-7680, max=1280, dBmin=-3000, dBmax=500 Unit: 2 Control: name="Headset Capture Switch", index=0 Info: id=2, control=1, cmask=0x0, channels=1, type="INV_BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 Unit: 5 Control: name="Headset Playback Volume", index=0 Info: id=5, control=2, cmask=0x3, channels=2, type="S16" Volume: min=-15360, max=1280, dBmin=-6000, dBmax=500 Unit: 5 Control: name="Headset Playback Switch", index=0 Info: id=5, control=1, cmask=0x0, channels=1, type="INV_BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 Unit: 11 Control: name="Sidetone Playback Volume", index=0 Info: id=11, control=2, cmask=0x0, channels=1, type="S16" Volume: min=0, max=4125, dBmin=0, dBmax=1611 Unit: 11 Control: name="Sidetone Playback Switch", index=0 Info: id=11, control=1, cmask=0x0, channels=1, type="INV_BOOLEAN" Volume: min=0, max=1, dBmin=0, dBmax=0 ``` </details> This is the last part of the output from running `python3 test/hctltest1.py ` ``` ***** count: 1 device: 0 dimensions: None element: <alsahcontrol.Element object at 0x7e418ebb9650> id: (19, 2, 0, 0, 'IEC958 Playback Con Mask', 0) index: 0 interface: 2 is_inactive: False is_locked: False is_owner: False is_readable: True is_tlv_Commandable: False is_tlv_Writable: False is_tlv_readable: False is_user: False is_volatile: False is_writable: False name: IEC958 Playback Con Mask numid: 19 owner: -1 subdevice: 0 type: 5 (IEC958) ----- device: 0 element: <alsahcontrol.Element object at 0x7e418ebb9650> get_array: <built-in method get_array of alsahcontrol.Value object at 0x7e418ebb9620> get_tuple: <built-in method get_tuple of alsahcontrol.Value object at 0x7e418ebb9620> id: (19, 2, 0, 0, 'IEC958 Playback Con Mask', 0) index: 0 interface: 2 name: IEC958 Playback Con Mask numid: 19 read: <built-in method read of alsahcontrol.Value object at 0x7e418ebb9620> set_array: <built-in method set_array of alsahcontrol.Value object at 0x7e418ebb9620> set_tuple: <built-in method set_tuple of alsahcontrol.Value object at 0x7e418ebb9620> subdevice: 0 write: <built-in method write of alsahcontrol.Value object at 0x7e418ebb9620> UnicodeDecodeError: 'utf-8' codec can't decode byte 0xff in position 1: invalid start byte The above exception was the direct cause of the following exception: Traceback (most recent call last): File "/home/tormod/SOURCES/pyalsa-debian/python-pyalsa/test/hctltest1.py", line 69, in <module> value(element1) File "/home/tormod/SOURCES/pyalsa-debian/python-pyalsa/test/hctltest1.py", line 36, in value values = value.get_tuple(info.type, info.count) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SystemError: <method 'get_tuple' of 'alsahcontrol.Value' objects> returned a result with an exception set ``` info.type is 5 info.count is 1 Issue URL : https://github.com/alsa-project/alsa-python/issues/13 Repository URL: https://github.com/alsa-project/alsa-python

1 0

[PATCH] ASoc: tas2781: Remove unnecessary line feed and space
by Shenghao Ding 15 Aug '24

15 Aug '24

Remove unnecessary line feed for tasdevice_dsp_create_ctrls, and remove two unnecessary spaces in tas2563_digital_gain_get and tas2563_digital_gain_put. Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- sound/soc/codecs/tas2781-i2c.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 8c9efd9183ff..9a32e0504857 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -157,7 +157,7 @@ static int tas2563_digital_gain_get( mutex_lock(&tas_dev->codec_lock); /* Read the primary device */ - ret = tasdevice_dev_bulk_read(tas_dev, 0, reg, data, 4); + ret = tasdevice_dev_bulk_read(tas_dev, 0, reg, data, 4); if (ret) { dev_err(tas_dev->dev, "%s, get AMP vol error\n", __func__); goto out; @@ -203,7 +203,7 @@ static int tas2563_digital_gain_put( vol = clamp(vol, 0, max); mutex_lock(&tas_dev->codec_lock); /* Read the primary device */ - ret = tasdevice_dev_bulk_read(tas_dev, 0, reg, data, 4); + ret = tasdevice_dev_bulk_read(tas_dev, 0, reg, data, 4); if (ret) { dev_err(tas_dev->dev, "%s, get AMP vol error\n", __func__); rc = -1; @@ -423,8 +423,7 @@ static int tasdevice_configuration_put( return ret; } -static int tasdevice_dsp_create_ctrls( - struct tasdevice_priv *tas_priv) +static int tasdevice_dsp_create_ctrls(struct tasdevice_priv *tas_priv) { struct snd_kcontrol_new *dsp_ctrls; char *prog_name, *conf_name; -- 2.34.1

2 1

[PATCH alsa-lib] test: Add an example program to inquire UMP Endpoint and Block info
by Takashi Iwai 15 Aug '24

15 Aug '24

Provide an example program to inquire UMP Endpoint and Block info in various APIs. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- test/Makefile.am | 3 +- test/umpinfo.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 test/umpinfo.c diff --git a/test/Makefile.am b/test/Makefile.am index 635fa39bb7e3..707063cc9fc0 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS=. lsb check_PROGRAMS=control pcm pcm_min latency seq seq-ump-example \ - playmidi1 timer rawmidi midiloop \ + playmidi1 timer rawmidi midiloop umpinfo \ oldapi queue_timer namehint client_event_filter \ chmap audio_time user-ctl-element-set pcm-multi-thread @@ -17,6 +17,7 @@ playmidi1_LDADD=../src/libasound.la timer_LDADD=../src/libasound.la rawmidi_LDADD=../src/libasound.la midiloop_LDADD=../src/libasound.la +umpinfo_LDADD=../src/libasound.la oldapi_LDADD=../src/libasound.la queue_timer_LDADD=../src/libasound.la namehint_LDADD=../src/libasound.la diff --git a/test/umpinfo.c b/test/umpinfo.c new file mode 100644 index 000000000000..92a209361861 --- /dev/null +++ b/test/umpinfo.c @@ -0,0 +1,147 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// Inquire UMP Endpoint and Block info in various APIs + +#include <stdio.h> +#include <alsa/asoundlib.h> + +enum { UNKNOWN, SEQ, RAWMIDI, CTL }; +static int mode = UNKNOWN; + +static snd_seq_t *seq; +static int client; +static snd_ump_t *ump; +static snd_ctl_t *ctl; + +static int get_ump_endpoint_info(snd_ump_endpoint_info_t *ep) +{ + switch (mode) { + case SEQ: + return snd_seq_get_ump_endpoint_info(seq, client, ep); + case RAWMIDI: + return snd_ump_endpoint_info(ump, ep); + case CTL: + return snd_ctl_ump_endpoint_info(ctl, ep); + default: + return -EINVAL; + } +} + +static int get_ump_block_info(int blk, snd_ump_block_info_t *bp) +{ + switch (mode) { + case SEQ: + return snd_seq_get_ump_block_info(seq, client, blk, bp); + case RAWMIDI: + snd_ump_block_info_set_block_id(bp, blk); + return snd_ump_block_info(ump, bp); + case CTL: + snd_ump_block_info_set_block_id(bp, blk); + return snd_ctl_ump_block_info(ctl, bp); + default: + return -EINVAL; + } +} + +static void help(void) +{ + printf("umpinfo: inquire UMP Endpoint and Block info\n" + " umpinfo -c target inquiry via control API\n" + " umpinfo -m target inquiry via UMP rawmidi API\n" + " umpinfo -s client inquiry via sequencer API\n" + " target = hw:0, etc\n" + " client = sequencer client number\n"); + exit(1); +} + +int main(int argc, char **argv) +{ + const char *target = "hw:0"; + snd_ump_endpoint_info_t *ep; + snd_ump_block_info_t *blk; + const unsigned char *s; + int c, i, num_blks; + + while ((c = getopt(argc, argv, "s:m:c:h")) >= 0) { + switch (c) { + case 's': + mode = SEQ; + client = atoi(target); + break; + case 'm': + mode = RAWMIDI; + target = optarg; + break; + case 'c': + mode = CTL; + target = optarg; + break; + default: + help(); + break; + } + } + + switch (mode) { + case SEQ: + if (snd_seq_open(&seq, "default", SND_SEQ_OPEN_DUPLEX, 0)) { + fprintf(stderr, "failed to open sequencer\n"); + return 1; + } + break; + case RAWMIDI: + if (snd_ump_open(&ump, NULL, target, 0)) { + fprintf(stderr, "failed to open UMP rawmidi\n"); + return 1; + } + break; + case CTL: + if (snd_ctl_open(&ctl, target, 0)) { + fprintf(stderr, "failed to open control\n"); + return 1; + } + break; + default: + help(); + break; + } + + snd_ump_endpoint_info_alloca(&ep); + snd_ump_block_info_alloca(&blk); + + if (get_ump_endpoint_info(ep)) { + fprintf(stderr, "failed to get UMP EP info\n"); + return 1; + } + + printf("Name: %s\n", snd_ump_endpoint_info_get_name(ep)); + printf("Product ID: %s\n", snd_ump_endpoint_info_get_product_id(ep)); + printf("Flags: 0x%x\n", snd_ump_endpoint_info_get_flags(ep)); + printf("Protocol Caps: 0x%x\n", snd_ump_endpoint_info_get_protocol_caps(ep)); + printf("Protocol: 0x%x\n", snd_ump_endpoint_info_get_protocol(ep)); + printf("Num Blocks: %d\n", snd_ump_endpoint_info_get_num_blocks(ep)); + printf("Version: 0x%x\n", snd_ump_endpoint_info_get_version(ep)); + printf("Manufacturer ID: 0x%x\n", snd_ump_endpoint_info_get_manufacturer_id(ep)); + printf("Family ID: 0x%x\n", snd_ump_endpoint_info_get_family_id(ep)); + printf("Model ID: 0x%x\n", snd_ump_endpoint_info_get_model_id(ep)); + s = snd_ump_endpoint_info_get_sw_revision(ep); + printf("SW Revision: %02x:%02x:%02x:%02x\n", s[0], s[1], s[2], s[3]); + num_blks = snd_ump_endpoint_info_get_num_blocks(ep); + for (i = 0; i < num_blks; i++) { + if (get_ump_block_info(i, blk)) { + fprintf(stderr, "failed to get UMP Block info for %d\n", i); + continue; + } + printf("\n"); + printf("Block ID: %d\n", snd_ump_block_info_get_block_id(blk)); + printf("Name: %s\n", snd_ump_block_info_get_name(blk)); + printf("Active: %d\n", snd_ump_block_info_get_active(blk)); + printf("Flags: 0x%x\n", snd_ump_block_info_get_flags(blk)); + printf("Direction: %d\n", snd_ump_block_info_get_direction(blk)); + printf("First Group: %d\n", snd_ump_block_info_get_first_group(blk)); + printf("Num Groups: %d\n", snd_ump_block_info_get_num_groups(blk)); + printf("MIDI-CI Version: %d\n", snd_ump_block_info_get_midi_ci_version(blk)); + printf("Sysex8 Streams: %d\n", snd_ump_block_info_get_sysex8_streams(blk)); + } + + return 0; +} -- 2.43.0

1 0

[PATCH alsa-lib] control: Make ump_{endpoint|block}_info calls optional
by Takashi Iwai 15 Aug '24

15 Aug '24

Add the NULL check for ump_endpoint_info and ump_block_info calls. Those can be NULl depending on the target. Fixes: 81b0cf46d16a ("control: Add UMP Endpoint and Block info query support") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/control/control.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/control/control.c b/src/control/control.c index d77ab24cc69c..e443d5436103 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -1293,7 +1293,10 @@ int snd_ctl_ump_next_device(snd_ctl_t *ctl, int *device) int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info) { assert(ctl && info); - return ctl->ops->ump_endpoint_info(ctl, info); + fprintf(stderr, "%s:%d\n", __func__, __LINE__); + if (ctl->ops->ump_endpoint_info) + return ctl->ops->ump_endpoint_info(ctl, info); + return -ENXIO; } /** @@ -1305,7 +1308,9 @@ int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info) int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info) { assert(ctl && info); - return ctl->ops->ump_block_info(ctl, info); + if (ctl->ops->ump_block_info) + return ctl->ops->ump_block_info(ctl, info); + return -ENXIO; } /** -- 2.43.0

1 0

[PATCH 5.10 031/352] ARM: pxa: spitz: use gpio descriptors for audio
by Greg Kroah-Hartman 15 Aug '24

15 Aug '24

5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann <arnd(a)arndb.de> [ Upstream commit 726d8c965bae2d7468445d990849e281dca8cbf7 ] The audio driver should not use a hardwired gpio number from the header. Change it to use a lookup table. Acked-by: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Reviewed-by: Linus Walleij <linus.walleij(a)linaro.org> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Stable-dep-of: 78ab3d352f29 ("ARM: spitz: fix GPIO assignment for backlight") Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/arm/mach-pxa/spitz.c | 33 ++++++++++- arch/arm/mach-pxa/{include/mach => }/spitz.h | 2 +- arch/arm/mach-pxa/spitz_pm.c | 2 +- sound/soc/pxa/spitz.c | 58 ++++++++------------ 4 files changed, 57 insertions(+), 38 deletions(-) rename arch/arm/mach-pxa/{include/mach => }/spitz.h (99%) diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 264de0bc97d68..8f880dbc05fdb 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -43,7 +43,7 @@ #include <linux/platform_data/mmc-pxamci.h> #include <linux/platform_data/usb-ohci-pxa27x.h> #include <linux/platform_data/video-pxafb.h> -#include <mach/spitz.h> +#include "spitz.h" #include "sharpsl_pm.h" #include <mach/smemc.h> @@ -954,11 +954,42 @@ static void __init spitz_i2c_init(void) static inline void spitz_i2c_init(void) {} #endif +static struct gpiod_lookup_table spitz_audio_gpio_table = { + .dev_id = "spitz-audio", + .table = { + GPIO_LOOKUP("sharp-scoop.0", SPITZ_GPIO_MUTE_L - SPITZ_SCP_GPIO_BASE, + "mute-l", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("sharp-scoop.0", SPITZ_GPIO_MUTE_R - SPITZ_SCP_GPIO_BASE, + "mute-r", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("sharp-scoop.1", SPITZ_GPIO_MIC_BIAS - SPITZ_SCP2_GPIO_BASE, + "mic", GPIO_ACTIVE_HIGH), + { }, + }, +}; + +static struct gpiod_lookup_table akita_audio_gpio_table = { + .dev_id = "spitz-audio", + .table = { + GPIO_LOOKUP("sharp-scoop.0", SPITZ_GPIO_MUTE_L - SPITZ_SCP_GPIO_BASE, + "mute-l", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("sharp-scoop.0", SPITZ_GPIO_MUTE_R - SPITZ_SCP_GPIO_BASE, + "mute-r", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("i2c-max7310", AKITA_GPIO_MIC_BIAS - AKITA_IOEXP_GPIO_BASE, + "mic", GPIO_ACTIVE_HIGH), + { }, + }, +}; + /****************************************************************************** * Audio devices ******************************************************************************/ static inline void spitz_audio_init(void) { + if (machine_is_akita()) + gpiod_add_lookup_table(&akita_audio_gpio_table); + else + gpiod_add_lookup_table(&spitz_audio_gpio_table); + platform_device_register_simple("spitz-audio", -1, NULL, 0); } diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/spitz.h similarity index 99% rename from arch/arm/mach-pxa/include/mach/spitz.h rename to arch/arm/mach-pxa/spitz.h index 04828d8918aa3..f97e3ebd762d5 100644 --- a/arch/arm/mach-pxa/include/mach/spitz.h +++ b/arch/arm/mach-pxa/spitz.h @@ -11,7 +11,7 @@ #define __ASM_ARCH_SPITZ_H 1 #endif -#include "irqs.h" /* PXA_NR_BUILTIN_GPIO, PXA_GPIO_TO_IRQ */ +#include <mach/irqs.h> /* PXA_NR_BUILTIN_GPIO, PXA_GPIO_TO_IRQ */ #include <linux/fb.h> /* Spitz/Akita GPIOs */ diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 25a1f8c5a7382..6167f96d7b41e 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c @@ -20,7 +20,7 @@ #include <asm/mach-types.h> #include <mach/hardware.h> -#include <mach/spitz.h> +#include "spitz.h" #include "pxa27x.h" #include "sharpsl_pm.h" diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 7c1384a869ca4..44303b6eb228b 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -14,13 +14,12 @@ #include <linux/timer.h> #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/spitz.h> #include "../codecs/wm8750.h" #include "pxa2xx-i2s.h" @@ -37,7 +36,7 @@ static int spitz_jack_func; static int spitz_spk_func; -static int spitz_mic_gpio; +static struct gpio_desc *gpiod_mic, *gpiod_mute_l, *gpiod_mute_r; static void spitz_ext_control(struct snd_soc_dapm_context *dapm) { @@ -56,8 +55,8 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack"); snd_soc_dapm_enable_pin_unlocked(dapm, "Headphone Jack"); - gpio_set_value(SPITZ_GPIO_MUTE_L, 1); - gpio_set_value(SPITZ_GPIO_MUTE_R, 1); + gpiod_set_value(gpiod_mute_l, 1); + gpiod_set_value(gpiod_mute_r, 1); break; case SPITZ_MIC: /* enable mic jack and bias, mute hp */ @@ -65,8 +64,8 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack"); snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack"); - gpio_set_value(SPITZ_GPIO_MUTE_L, 0); - gpio_set_value(SPITZ_GPIO_MUTE_R, 0); + gpiod_set_value(gpiod_mute_l, 0); + gpiod_set_value(gpiod_mute_r, 0); break; case SPITZ_LINE: /* enable line jack, disable mic bias and mute hp */ @@ -74,8 +73,8 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack"); snd_soc_dapm_enable_pin_unlocked(dapm, "Line Jack"); - gpio_set_value(SPITZ_GPIO_MUTE_L, 0); - gpio_set_value(SPITZ_GPIO_MUTE_R, 0); + gpiod_set_value(gpiod_mute_l, 0); + gpiod_set_value(gpiod_mute_r, 0); break; case SPITZ_HEADSET: /* enable and unmute headset jack enable mic bias, mute L hp */ @@ -83,8 +82,8 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack"); snd_soc_dapm_enable_pin_unlocked(dapm, "Headset Jack"); - gpio_set_value(SPITZ_GPIO_MUTE_L, 0); - gpio_set_value(SPITZ_GPIO_MUTE_R, 1); + gpiod_set_value(gpiod_mute_l, 0); + gpiod_set_value(gpiod_mute_r, 1); break; case SPITZ_HP_OFF: @@ -93,8 +92,8 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack"); - gpio_set_value(SPITZ_GPIO_MUTE_L, 0); - gpio_set_value(SPITZ_GPIO_MUTE_R, 0); + gpiod_set_value(gpiod_mute_l, 0); + gpiod_set_value(gpiod_mute_r, 0); break; } @@ -199,7 +198,7 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol, static int spitz_mic_bias(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { - gpio_set_value_cansleep(spitz_mic_gpio, SND_SOC_DAPM_EVENT_ON(event)); + gpiod_set_value_cansleep(gpiod_mic, SND_SOC_DAPM_EVENT_ON(event)); return 0; } @@ -287,39 +286,28 @@ static int spitz_probe(struct platform_device *pdev) struct snd_soc_card *card = &snd_soc_spitz; int ret; - if (machine_is_akita()) - spitz_mic_gpio = AKITA_GPIO_MIC_BIAS; - else - spitz_mic_gpio = SPITZ_GPIO_MIC_BIAS; - - ret = gpio_request(spitz_mic_gpio, "MIC GPIO"); - if (ret) - goto err1; - - ret = gpio_direction_output(spitz_mic_gpio, 0); - if (ret) - goto err2; + gpiod_mic = devm_gpiod_get(&pdev->dev, "mic", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_mic)) + return PTR_ERR(gpiod_mic); + gpiod_mute_l = devm_gpiod_get(&pdev->dev, "mute-l", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_mute_l)) + return PTR_ERR(gpiod_mute_l); + gpiod_mute_r = devm_gpiod_get(&pdev->dev, "mute-r", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_mute_r)) + return PTR_ERR(gpiod_mute_r); card->dev = &pdev->dev; ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret) { + if (ret) dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); - goto err2; - } - - return 0; -err2: - gpio_free(spitz_mic_gpio); -err1: return ret; } static int spitz_remove(struct platform_device *pdev) { - gpio_free(spitz_mic_gpio); return 0; } -- 2.43.0

1 0

[PATCH 5.15 039/484] ARM: pxa: spitz: use gpio descriptors for audio
by Greg Kroah-Hartman 15 Aug '24

15 Aug '24

5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann <arnd(a)arndb.de> [ Upstream commit 726d8c965bae2d7468445d990849e281dca8cbf7 ] The audio driver should not use a hardwired gpio number from the header. Change it to use a lookup table. Acked-by: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Reviewed-by: Linus Walleij <linus.walleij(a)linaro.org> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Stable-dep-of: 78ab3d352f29 ("ARM: spitz: fix GPIO assignment for backlight") Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/arm/mach-pxa/spitz.c | 33 ++++++++++- arch/arm/mach-pxa/{include/mach => }/spitz.h | 2 +- arch/arm/mach-pxa/spitz_pm.c | 2 +- sound/soc/pxa/spitz.c | 58 ++++++++------------ 4 files changed, 57 insertions(+), 38 deletions(-) rename arch/arm/mach-pxa/{include/mach => }/spitz.h (99%) diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 264de0bc97d68..8f880dbc05fdb 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -43,7 +43,7 @@ #include <linux/platform_data/mmc-pxamci.h> #include <linux/platform_data/usb-ohci-pxa27x.h> #include <linux/platform_data/video-pxafb.h> -#include <mach/spitz.h> +#include "spitz.h" #include "sharpsl_pm.h" #include <mach/smemc.h> @@ -954,11 +954,42 @@ static void __init spitz_i2c_init(void) static inline void spitz_i2c_init(void) {} #endif +static struct gpiod_lookup_table spitz_audio_gpio_table = { + .dev_id = "spitz-audio", + .table = { + GPIO_LOOKUP("sharp-scoop.0", SPITZ_GPIO_MUTE_L - SPITZ_SCP_GPIO_BASE, + "mute-l", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("sharp-scoop.0", SPITZ_GPIO_MUTE_R - SPITZ_SCP_GPIO_BASE, + "mute-r", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("sharp-scoop.1", SPITZ_GPIO_MIC_BIAS - SPITZ_SCP2_GPIO_BASE, + "mic", GPIO_ACTIVE_HIGH), + { }, + }, +}; + +static struct gpiod_lookup_table akita_audio_gpio_table = { + .dev_id = "spitz-audio", + .table = { + GPIO_LOOKUP("sharp-scoop.0", SPITZ_GPIO_MUTE_L - SPITZ_SCP_GPIO_BASE, + "mute-l", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("sharp-scoop.0", SPITZ_GPIO_MUTE_R - SPITZ_SCP_GPIO_BASE, + "mute-r", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("i2c-max7310", AKITA_GPIO_MIC_BIAS - AKITA_IOEXP_GPIO_BASE, + "mic", GPIO_ACTIVE_HIGH), + { }, + }, +}; + /****************************************************************************** * Audio devices ******************************************************************************/ static inline void spitz_audio_init(void) { + if (machine_is_akita()) + gpiod_add_lookup_table(&akita_audio_gpio_table); + else + gpiod_add_lookup_table(&spitz_audio_gpio_table); + platform_device_register_simple("spitz-audio", -1, NULL, 0); } diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/spitz.h similarity index 99% rename from arch/arm/mach-pxa/include/mach/spitz.h rename to arch/arm/mach-pxa/spitz.h index 04828d8918aa3..f97e3ebd762d5 100644 --- a/arch/arm/mach-pxa/include/mach/spitz.h +++ b/arch/arm/mach-pxa/spitz.h @@ -11,7 +11,7 @@ #define __ASM_ARCH_SPITZ_H 1 #endif -#include "irqs.h" /* PXA_NR_BUILTIN_GPIO, PXA_GPIO_TO_IRQ */ +#include <mach/irqs.h> /* PXA_NR_BUILTIN_GPIO, PXA_GPIO_TO_IRQ */ #include <linux/fb.h> /* Spitz/Akita GPIOs */ diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 25a1f8c5a7382..6167f96d7b41e 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c @@ -20,7 +20,7 @@ #include <asm/mach-types.h> #include <mach/hardware.h> -#include <mach/spitz.h> +#include "spitz.h" #include "pxa27x.h" #include "sharpsl_pm.h" diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 7c1384a869ca4..44303b6eb228b 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -14,13 +14,12 @@ #include <linux/timer.h> #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/spitz.h> #include "../codecs/wm8750.h" #include "pxa2xx-i2s.h" @@ -37,7 +36,7 @@ static int spitz_jack_func; static int spitz_spk_func; -static int spitz_mic_gpio; +static struct gpio_desc *gpiod_mic, *gpiod_mute_l, *gpiod_mute_r; static void spitz_ext_control(struct snd_soc_dapm_context *dapm) { @@ -56,8 +55,8 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack"); snd_soc_dapm_enable_pin_unlocked(dapm, "Headphone Jack"); - gpio_set_value(SPITZ_GPIO_MUTE_L, 1); - gpio_set_value(SPITZ_GPIO_MUTE_R, 1); + gpiod_set_value(gpiod_mute_l, 1); + gpiod_set_value(gpiod_mute_r, 1); break; case SPITZ_MIC: /* enable mic jack and bias, mute hp */ @@ -65,8 +64,8 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack"); snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack"); - gpio_set_value(SPITZ_GPIO_MUTE_L, 0); - gpio_set_value(SPITZ_GPIO_MUTE_R, 0); + gpiod_set_value(gpiod_mute_l, 0); + gpiod_set_value(gpiod_mute_r, 0); break; case SPITZ_LINE: /* enable line jack, disable mic bias and mute hp */ @@ -74,8 +73,8 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack"); snd_soc_dapm_enable_pin_unlocked(dapm, "Line Jack"); - gpio_set_value(SPITZ_GPIO_MUTE_L, 0); - gpio_set_value(SPITZ_GPIO_MUTE_R, 0); + gpiod_set_value(gpiod_mute_l, 0); + gpiod_set_value(gpiod_mute_r, 0); break; case SPITZ_HEADSET: /* enable and unmute headset jack enable mic bias, mute L hp */ @@ -83,8 +82,8 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack"); snd_soc_dapm_enable_pin_unlocked(dapm, "Headset Jack"); - gpio_set_value(SPITZ_GPIO_MUTE_L, 0); - gpio_set_value(SPITZ_GPIO_MUTE_R, 1); + gpiod_set_value(gpiod_mute_l, 0); + gpiod_set_value(gpiod_mute_r, 1); break; case SPITZ_HP_OFF: @@ -93,8 +92,8 @@ static void spitz_ext_control(struct snd_soc_dapm_context *dapm) snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack"); snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack"); - gpio_set_value(SPITZ_GPIO_MUTE_L, 0); - gpio_set_value(SPITZ_GPIO_MUTE_R, 0); + gpiod_set_value(gpiod_mute_l, 0); + gpiod_set_value(gpiod_mute_r, 0); break; } @@ -199,7 +198,7 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol, static int spitz_mic_bias(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { - gpio_set_value_cansleep(spitz_mic_gpio, SND_SOC_DAPM_EVENT_ON(event)); + gpiod_set_value_cansleep(gpiod_mic, SND_SOC_DAPM_EVENT_ON(event)); return 0; } @@ -287,39 +286,28 @@ static int spitz_probe(struct platform_device *pdev) struct snd_soc_card *card = &snd_soc_spitz; int ret; - if (machine_is_akita()) - spitz_mic_gpio = AKITA_GPIO_MIC_BIAS; - else - spitz_mic_gpio = SPITZ_GPIO_MIC_BIAS; - - ret = gpio_request(spitz_mic_gpio, "MIC GPIO"); - if (ret) - goto err1; - - ret = gpio_direction_output(spitz_mic_gpio, 0); - if (ret) - goto err2; + gpiod_mic = devm_gpiod_get(&pdev->dev, "mic", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_mic)) + return PTR_ERR(gpiod_mic); + gpiod_mute_l = devm_gpiod_get(&pdev->dev, "mute-l", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_mute_l)) + return PTR_ERR(gpiod_mute_l); + gpiod_mute_r = devm_gpiod_get(&pdev->dev, "mute-r", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_mute_r)) + return PTR_ERR(gpiod_mute_r); card->dev = &pdev->dev; ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret) { + if (ret) dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); - goto err2; - } - - return 0; -err2: - gpio_free(spitz_mic_gpio); -err1: return ret; } static int spitz_remove(struct platform_device *pdev) { - gpio_free(spitz_mic_gpio); return 0; } -- 2.43.0

1 0