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

ucm2: Add support for MT8195 Cherry Tomato Chromebook with SOF
by GitHub pull_request - edited 08 Sep '22

08 Sep '22

alsa-project/alsa-ucm-conf pull request #213 was edited from kholk: Add support for the Acer Chromebook Spin 513 CP513-2H, powered by MediaTek Kompanio 1380 (MT8195) with a HiFi 4 Audio DSP running SoundOpenFirmware. This machine uses MT6359 PMIC, with RT1019 and RT5682 as headphones and speaker codecs/amps. This configuration has been successfully tested on Debian 11 with PipeWire 0.3.56 + wireplumber. `Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>` Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/213 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/213.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ucm2: Add support for MT8195 Cherry Tomato Chromebook with SOF
by GitHub pull_request - opened 08 Sep '22

08 Sep '22

alsa-project/alsa-ucm-conf pull request #213 was opened from kholk: Add support for the Acer Chromebook Spin 513 CP513-2H, powered by MediaTek Kompanio 1380 (MT8195) with a HiFi 4 Audio DSP running SoundOpenFirmware. This machine uses MT6359 PMIC, with RT1019 and RT5682 as headphones and speaker codecs/amps. This configuration has been successfully tested on Debian 11 with PipeWire 0.3.56 + wireplumber. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/213 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/213.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2 00/14] ASoC/qcom/arm64: Qualcomm ADSP DTS and binding fixes
by Krzysztof Kozlowski 08 Sep '22

08 Sep '22

Hi, Dependencies/merging ==================== 1. The DTS patches are independent. 2. The binding patches should come together, because of context changes. Could be one of: Qualcomm SoC, ASoC or DT tree. Changes since v1 ================ 1. Patch 9: New patch. 2. Patch 10: Correct also sound/qcom,q6apm-dai.yaml (Rob). 2. Patch 13: New patch. 3. Add Rb/Tb tags. Best regards, Krzysztof Krzysztof Kozlowski (14): arm64: dts: qcom: sdm630: align APR services node names with dtschema arm64: dts: qcom: sdm845: align APR services node names with dtschema arm64: dts: qcom: sm8250: align APR services node names with dtschema arm64: dts: qcom: msm8996: fix APR services nodes arm64: dts: qcom: sdm845: align dai node names with dtschema arm64: dts: qcom: msm8996: align dai node names with dtschema arm64: dts: qcom: qrb5165-rb5: align dai node names with dtschema arm64: dts: qcom: sm8250: use generic name for LPASS clock controller ASoC: dt-bindings:: qcom,q6asm: convert to dtschema dt-bindings: soc: qcom: apr: correct service children ASoC: dt-bindings: qcom,q6dsp-lpass-ports: cleanup example ASoC: dt-bindings: qcom,q6dsp-lpass-clocks: cleanup example ASoC: dt-bindings: qcom,q6apm-dai: adjust indentation in example dt-bindings: soc: qcom: apr: add missing properties .../bindings/soc/qcom/qcom,apr.yaml | 111 +++++++++++++++-- .../bindings/sound/qcom,q6apm-dai.yaml | 21 ++-- .../devicetree/bindings/sound/qcom,q6asm.txt | 70 ----------- .../devicetree/bindings/sound/qcom,q6asm.yaml | 112 ++++++++++++++++++ .../sound/qcom,q6dsp-lpass-clocks.yaml | 36 +++--- .../sound/qcom,q6dsp-lpass-ports.yaml | 64 +++++----- arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 +- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 4 +- arch/arm64/boot/dts/qcom/sdm630.dtsi | 8 +- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +- .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 2 +- .../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 4 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +- arch/arm64/boot/dts/qcom/sm8250.dtsi | 10 +- 14 files changed, 293 insertions(+), 169 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.yaml -- 2.34.1

2 17

[PATCH] slimbus: qcom-ngd-ctrl: allow compile testing without QCOM_RPROC_COMMON
by Krzysztof Kozlowski 08 Sep '22

08 Sep '22

The Qualcomm common remote-proc code (CONFIG_QCOM_RPROC_COMMON) has necessary stubs, so it is not needed for compile testing. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- drivers/slimbus/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/slimbus/Kconfig b/drivers/slimbus/Kconfig index 1235b7dc8496..2ed821f75816 100644 --- a/drivers/slimbus/Kconfig +++ b/drivers/slimbus/Kconfig @@ -22,7 +22,8 @@ config SLIM_QCOM_CTRL config SLIM_QCOM_NGD_CTRL tristate "Qualcomm SLIMbus Satellite Non-Generic Device Component" - depends on HAS_IOMEM && DMA_ENGINE && NET && QCOM_RPROC_COMMON + depends on HAS_IOMEM && DMA_ENGINE && NET + depends on QCOM_RPROC_COMMON || COMPILE_TEST depends on ARCH_QCOM || COMPILE_TEST select QCOM_QMI_HELPERS select QCOM_PDR_HELPERS -- 2.34.1

2 1

[linux-next:master] BUILD REGRESSION 5957ac6635a1a12d4aa2661bbf04d3085a73372a
by kernel test robot 08 Sep '22

08 Sep '22

tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master branch HEAD: 5957ac6635a1a12d4aa2661bbf04d3085a73372a Add linux-next specific files for 20220907 Error/Warning reports: https://lore.kernel.org/linux-mm/202209070728.o3stvgVt-lkp@intel.com https://lore.kernel.org/linux-mm/202209080545.qMIVj7YM-lkp@intel.com https://lore.kernel.org/linux-mm/202209080718.y5QmlNKH-lkp@intel.com Error/Warning: (recently discovered and may have been fixed) ERROR: modpost: "__divdi3" [drivers/gpu/drm/vkms/vkms.ko] undefined! ERROR: modpost: "__udivdi3" [drivers/gpu/drm/vkms/vkms.ko] undefined! arm-linux-gnueabi-ld: vkms_formats.c:(.text+0x824): undefined reference to `__aeabi_ldivmod' arm-linux-gnueabi-ld: warning: orphan section `.data.rel.ro.local' from `arch/arm/boot/compressed/fdt.o' being placed in section `.data.rel.ro.local' arm-linux-gnueabi-ld: warning: orphan section `.data.rel.ro.local' from `arch/arm/boot/compressed/fdt_ro.o' being placed in section `.data.rel.ro.local' arm-linux-gnueabi-ld: warning: orphan section `.data.rel.ro.local' from `arch/arm/boot/compressed/fdt_rw.o' being placed in section `.data.rel.ro.local' arm-linux-gnueabi-ld: warning: orphan section `.data.rel.ro.local' from `arch/arm/boot/compressed/fdt_wip.o' being placed in section `.data.rel.ro.local' arm-linux-gnueabi-ld: warning: orphan section `.printk_index' from `arch/arm/boot/compressed/fdt.o' being placed in section `.printk_index' arm-linux-gnueabi-ld: warning: orphan section `.printk_index' from `arch/arm/boot/compressed/fdt_ro.o' being placed in section `.printk_index' arm-linux-gnueabi-ld: warning: orphan section `.printk_index' from `arch/arm/boot/compressed/fdt_rw.o' being placed in section `.printk_index' arm-linux-gnueabi-ld: warning: orphan section `.printk_index' from `arch/arm/boot/compressed/fdt_wip.o' being placed in section `.printk_index' drivers/base/regmap/regmap-mmio.c:221:17: error: implicit declaration of function 'writesb'; did you mean 'writeb'? [-Werror=implicit-function-declaration] drivers/base/regmap/regmap-mmio.c:224:17: error: implicit declaration of function 'writesw'; did you mean 'writew'? [-Werror=implicit-function-declaration] drivers/base/regmap/regmap-mmio.c:227:17: error: implicit declaration of function 'writesl'; did you mean 'writel'? [-Werror=implicit-function-declaration] drivers/base/regmap/regmap-mmio.c:231:17: error: implicit declaration of function 'writesq'; did you mean 'writeq'? [-Werror=implicit-function-declaration] drivers/base/regmap/regmap-mmio.c:231:17: error: implicit declaration of function 'writesq'; did you mean 'writesl'? [-Werror=implicit-function-declaration] drivers/base/regmap/regmap-mmio.c:358:17: error: implicit declaration of function 'readsb'; did you mean 'readb'? [-Werror=implicit-function-declaration] drivers/base/regmap/regmap-mmio.c:361:17: error: implicit declaration of function 'readsw'; did you mean 'readw'? [-Werror=implicit-function-declaration] drivers/base/regmap/regmap-mmio.c:364:17: error: implicit declaration of function 'readsl'; did you mean 'readl'? [-Werror=implicit-function-declaration] drivers/base/regmap/regmap-mmio.c:368:17: error: implicit declaration of function 'readsq'; did you mean 'readq'? [-Werror=implicit-function-declaration] drivers/base/regmap/regmap-mmio.c:368:17: error: implicit declaration of function 'readsq'; did you mean 'readsl'? [-Werror=implicit-function-declaration] drivers/clk/xilinx/clk-xlnx-clock-wizard.c:431: undefined reference to `devm_platform_ioremap_resource' drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.c:139:6: warning: no previous prototype for 'imu_v11_0_3_program_rlc_ram' [-Wmissing-prototypes] drivers/gpu/drm/drm_atomic_helper.c:802: warning: expecting prototype for drm_atomic_helper_check_wb_connector_state(). Prototype was for drm_atomic_helper_check_wb_encoder_state() instead drivers/gpu/drm/vkms/vkms_plane.c:110 vkms_plane_atomic_update() warn: variable dereferenced before check 'fb' (see line 108) drivers/scsi/qla2xxx/qla_os.c:2854:23: warning: assignment to 'struct trace_array *' from 'int' makes pointer from integer without a cast [-Wint-conversion] fs/btrfs/volumes.c:6549 __btrfs_map_block() error: we previously assumed 'mirror_num_ret' could be null (see line 6376) include/linux/string.h:303:42: warning: 'strnlen' specified bound 4 exceeds source size 3 [-Wstringop-overread] kernel/bpf/memalloc.c:499 bpf_mem_alloc_destroy() error: potentially dereferencing uninitialized 'c'. ld: vkms_formats.c:(.text+0x3ba): undefined reference to `__divdi3' microblaze-linux-ld: vkms_formats.o:(.text+0xc74): undefined reference to `__divdi3' mips-linux-ld: vkms_formats.c:(.text+0x384): undefined reference to `__divdi3' mips-linux-ld: vkms_formats.c:(.text.argb_u16_to_RGB565+0xd0): undefined reference to `__divdi3' sound/soc/codecs/tas2562.c:442:13: warning: variable 'ret' set but not used [-Wunused-but-set-variable] vkms_formats.c:(.text+0x266): undefined reference to `__divdi3' vkms_formats.c:(.text+0x364): undefined reference to `__divdi3' vkms_formats.c:(.text+0x390): undefined reference to `__divdi3' vkms_formats.c:(.text+0x804): undefined reference to `__aeabi_ldivmod' vkms_formats.c:(.text.argb_u16_to_RGB565+0xb0): undefined reference to `__divdi3' vkms_formats.o:(.text+0xb28): undefined reference to `__divdi3' xtensa-linux-ld: vkms_formats.c:(.text+0x560): undefined reference to `__divdi3' Error/Warning ids grouped by kconfigs: gcc_recent_errors |-- alpha-allyesconfig | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-readsb | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-readsl | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-readsq | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-readsw | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-writesb | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-writesl | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-writesq | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-writesw | |-- drivers-gpu-drm-amd-amdgpu-imu_v11_0_3.c:warning:no-previous-prototype-for-imu_v11_0_3_program_rlc_ram | |-- drivers-gpu-drm-drm_atomic_helper.c:warning:expecting-prototype-for-drm_atomic_helper_check_wb_connector_state().-Prototype-was-for-drm_atomic_helper_check_wb_encoder_state()-instead | |-- drivers-scsi-qla2xxx-qla_os.c:warning:assignment-to-struct-trace_array-from-int-makes-pointer-from-integer-without-a-cast | `-- sound-soc-codecs-tas2562.c:warning:variable-ret-set-but-not-used |-- alpha-randconfig-r015-20220907 | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-readsb | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-readsl | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-readsq | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-readsw | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-writesb | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-writesl | |-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-writesq | `-- drivers-base-regmap-regmap-mmio.c:error:implicit-declaration-of-function-writesw |-- arc-allyesconfig | |-- drivers-gpu-drm-amd-amdgpu-imu_v11_0_3.c:warning:no-previous-prototype-for-imu_v11_0_3_program_rlc_ram | |-- drivers-gpu-drm-drm_atomic_helper.c:warning:expecting-prototype-for-drm_atomic_helper_check_wb_connector_state().-Prototype-was-for-drm_atomic_helper_check_wb_encoder_state()-instead | `-- sound-soc-codecs-tas2562.c:warning:variable-ret-set-but-not-used |-- arc-randconfig-r001-20220907 | `-- drivers-gpu-drm-drm_atomic_helper.c:warning:expecting-prototype-for-drm_atomic_helper_check_wb_connector_state().-Prototype-was-for-drm_atomic_helper_check_wb_encoder_state()-instead |-- arm-allyesconfig | |-- arm-linux-gnueabi-ld:vkms_formats.c:(.text):undefined-reference-to-__aeabi_ldivmod | |-- drivers-gpu-drm-amd-amdgpu-imu_v11_0_3.c:warning:no-previous-prototype-for-imu_v11_0_3_program_rlc_ram | |-- drivers-gpu-drm-drm_atomic_helper.c:warning:expecting-prototype-for-drm_atomic_helper_check_wb_connector_state().-Prototype-was-for-drm_atomic_helper_check_wb_encoder_state()-instead | |-- sound-soc-codecs-tas2562.c:warning:variable-ret-set-but-not-used | `-- vkms_formats.c:(.text):undefined-reference-to-__aeabi_ldivmod |-- arm-buildonly-randconfig-r006-20220907 | |-- arm-linux-gnueabi-ld:warning:orphan-section-data.rel.ro.local-from-arch-arm-boot-compressed-fdt.o-being-placed-in-section-.data.rel.ro.local | |-- arm-linux-gnueabi-ld:warning:orphan-section-data.rel.ro.local-from-arch-arm-boot-compressed-fdt_ro.o-being-placed-in-section-.data.rel.ro.local | |-- arm-linux-gnueabi-ld:warning:orphan-section-data.rel.ro.local-from-arch-arm-boot-compressed-fdt_rw.o-being-placed-in-section-.data.rel.ro.local | |-- arm-linux-gnueabi-ld:warning:orphan-section-data.rel.ro.local-from-arch-arm-boot-compressed-fdt_wip.o-being-placed-in-section-.data.rel.ro.local | |-- arm-linux-gnueabi-ld:warning:orphan-section-printk_index-from-arch-arm-boot-compressed-fdt.o-being-placed-in-section-.printk_index | |-- arm-linux-gnueabi-ld:warning:orphan-section-printk_index-from-arch-arm-boot-compressed-fdt_ro.o-being-placed-in-section-.printk_index | |-- arm-linux-gnueabi-ld:warning:orphan-section-printk_index-from-arch-arm-boot-compressed-fdt_rw.o-being-placed-in-section-.printk_index | `-- arm-linux-gnueabi-ld:warning:orphan-section-printk_index-from-arch-arm-boot-compressed-fdt_wip.o-being-placed-in-section-.printk_index |-- arm-defconfig | `-- drivers-gpu-drm-drm_atomic_helper.c:warning:expecting-prototype-for-drm_atomic_helper_check_wb_connector_state().-Prototype-was-for-drm_atomic_helper_check_wb_encoder_state()-instead |-- arm64-allyesconfig | |-- drivers-gpu-drm-amd-amdgpu-imu_v11_0_3.c:warning:no-previous-prototype-for-imu_v11_0_3_program_rlc_ram | |-- drivers-gpu-drm-drm_atomic_helper.c:warning:expecting-prototype-for-drm_atomic_helper_check_wb_connector_state().-Prototype-was-for-drm_atomic_helper_check_wb_encoder_state()-instead | `-- sound-soc-codecs-tas2562.c:warning:variable-ret-set-but-not-used |-- arm64-randconfig-r033-20220907 clang_recent_errors |-- i386-randconfig-a006 | `-- ld.lld:error:undefined-symbol:__udivdi3 |-- i386-randconfig-a013 | `-- ld.lld:error:undefined-symbol:__udivdi3 |-- powerpc-randconfig-r013-20220907 | `-- drivers-extcon-extcon-usbc-tusb320.c:warning:expecting-prototype-for-drivers-extcon-extcon-tusb320c().-Prototype-was-for-TUSB320_REG8()-instead `-- riscv-randconfig-r021-20220907 `-- drivers-extcon-extcon-usbc-tusb320.c:warning:expecting-prototype-for-drivers-extcon-extcon-tusb320c().-Prototype-was-for-TUSB320_REG8()-instead elapsed time: 723m configs tested: 35 configs skipped: 2 gcc tested configs: um i386_defconfig um x86_64_defconfig i386 defconfig x86_64 rhel-8.3-kselftests x86_64 rhel-8.3-func x86_64 defconfig arc randconfig-r043-20220907 x86_64 rhel-8.3-kunit x86_64 rhel-8.3-kvm x86_64 rhel-8.3 x86_64 rhel-8.3-syz x86_64 randconfig-a013 x86_64 allyesconfig x86_64 randconfig-a011 x86_64 randconfig-a004 m68k allyesconfig arm defconfig m68k allmodconfig alpha allyesconfig powerpc allnoconfig arc allyesconfig ia64 allmodconfig arm allyesconfig arm64 allyesconfig sh allmodconfig mips allyesconfig powerpc allmodconfig i386 allyesconfig clang tested configs: hexagon randconfig-r041-20220907 riscv randconfig-r042-20220907 hexagon randconfig-r045-20220907 s390 randconfig-r044-20220907 i386 randconfig-a013 i386 randconfig-a006 x86_64 rhel-8.3-rust -- 0-DAY CI Kernel Test Service https://01.org/lkp

1 0

Some Motu M4 have a different usb device ID
by GitHub issues - opened 07 Sep '22

07 Sep '22

alsa-project/alsa-ucm-conf issue #212 was opened from Big-FG: I just wanted to draw some attention regarding the Motu M4 UCM2 profie currently USB-Audio.conf has the M4 with usb id 07fd:000b ``` if.motu-m24 { Condition { Type String Haystack "${CardComponents}" Needle "USB07fd:000b" } True.If.M4 { Condition { Type String Haystack "${CardLongName}" Needle "MOTU M4" } True.Define.ProfileName "MOTU/M4" False.Define.ProfileName "MOTU/M2" } } ``` but mine is apparently different with 07fd:0008 `Bus 003 Device 002: ID 07fd:0008 Mark of the Unicorn M Series` after adjusting the USB-Audio.conf with my usb ID the profile loads and works correctly. Im not sure if mine is just a weird one or how many people this may be the case for. Im fine with modifying the conf myself for my card if this is just specific to me as my unit wasnt purchased new but was a used one so Im not sure what might be different. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/212 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 0/5] ASoC: Fixes for MT8195 SOF support
by AngeloGioacchino Del Regno 07 Sep '22

07 Sep '22

This series fixes Sound Open Firmware support for MT8195 by making sure that the sound card driver is actually able to probe and IPC can finally happen. It is now possible to get DSP support for audio. Tested on MT8195 Tomato - Acer Chromebook Spin 513 CP513-2H (Pipewire). AngeloGioacchino Del Regno (5): ASoC: mediatek: mt8195-mt6359: Properly register sound card for SOF ASoC: SOF: mediatek: mt8195: Import namespace SND_SOC_SOF_MTK_COMMON ASoC: SOF: mediatek: mt8195: Add mailbox generic callbacks for IPC ASoC: SOF: mediatek: mt8195: Add generic pcm_{open,close} callbacks ASoC: SOF: mediatek: mt8195: Add devicetree support to select topologies sound/soc/mediatek/mt8195/mt8195-mt6359.c | 6 +++++ sound/soc/sof/mediatek/mt8195/mt8195.c | 32 ++++++++++++++++------- 2 files changed, 29 insertions(+), 9 deletions(-) -- 2.37.2

2 6

[PATCH] ASoC: ts3a227e: add parameters to control debounce times
by Astrid Rost 07 Sep '22

07 Sep '22

Add devicetree parameters to control the insertion, release and press debounce times. Signed-off-by: Astrid Rost <astrid.rost(a)axis.com> --- sound/soc/codecs/ts3a227e.c | 48 +++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c index d8ab0810fceb..fea274a0a91b 100644 --- a/sound/soc/codecs/ts3a227e.c +++ b/sound/soc/codecs/ts3a227e.c @@ -78,12 +78,20 @@ static const int ts3a227e_buttons[] = { #define ADC_COMPLETE_INT_DISABLE 0x04 #define INTB_DISABLE 0x08 +/* TS3A227E_REG_SETTING_1 0x4 */ +#define DEBOUNCE_INSERTION_SETTING_SFT (0) +#define DEBOUNCE_INSERTION_SETTING_MASK (0x7 << DEBOUNCE_PRESS_SETTING_SFT) + /* TS3A227E_REG_SETTING_2 0x05 */ #define KP_ENABLE 0x04 /* TS3A227E_REG_SETTING_3 0x06 */ -#define MICBIAS_SETTING_SFT (3) +#define MICBIAS_SETTING_SFT 3 #define MICBIAS_SETTING_MASK (0x7 << MICBIAS_SETTING_SFT) +#define DEBOUNCE_RELEASE_SETTING_SFT 2 +#define DEBOUNCE_RELEASE_SETTING_MASK (0x1 << DEBOUNCE_RELEASE_SETTING_SFT) +#define DEBOUNCE_PRESS_SETTING_SFT 0 +#define DEBOUNCE_PRESS_SETTING_MASK (0x3 << DEBOUNCE_PRESS_SETTING_SFT) /* TS3A227E_REG_ACCESSORY_STATUS 0x0b */ #define TYPE_3_POLE 0x01 @@ -136,7 +144,7 @@ static bool ts3a227e_volatile_reg(struct device *dev, unsigned int reg) { switch (reg) { case TS3A227E_REG_INTERRUPT ... TS3A227E_REG_INTERRUPT_DISABLE: - case TS3A227E_REG_SETTING_2: + case TS3A227E_REG_SETTING_1 ... TS3A227E_REG_SETTING_2: case TS3A227E_REG_SWITCH_STATUS_1 ... TS3A227E_REG_ADC_OUTPUT: return true; default: @@ -269,16 +277,42 @@ static const struct regmap_config ts3a227e_regmap_config = { static int ts3a227e_parse_device_property(struct ts3a227e *ts3a227e, struct device *dev) { - u32 micbias; + u32 value; + u32 setting3_value = 0; + u32 setting3_mask = 0; int err; - err = device_property_read_u32(dev, "ti,micbias", &micbias); + err = device_property_read_u32(dev, "ti,micbias", &value); if (!err) { - regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_3, - MICBIAS_SETTING_MASK, - (micbias & 0x07) << MICBIAS_SETTING_SFT); + setting3_mask = MICBIAS_SETTING_MASK; + setting3_value = + (value << MICBIAS_SETTING_SFT) & MICBIAS_SETTING_MASK; + } + + err = device_property_read_u32(dev, "ti,debounce-release", &value); + if (!err) { + setting3_mask |= DEBOUNCE_RELEASE_SETTING_MASK; + setting3_value |= (value << DEBOUNCE_RELEASE_SETTING_SFT) & + DEBOUNCE_RELEASE_SETTING_MASK; } + err = device_property_read_u32(dev, "ti,debounce-press", &value); + if (!err) { + setting3_mask |= DEBOUNCE_PRESS_SETTING_MASK; + setting3_value |= (value << DEBOUNCE_PRESS_SETTING_SFT) & + DEBOUNCE_PRESS_SETTING_MASK; + } + + if (setting3_mask) + regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_3, + setting3_mask, setting3_value); + + err = device_property_read_u32(dev, "ti,debounce-insertion", &value); + if (!err) + regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_1, + DEBOUNCE_INSERTION_SETTING_MASK, (value << DEBOUNCE_INSERTION_SETTING_SFT) + & DEBOUNCE_INSERTION_SETTING_MASK); + return 0; } -- 2.20.1

1 0

[PATCH] ASoC: simple-card-utils: switch to using gpiod API
by Dmitry Torokhov 07 Sep '22

07 Sep '22

This patch switches the driver away from legacy gpio/of_gpio API to gpiod API, and removes use of of_get_named_gpio_flags() which I want to make private to gpiolib. Signed-off-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> --- sound/soc/generic/simple-card-utils.c | 28 ++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 1b201dd09259..bef16833c487 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -9,7 +9,6 @@ #include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/of_graph.h> #include <sound/jack.h> #include <sound/pcm_params.h> @@ -729,12 +728,12 @@ int asoc_simple_init_jack(struct snd_soc_card *card, char *pin) { struct device *dev = card->dev; - enum of_gpio_flags flags; + struct gpio_desc *desc; char prop[128]; char *pin_name; char *gpio_name; int mask; - int det; + int error; if (!prefix) prefix = ""; @@ -742,36 +741,39 @@ int asoc_simple_init_jack(struct snd_soc_card *card, sjack->gpio.gpio = -ENOENT; if (is_hp) { - snprintf(prop, sizeof(prop), "%shp-det-gpio", prefix); + snprintf(prop, sizeof(prop), "%shp-det", prefix); pin_name = pin ? pin : "Headphones"; gpio_name = "Headphone detection"; mask = SND_JACK_HEADPHONE; } else { - snprintf(prop, sizeof(prop), "%smic-det-gpio", prefix); + snprintf(prop, sizeof(prop), "%smic-det", prefix); pin_name = pin ? pin : "Mic Jack"; gpio_name = "Mic detection"; mask = SND_JACK_MICROPHONE; } - det = of_get_named_gpio_flags(dev->of_node, prop, 0, &flags); - if (det == -EPROBE_DEFER) - return -EPROBE_DEFER; + desc = gpiod_get_optional(dev, prop, GPIOD_IN); + error = PTR_ERR_OR_ZERO(desc); + if (error) + return error; + + if (desc) { + error = gpiod_set_consumer_name(desc, gpio_name); + if (error) + return error; - if (gpio_is_valid(det)) { sjack->pin.pin = pin_name; sjack->pin.mask = mask; sjack->gpio.name = gpio_name; sjack->gpio.report = mask; - sjack->gpio.gpio = det; - sjack->gpio.invert = !!(flags & OF_GPIO_ACTIVE_LOW); + sjack->gpio.desc = desc; sjack->gpio.debounce_time = 150; snd_soc_card_jack_new_pins(card, pin_name, mask, &sjack->jack, &sjack->pin, 1); - snd_soc_jack_add_gpios(&sjack->jack, 1, - &sjack->gpio); + snd_soc_jack_add_gpios(&sjack->jack, 1, &sjack->gpio); } return 0; -- 2.37.2.789.g6183377224-goog -- Dmitry

3 2

[PATCH] ASoC: dt-bindings: qcom,q6core: remove binding
by Krzysztof Kozlowski 07 Sep '22

07 Sep '22

qcom,q6core is already described in soc/qcom/qcom,apr.yaml. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- .../devicetree/bindings/sound/qcom,q6core.txt | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.txt diff --git a/Documentation/devicetree/bindings/sound/qcom,q6core.txt b/Documentation/devicetree/bindings/sound/qcom,q6core.txt deleted file mode 100644 index 5cd4cc9b1fde..000000000000 --- a/Documentation/devicetree/bindings/sound/qcom,q6core.txt +++ /dev/null @@ -1,21 +0,0 @@ -Qualcomm ADSP Core service binding - -Q6CORE is one of the APR audio service on Q6DSP. -Please refer to qcom,apr.txt for details of the common apr service bindings -used by the apr service device. - -- but must contain the following property: - -- compatible: - Usage: required - Value type: <stringlist> - Definition: must be "qcom,q6core-v<MAJOR-NUMBER>.<MINOR-NUMBER>". - Or "qcom,q6core" where the version number can be queried - from DSP. - example "qcom,q6core-v2.0" - -= EXAMPLE -apr-service@3 { - compatible = "qcom,q6core"; - reg = <APR_SVC_ADSP_CORE>; -}; -- 2.34.1

2 1