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

Fwd: Pioneer DJ DDJ-SR2 sound degradation
by Geraldo 21 Mar '21

21 Mar '21

Good news: my JACK transport has been rolling for more than 2 hours without sound degradation. I'll leave it overnight just to be sure sound degradation has been fixed and not just postponed. But yes, I think I managed to engage implicit feedback sync for the playback on my Pioneer DJ DDJ-SR2. Dr. Iwai, my initial assesment was ALSA not honoring .ep_attr on quirks-table.h was the culprit for the Incompatible EP Setup messages. Turns out that for implicit feedback sync the EP is opened twice, and the ep->opened refcount prevents that. Once I commented out ep->opened++; inside snd_usb_endpoint_open on endpoint.c the kernel was able to open the EP twice(one time for data, second time for sync). I could use some help in coding an elegant way of going around the ep->opened refcount instead of simpy disabling it! Once that particular problem is sorted out I'll be able to provide a proper PATCH for all users of Pioneer gear to test implicit feedback sync. Here's the relevant dyndbg info for the success case: [35084.131891] usb 3-2: 0:1: added playback implicit_fb sync_ep 82, iface 0:1 [35084.131905] usb 3-2: Creating new data endpoint #1 [35084.131911] usb 3-2: Creating new data endpoint #82 [35084.131917] xhci_hcd 0000:00:14.0: xhci_check_bandwidth called for udev 0000000052e95692 [35084.132102] usb 3-2: 0:1 Set sample rate 44100, clock 0 [35084.132116] xhci_hcd 0000:00:14.0: xhci_check_bandwidth called for udev 0000000052e95692 [35084.132163] usb 3-2: 0:1 Set sample rate 44100, clock 0 [35084.132592] usbcore: registered new interface driver snd-usb-audio [35096.805245] usb 3-2: Open EP 0x82, iface=0:1, idx=1 [35096.805254] usb 3-2: channels=6, rate=44100, format=S24_3LE, period_bytes=9216, periods=2, implicit_fb=0 [35096.805259] usb 3-2: Setting usb interface 0:0 for EP 0x82 [35096.805264] xhci_hcd 0000:00:14.0: xhci_check_bandwidth called for udev 0000000052e95692 [35096.805475] usb 3-2: Setting usb interface 0:1 for EP 0x82 [35096.805486] xhci_hcd 0000:00:14.0: add ep 0x1, slot id 32, new drop flags = 0x0, new add flags = 0x5 [35096.805492] xhci_hcd 0000:00:14.0: add ep 0x82, slot id 32, new drop flags = 0x0, new add flags = 0x25 [35096.805495] xhci_hcd 0000:00:14.0: xhci_check_bandwidth called for udev 0000000052e95692 [35096.805499] xhci_hcd 0000:00:14.0: Adding 2 ep ctxs, 6 now active. [35096.805503] xhci_hcd 0000:00:14.0: Recalculating BW for rootport 2 [35096.805505] xhci_hcd 0000:00:14.0: Final bandwidth: 282, Limit: 1607, Reserved: 322, Available: 62 percent [35096.805510] xhci_hcd 0000:00:14.0: // Ding dong! [35096.805652] xhci_hcd 0000:00:14.0: Successful Endpoint Configure command [35096.805895] usb 3-2: 0:1 Set sample rate 44100, clock 0 [35096.805902] usb 3-2: Setting params for data EP 0x82, pipe 0x14180 [35096.805910] usb 3-2: Set up 12 URBS, ret=0 [35096.805996] usb 3-2: Open EP 0x1, iface=0:1, idx=0 [35096.806000] usb 3-2: channels=4, rate=44100, format=S24_3LE, period_bytes=6144, periods=2, implicit_fb=1 [35096.806003] usb 3-2: Open EP 0x82, iface=0:1, idx=1 [35096.806005] usb 3-2: channels=6, rate=44100, format=S24_3LE, period_bytes=9216, periods=2, implicit_fb=0 [35096.806008] usb 3-2: 0:1 Set sample rate 44100, clock 0 [35096.806011] usb 3-2: Setting params for data EP 0x1, pipe 0xc100 [35096.806018] usb 3-2: Set up 12 URBS, ret=0 [35096.806021] usb 3-2: 0:1 Set sample rate 44100, clock 0 [35096.806025] usb 3-2: Setting params for data EP 0x82, pipe 0x14180 [35096.806029] usb 3-2: Set up 12 URBS, ret=0 [35096.806048] usb 3-2: Starting data EP 0x1 (running 0) [35096.806051] usb 3-2: No URB submission due to implicit fb sync [35096.806053] usb 3-2: Starting data EP 0x82 (running 0) [35096.806076] usb 3-2: 12 URBs submitted for EP 0x82 [35096.807337] usb 3-2: Starting data EP 0x82 (running 1) [35096.807343] usb 3-2: 0:1 Start Capture PCM [35096.807346] usb 3-2: 0:1 Start Playback PCM On Sun, Mar 21, 2021 at 5:22 AM Takashi Iwai <tiwai(a)suse.de> wrote: > > On Sun, 21 Mar 2021 05:31:11 +0100, > Geraldo wrote: > > > > Until we manage to engage implicit feedback sync for Pioneer gear I'm > > afraid the clock will drift on DUPLEX mode. > > > > I reread the Pioneer related source code and implicit feedback sync was > > disabled because it gave Incompatible EP Setup messages. I should know, I > > was a reporter on that regression. > > > > Only those messages are fake. They arise because our ALSA code it's not > > honoring .ep_attr on quirks-table.h specifically in regards to > > USB_ENDPOINT_USAGE_IMPLICIT_FB. > > That's right. The parser reads from the original descriptor, not the > one from the quirk table. That is, the implicit fb quirk has to be > declared explicitly in another quirk table. And, the implicit fb is > skipped for those devices because they didn't work; see > sound/usb/implicit.c. > > > In fact the new improved implicit feedback sync code inside pcm.c that sets > > sync upon probe is failing to set implicit_fb to 1. I commented the > > conditional for testing and I told endpoint_compatible to always return > > true. > > > > Voilà, JACK started in duplex mode without nasty Incompatible EP Setup > > problems and supposedly with implicit feedback sync on. We are not setting > > bits 5..7 of bmAttributes, at least that's what I get from the missing > > Usage field in lsusb. > > > > My JACK transport has been rolling for 17 minutes and if it goes for two > > complete hours without distortion passing-thru vinyl on Mixxxx I'll provide > > the list with a more elegant PATCH and not this gambiarra as we say on > > Brazil. > > > > Hopefully their will be implicit feedback sync for Pioneer :-) > > I know there are quite a few users with Pioneer devices around here, > so let's hope that they can test the implicit feedback things and find > the culprit of the buggy behavior. Unfortunately it's quite hard to > debug such a thing remotely without the hardware from my side. > > > Takashi > > > > > > > > On Thu, Mar 18, 2021 at 7:41 PM Geraldo <geraldogabriel(a)gmail.com> wrote: > > > > > > Hi everyone, > > > > > > I'm running stable kernel 5.11.6 together with my Pioneer DJ DDJ-SR2 and > > JACK. Mixxx is running on top of JACK. > > > > > > > > > After I start JACK I have about 40 minutes of good sound quality from the > > inputs. After this period the sound will begin to degrade slowly until it > > is almost pure distortion. > > > > > > The issue is gone if I restart the JACK server, no need to reboot the > > hardware. The description I gave above sounds a lot like soundcard clock > > drift (which happens to those using more than one soundcard. You know) > > which motivates me to believe we missed a bug somewhere around the recent > > changes introduced in implicit feedback sync for Pioneer devices > > > > > > Dyndbg shows nothing useful I guess. No xruns reported. > > > > > > I've recorded a 1KHz tone and after 50+ minutes the sound degradation > > kicks in. Only problem is even after cutting and encoding to mp3 128kbps > > it's still a 10 megabytes file. I suppose I could post it to Soundcloud or > > Mixcloud if anyone is interested. > > > > > > Is anyone else experiencing these symptoms with Pioneer hardware? Note > > that the sound degradation kicks in after about an hour, more or less, and > > it's for the inputs only. Outputs continue to operate fine without the need > > to restart the JACK server every hour. > > > > > > Thanks everybody, > > > Geraldo > >

1 0

pcm: dshare - fix shared memory pointer check
by GitHub pull_request - opened 21 Mar '21

21 Mar '21

alsa-project/alsa-lib pull request #128 was opened from VanithaChannaiah: Currently shared memory pointer is initialized to 0 and set to -1 in some, but not in all error paths. In cleanup path of open the shm pointer is only compared to be non-NULL before dereferencing it which leads to SEGFAULT in case it was set to -1. This patch initializes pointer to -1 to have a unique identification for invalid pointer and also checks for pointer being not -1 on access in cleanup path. Signed-off-by: Vanitha Channaiah <vanitha.channaiah(a)in.bosch.com> Request URL : https://github.com/alsa-project/alsa-lib/pull/128 Patch URL : https://github.com/alsa-project/alsa-lib/pull/128.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

Pioneer DJ DDJ-SR2 sound degradation
by Geraldo 21 Mar '21

21 Mar '21

Hi everyone, I'm running stable kernel 5.11.6 together with my Pioneer DJ DDJ-SR2 and JACK. Mixxx is running on top of JACK. After I start JACK I have about 40 minutes of good sound quality from the inputs. After this period the sound will begin to degrade slowly until it is almost pure distortion. The issue is gone if I restart the JACK server, no need to reboot the hardware. The description I gave above sounds a lot like soundcard clock drift (which happens to those using more than one soundcard. You know) which motivates me to believe we missed a bug somewhere around the recent changes introduced in implicit feedback sync for Pioneer devices Dyndbg shows nothing useful I guess. No xruns reported. I've recorded a 1KHz tone and after 50+ minutes the sound degradation kicks in. Only problem is even after cutting and encoding to mp3 128kbps it's still a 10 megabytes file. I suppose I could post it to Soundcloud or Mixcloud if anyone is interested. Is anyone else experiencing these symptoms with Pioneer hardware? Note that the sound degradation kicks in after about an hour, more or less, and it's for the inputs only. Outputs continue to operate fine without the need to restart the JACK server every hour. Thanks everybody, Geraldo

2 2

[PATCH 0/2] ALSA: hdsp and hdspm, don't disable device if not enabled
by Tong Zhang 21 Mar '21

21 Mar '21

This series fixes issues in hdsp and hdspm. The drivers in question want to disable a device that is not enabled on error path. Tong Zhang (2): ALSA: hdsp: don't disable if not enabled ALSA: hdspm: don't disable if not enabled sound/pci/rme9652/hdsp.c | 10 ++++++---- sound/pci/rme9652/hdspm.c | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) -- 2.25.1

1 2

[PATCH v2 1/2] ALSA: hda/realtek: fix a determine_headset_type issue for a Dell AIO
by Hui Wang 20 Mar '21

20 Mar '21

We found a recording issue on a Dell AIO, users plug a headset-mic and select headset-mic from UI, but can't record any sound from headset-mic. The root cause is the determine_headset_type() returns a wrong type, e.g. users plug a ctia type headset, but that function returns omtp type. On this machine, the internal mic is not connected to the codec, the "Input Source" is headset mic by default. And when users plug a headset, the determine_headset_type() will be called immediately, the codec on this AIO is alc274, the delay time for this codec in the determine_headset_type() is only 80ms, the delay is too short to correctly determine the headset type, the fail rate is nearly 99% when users plug the headset with the normal speed. Other codecs set several hundred ms delay time, so here I change the delay time to 850ms for alc2x4 series, after this change, the fail rate is zero unless users plug the headset slowly on purpose. Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8239e5efc12d..442e555de44c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5263,7 +5263,7 @@ static void alc_determine_headset_type(struct hda_codec *codec) case 0x10ec0274: case 0x10ec0294: alc_process_coef_fw(codec, coef0274); - msleep(80); + msleep(850); val = alc_read_coef_idx(codec, 0x46); is_ctia = (val & 0x00f0) == 0x00f0; break; -- 2.25.1

2 3

[PATCH v5 4/4] arm64: dts: rockchip: add rk817 codec to Odroid Go Advance
by Chris Morgan 19 Mar '21

19 Mar '21

Add the new rk817 codec driver to the Odroid Go Advance. Signed-off-by: Chris Morgan <macromorgan(a)hotmail.com> --- .../boot/dts/rockchip/rk3326-odroid-go2.dts | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts index 97fb93e1cc00..e48dcf430efc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts @@ -161,6 +161,29 @@ blue_led: led-0 { }; }; + rk817-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,name = "rockchip,rk817-codec"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,widgets = + "Microphone", "Mic Jack", + "Headphone", "Headphones", + "Speaker", "Speaker"; + simple-audio-card,routing = + "MICL", "Mic Jack", + "Headphones", "HPOL", + "Headphones", "HPOR", + "Speaker", "SPKO"; + simple-audio-card,hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>; + simple-audio-card,cpu { + sound-dai = <&i2s1_2ch>; + }; + simple-audio-card,codec { + sound-dai = <&rk817>; + }; + }; + vccsys: vccsys { compatible = "regulator-fixed"; regulator-name = "vcc3v8_sys"; @@ -266,10 +289,13 @@ rk817: pmic@20 { interrupt-parent = <&gpio0>; interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; - pinctrl-0 = <&pmic_int>; + pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>; wakeup-source; #clock-cells = <1>; clock-output-names = "rk808-clkout1", "xin32k"; + clocks = <&cru SCLK_I2S1_OUT>; + clock-names = "mclk"; + #sound-dai-cells = <0>; vcc1-supply = <&vccsys>; vcc2-supply = <&vccsys>; @@ -428,6 +454,11 @@ regulator-state-mem { }; }; }; + + rk817_codec: codec { + mic-in-differential; + status = "okay"; + }; }; }; @@ -439,6 +470,8 @@ &i2c1 { /* I2S 1 Channel Used */ &i2s1_2ch { + resets = <&cru SRST_I2S1>, <&cru SRST_I2S1_H>; + reset-names = "reset-m", "reset-h"; status = "okay"; }; -- 2.25.1

1 0

[PATCH v5 3/4] dt-bindings: Add Rockchip rk817 audio CODEC support
by Chris Morgan 19 Mar '21

19 Mar '21

Create dt-binding documentation to document rk817 codec. Signed-off-by: Chris Morgan <macromorgan(a)hotmail.com> --- .../bindings/sound/rockchip,rk817-codec.yaml | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk817-codec.yaml diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk817-codec.yaml b/Documentation/devicetree/bindings/sound/rockchip,rk817-codec.yaml new file mode 100644 index 000000000000..845886e2fdf4 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rockchip,rk817-codec.yaml @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/rockchip-rk817.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip rk817 audio codec + +description: + The rk817 codec is an I2C codec integrated with every Rockchip + rk817 PMIC MFD. + +properties: + compatible: + enum: + - rockchip,rk817-codec + + "#sound-dai-cells": + const: 1 + + clocks: + maxItems: 1 + + clock-names: + const: "mclk" + + mic-in-differential: + description: the microphone is in differential mode. + $ref: /schemas/types.yaml#/definitions/flag + +required: + - compatible + - clocks + - clock-names + +additionalProperties: false + +examples: + - | +rk817: pmic@20 { + compatible = "rockchip,rk817"; + reg = <0x20>; + interrupt-parent = <&gpio0>; + interrupts = <7 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_int>, <&i2s_8ch_mclk>; + #sound-dai-cells = <0>; + clocks = <&cru SCLK_I2S_8CH_OUT>; + clock-names = "mclk"; + + ........ + + rk817_codec: codec { + mic-in-differential; + status = "okay"; + }; + + ........ + +}; -- 2.25.1

1 0

[PATCH v5 1/4] mfd: Add Rockchip rk817 audio CODEC support
by Chris Morgan 19 Mar '21

19 Mar '21

Add rk817 codec support cell to rk808 mfd driver. Changes from v4: Move register definitions from rk817_codec.h to main rk808.h register definitions. Add volatile register for codec bits. Add default values for codec bits. Removed of_compatible. Signed-off-by: Chris Morgan <macromorgan(a)hotmail.com> --- drivers/mfd/rk808.c | 89 +++++++++++++++++++++++++++++++++++++++ include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+) diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c index ad923dd4e007..b92f4c6f503e 100644 --- a/drivers/mfd/rk808.c +++ b/drivers/mfd/rk808.c @@ -65,6 +65,9 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg) switch (reg) { case RK817_SECONDS_REG ... RK817_WEEKS_REG: case RK817_RTC_STATUS_REG: +#ifdef CONFIG_SND_SOC_RK817 + case RK817_CODEC_DTOP_LPT_SRST: +#endif case RK817_INT_STS_REG0: case RK817_INT_STS_REG1: case RK817_INT_STS_REG2: @@ -163,6 +166,11 @@ static const struct mfd_cell rk817s[] = { .num_resources = ARRAY_SIZE(rk817_rtc_resources), .resources = &rk817_rtc_resources[0], }, +#ifdef CONFIG_SND_SOC_RK817 + { + .name = "rk817-codec", + }, +#endif }; static const struct mfd_cell rk818s[] = { @@ -201,6 +209,87 @@ static const struct rk808_reg_data rk808_pre_init_reg[] = { static const struct rk808_reg_data rk817_pre_init_reg[] = { {RK817_RTC_CTRL_REG, RTC_STOP, RTC_STOP}, +#ifdef CONFIG_SND_SOC_RK817 + /* Codec specific registers */ + { RK817_CODEC_DTOP_VUCTL, MASK_ALL, 0x03 }, + { RK817_CODEC_DTOP_VUCTIME, MASK_ALL, 0x00 }, + { RK817_CODEC_DTOP_LPT_SRST, MASK_ALL, 0x00 }, + { RK817_CODEC_DTOP_DIGEN_CLKE, MASK_ALL, 0x00 }, + /* from vendor driver, CODEC_AREF_RTCFG0 not defined in data sheet */ + { RK817_CODEC_AREF_RTCFG0, MASK_ALL, 0x00 }, + { RK817_CODEC_AREF_RTCFG1, MASK_ALL, 0x06 }, + { RK817_CODEC_AADC_CFG0, MASK_ALL, 0xc8 }, + /* from vendor driver, CODEC_AADC_CFG1 not defined in data sheet */ + { RK817_CODEC_AADC_CFG1, MASK_ALL, 0x00 }, + { RK817_CODEC_DADC_VOLL, MASK_ALL, 0x00 }, + { RK817_CODEC_DADC_VOLR, MASK_ALL, 0x00 }, + { RK817_CODEC_DADC_SR_ACL0, MASK_ALL, 0x00 }, + { RK817_CODEC_DADC_ALC1, MASK_ALL, 0x00 }, + { RK817_CODEC_DADC_ALC2, MASK_ALL, 0x00 }, + { RK817_CODEC_DADC_NG, MASK_ALL, 0x00 }, + { RK817_CODEC_DADC_HPF, MASK_ALL, 0x00 }, + { RK817_CODEC_DADC_RVOLL, MASK_ALL, 0xff }, + { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff }, + { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 }, + { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 }, + { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 }, + { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 }, + { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 }, + { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 }, + { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 }, + /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */ + { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 }, + { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 }, + { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 }, + { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 }, + { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 }, + { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 }, + { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 }, + { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 }, + { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 }, + { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff }, + { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff }, + { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 }, + { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 }, + { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 }, + { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 }, + { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 }, + { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 }, + { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 }, + /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */ + { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 }, + { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 }, + { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 }, + { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 }, + { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 }, + { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 }, + { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 }, + { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 }, + { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 }, + { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff }, + { RK817_CODEC_DDAC_RVOLR, MASK_ALL, 0xff }, + { RK817_CODEC_AHP_ANTI0, MASK_ALL, 0x00 }, + { RK817_CODEC_AHP_ANTI1, MASK_ALL, 0x00 }, + { RK817_CODEC_AHP_CFG0, MASK_ALL, 0xe0 }, + { RK817_CODEC_AHP_CFG1, MASK_ALL, 0x1f }, + { RK817_CODEC_AHP_CP, MASK_ALL, 0x09 }, + { RK817_CODEC_ACLASSD_CFG1, MASK_ALL, 0x69 }, + { RK817_CODEC_ACLASSD_CFG2, MASK_ALL, 0x44 }, + { RK817_CODEC_APLL_CFG0, MASK_ALL, 0x04 }, + { RK817_CODEC_APLL_CFG1, MASK_ALL, 0x00 }, + { RK817_CODEC_APLL_CFG2, MASK_ALL, 0x30 }, + { RK817_CODEC_APLL_CFG3, MASK_ALL, 0x19 }, + { RK817_CODEC_APLL_CFG4, MASK_ALL, 0x65 }, + { RK817_CODEC_APLL_CFG5, MASK_ALL, 0x01 }, + { RK817_CODEC_DI2S_CKM, MASK_ALL, 0x01 }, + { RK817_CODEC_DI2S_RSD, MASK_ALL, 0x00 }, + { RK817_CODEC_DI2S_RXCR1, MASK_ALL, 0x00 }, + { RK817_CODEC_DI2S_RXCR2, MASK_ALL, 0x17 }, + { RK817_CODEC_DI2S_RXCMD_TSD, MASK_ALL, 0x00 }, + { RK817_CODEC_DI2S_TXCR1, MASK_ALL, 0x00 }, + { RK817_CODEC_DI2S_TXCR2, MASK_ALL, 0x17 }, + { RK817_CODEC_DI2S_TXCR3_TXCMD, MASK_ALL, 0x00 }, +#endif {RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_L}, {RK817_SYS_CFG(1), RK817_HOTDIE_TEMP_MSK | RK817_TSD_TEMP_MSK, RK817_HOTDIE_105 | RK817_TSD_140}, diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h index e07f6e61cd38..a96e6d43ca06 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -437,6 +437,87 @@ enum rk809_reg_id { #define RK817_RTC_COMP_LSB_REG 0x10 #define RK817_RTC_COMP_MSB_REG 0x11 +/* RK817 Codec Registers */ +#define RK817_CODEC_DTOP_VUCTL 0x12 +#define RK817_CODEC_DTOP_VUCTIME 0x13 +#define RK817_CODEC_DTOP_LPT_SRST 0x14 +#define RK817_CODEC_DTOP_DIGEN_CLKE 0x15 +#define RK817_CODEC_AREF_RTCFG0 0x16 +#define RK817_CODEC_AREF_RTCFG1 0x17 +#define RK817_CODEC_AADC_CFG0 0x18 +#define RK817_CODEC_AADC_CFG1 0x19 +#define RK817_CODEC_DADC_VOLL 0x1a +#define RK817_CODEC_DADC_VOLR 0x1b +#define RK817_CODEC_DADC_SR_ACL0 0x1e +#define RK817_CODEC_DADC_ALC1 0x1f +#define RK817_CODEC_DADC_ALC2 0x20 +#define RK817_CODEC_DADC_NG 0x21 +#define RK817_CODEC_DADC_HPF 0x22 +#define RK817_CODEC_DADC_RVOLL 0x23 +#define RK817_CODEC_DADC_RVOLR 0x24 +#define RK817_CODEC_AMIC_CFG0 0x27 +#define RK817_CODEC_AMIC_CFG1 0x28 +#define RK817_CODEC_DMIC_PGA_GAIN 0x29 +#define RK817_CODEC_DMIC_LMT1 0x2a +#define RK817_CODEC_DMIC_LMT2 0x2b +#define RK817_CODEC_DMIC_NG1 0x2c +#define RK817_CODEC_DMIC_NG2 0x2d +#define RK817_CODEC_ADAC_CFG0 0x2e +#define RK817_CODEC_ADAC_CFG1 0x2f +#define RK817_CODEC_DDAC_POPD_DACST 0x30 +#define RK817_CODEC_DDAC_VOLL 0x31 +#define RK817_CODEC_DDAC_VOLR 0x32 +#define RK817_CODEC_DDAC_SR_LMT0 0x35 +#define RK817_CODEC_DDAC_LMT1 0x36 +#define RK817_CODEC_DDAC_LMT2 0x37 +#define RK817_CODEC_DDAC_MUTE_MIXCTL 0x38 +#define RK817_CODEC_DDAC_RVOLL 0x39 +#define RK817_CODEC_DDAC_RVOLR 0x3a +#define RK817_CODEC_AHP_ANTI0 0x3b +#define RK817_CODEC_AHP_ANTI1 0x3c +#define RK817_CODEC_AHP_CFG0 0x3d +#define RK817_CODEC_AHP_CFG1 0x3e +#define RK817_CODEC_AHP_CP 0x3f +#define RK817_CODEC_ACLASSD_CFG1 0x40 +#define RK817_CODEC_ACLASSD_CFG2 0x41 +#define RK817_CODEC_APLL_CFG0 0x42 +#define RK817_CODEC_APLL_CFG1 0x43 +#define RK817_CODEC_APLL_CFG2 0x44 +#define RK817_CODEC_APLL_CFG3 0x45 +#define RK817_CODEC_APLL_CFG4 0x46 +#define RK817_CODEC_APLL_CFG5 0x47 +#define RK817_CODEC_DI2S_CKM 0x48 +#define RK817_CODEC_DI2S_RSD 0x49 +#define RK817_CODEC_DI2S_RXCR1 0x4a +#define RK817_CODEC_DI2S_RXCR2 0x4b +#define RK817_CODEC_DI2S_RXCMD_TSD 0x4c +#define RK817_CODEC_DI2S_TXCR1 0x4d +#define RK817_CODEC_DI2S_TXCR2 0x4e +#define RK817_CODEC_DI2S_TXCR3_TXCMD 0x4f + +/* RK817_CODEC_DI2S_CKM */ +#define RK817_I2S_MODE_MASK (0x1 << 0) +#define RK817_I2S_MODE_MST (0x1 << 0) +#define RK817_I2S_MODE_SLV (0x0 << 0) + +/* RK817_CODEC_DDAC_MUTE_MIXCTL */ +#define DACMT_MASK (0x1 << 0) +#define DACMT_ENABLE (0x1 << 0) +#define DACMT_DISABLE (0x0 << 0) + +/* RK817_CODEC_DI2S_RXCR2 */ +#define VDW_RX_24BITS (0x17) +#define VDW_RX_16BITS (0x0f) + +/* RK817_CODEC_DI2S_TXCR2 */ +#define VDW_TX_24BITS (0x17) +#define VDW_TX_16BITS (0x0f) + +/* RK817_CODEC_AMIC_CFG0 */ +#define MIC_DIFF_MASK (0x1 << 7) +#define MIC_DIFF_DIS (0x0 << 7) +#define MIC_DIFF_EN (0x1 << 7) + #define RK817_POWER_EN_REG(i) (0xb1 + (i)) #define RK817_POWER_SLP_EN_REG(i) (0xb5 + (i)) -- 2.25.1

1 0

[PATCH -next] ASoC: rt1019: make symbol 'rt1019_i2c_driver' static
by 'w00385741 19 Mar '21

19 Mar '21

From: Wei Yongjun <weiyongjun1(a)huawei.com> The sparse tool complains as follows: sound/soc/codecs/rt1019.c:927:19: warning: symbol 'rt1019_i2c_driver' was not declared. Should it be static? This symbol is not used outside of rt1019.c, so this commit marks it static. Fixes: 7ec79d3850d0 ("ASoC: rt1019: add rt1019 amplifier driver") Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/codecs/rt1019.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt1019.c b/sound/soc/codecs/rt1019.c index fb275686a00f..5138f028d9f2 100644 --- a/sound/soc/codecs/rt1019.c +++ b/sound/soc/codecs/rt1019.c @@ -924,7 +924,7 @@ static int rt1019_i2c_probe(struct i2c_client *i2c, &soc_component_dev_rt1019, rt1019_dai, ARRAY_SIZE(rt1019_dai)); } -struct i2c_driver rt1019_i2c_driver = { +static struct i2c_driver rt1019_i2c_driver = { .driver = { .name = "rt1019", .of_match_table = of_match_ptr(rt1019_of_match),

2 1

[PATCH 00/14] ASoC: tidyup error message timing
by Kuninori Morimoto 19 Mar '21

19 Mar '21

Hi Mark Indicating error message when failed case is very useful for debuging. In many case, it uses below style. int function(...) { ... return ret; } int caller(...) { ... ret = function(...); if (ret < 0) dev_err(...) ... } This is not so bad, but in this style *each caller* needs to indicate duplicate same error message, and some caller is forgetting to do it. And caller can't indicate detail function() error information. I know many people have many opinion, but if function() indicates error message, we can get same and detail information without forgot, and it is better. This patch-set tidyup to do it. int function(...) { ... if (ret < 0) dev_err(...) return ret; } int caller(...) { ... ret = function(...); ... } Kuninori Morimoto (14): ASoC: soc-pcm: indicate error message at soc_pcm_open() ASoC: soc-pcm: indicate error message at soc_pcm_hw_params() ASoC: soc-pcm: indicate error message at soc_pcm_prepare() ASoC: soc-pcm: indicate error message at dpcm_path_get() ASoC: soc-pcm: indicate error message at dpcm_be_dai_trigger() ASoC: soc-pcm: indicate error message at dpcm_apply_symmetry() ASoC: soc-pcm: indicate error message at dpcm_run_update_startup/shutdown() ASoC: soc-pcm: indicate error message at dpcm_fe/be_dai_startup() ASoC: soc-pcm: indicate error message at dpcm_fe/be_dai_hw_params() ASoC: soc-pcm: indicate error message at dpcm_fe/be_dai_prepare() ASoC: soc-pcm: don't indicate error message for soc_pcm_hw_free() ASoC: soc-pcm: don't indicate error message for dpcm_be_dai_hw_free() ASoC: don't indicate error message for snd_soc_[pcm_]dai_xxx() ASoC: don't indicate error message for snd_soc_[pcm_]component_xxx() include/sound/soc-dpcm.h | 2 +- sound/soc/soc-compress.c | 9 +- sound/soc/soc-core.c | 22 +---- sound/soc/soc-dapm.c | 24 ++--- sound/soc/soc-pcm.c | 197 +++++++++++++++++++-------------------- 5 files changed, 108 insertions(+), 146 deletions(-) -- 2.25.1

2 15