diff --git a/external/config/kernel/linux-sunxi64-current.config b/external/config/kernel/linux-sunxi64-current.config index 6952269..b4147c0 100644 --- a/external/config/kernel/linux-sunxi64-current.config +++ b/external/config/kernel/linux-sunxi64-current.config @@ -2433,7 +2433,7 @@ CONFIG_LED_TRIGGER_PHY=y # CONFIG_SFP=m CONFIG_ADIN_PHY=m -CONFIG_AC200_PHY=m +# CONFIG_AC200_PHY is not set CONFIG_AMD_PHY=m CONFIG_AQUANTIA_PHY=m CONFIG_AX88796B_PHY=m @@ -4913,13 +4913,13 @@ CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_LOGO_ARMBIAN_CLUT224 is not set # end of Graphics support -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y CONFIG_SND_PCM_ELD=y CONFIG_SND_PCM_IEC958=y -CONFIG_SND_DMAENGINE_PCM=m +CONFIG_SND_DMAENGINE_PCM=y CONFIG_SND_HWDEP=m CONFIG_SND_SEQ_DEVICE=m CONFIG_SND_RAWMIDI=m @@ -4972,7 +4972,7 @@ CONFIG_SND_USB_POD=m CONFIG_SND_USB_PODHD=m CONFIG_SND_USB_TONEPORT=m CONFIG_SND_USB_VARIAX=m -CONFIG_SND_SOC=m +CONFIG_SND_SOC=y CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_AMD_ACP is not set @@ -5024,7 +5024,7 @@ CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m CONFIG_SND_SOC_XILINX_SPDIF=m # CONFIG_SND_SOC_XTFPGA_I2S is not set # CONFIG_ZX_TDM is not set -CONFIG_SND_SOC_I2C_AND_SPI=m +CONFIG_SND_SOC_I2C_AND_SPI=y # # CODEC drivers @@ -5182,13 +5182,14 @@ CONFIG_SND_SOC_NAU8810=m CONFIG_SND_SOC_NAU8822=m CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SOC_ACX00=y # end of CODEC drivers CONFIG_SND_SIMPLE_CARD_UTILS=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m CONFIG_SND_XEN_FRONTEND=m -CONFIG_AC97_BUS=m +CONFIG_AC97_BUS=y # # HID support @@ -6236,7 +6237,7 @@ CONFIG_CLK_TWL6040=m # CONFIG_CLK_QORIQ is not set # CONFIG_COMMON_CLK_XGENE is not set CONFIG_COMMON_CLK_PALMAS=m -# CONFIG_COMMON_CLK_PWM is not set +CONFIG_COMMON_CLK_PWM=y # CONFIG_COMMON_CLK_VC5 is not set CONFIG_COMMON_CLK_BD718XX=m # CONFIG_COMMON_CLK_FIXED_MMIO is not set diff --git a/external/config/sources/families/sun50iw6.conf b/external/config/sources/families/sun50iw6.conf index 71d8b18..ca27c27 100644 --- a/external/config/sources/families/sun50iw6.conf +++ b/external/config/sources/families/sun50iw6.conf @@ -38,7 +38,13 @@ case $BRANCH in ASOUND_STATE='asound.state.sun50iw6-current' KERNELBRANCH="branch:orange-pi-5.10" LINUXCONFIG=linux-5.10-sunxi64-current + else + + ASOUND_STATE='asound.state.sun50iw6-current2' + LINUXFAMILY=sunxi64 + fi + ;; esac diff --git a/external/packages/blobs/asound.state/asound.state.sun50iw6-current2 b/external/packages/blobs/asound.state/asound.state.sun50iw6-current2 new file mode 100644 index 0000000..971f91f --- /dev/null +++ b/external/packages/blobs/asound.state/asound.state.sun50iw6-current2 @@ -0,0 +1,566 @@ +state.allwinnerac200c { + control.1 { + iface MIXER + name 'I2S Mixer ADC Volume' + value.0 1 + value.1 1 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 1' + dbmin -9999999 + dbmax 0 + dbvalue.0 0 + dbvalue.1 0 + } + } + control.2 { + iface MIXER + name 'I2S Mixer DAC Volume' + value.0 1 + value.1 1 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 1' + dbmin -9999999 + dbmax 0 + dbvalue.0 0 + dbvalue.1 0 + } + } + control.3 { + iface MIXER + name 'DAC Mixer ADC Volume' + value.0 1 + value.1 1 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 1' + dbmin -9999999 + dbmax 0 + dbvalue.0 0 + dbvalue.1 0 + } + } + control.4 { + iface MIXER + name 'DAC Mxier DAC Volume' + value.0 1 + value.1 1 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 1' + dbmin -9999999 + dbmax 0 + dbvalue.0 0 + dbvalue.1 0 + } + } + control.5 { + iface MIXER + name 'Line Out Mixer Volume' + value 7 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin -450 + dbmax 600 + dbvalue.0 600 + } + } + control.6 { + iface MIXER + name 'MIC Out Mixer Volume' + value.0 7 + value.1 7 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 7' + dbmin -450 + dbmax 600 + dbvalue.0 600 + dbvalue.1 600 + } + } + control.7 { + iface MIXER + name 'ADC Input Volume' + value 7 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin -450 + dbmax 600 + dbvalue.0 600 + } + } + control.8 { + iface MIXER + name 'Master Volume' + value 30 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 31' + dbmin -9999999 + dbmax -150 + dbvalue.0 -300 + } + } + control.9 { + iface MIXER + name 'MIC1 Boost Volume' + value 7 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin 0 + dbmax 4200 + dbvalue.0 4200 + } + } + control.10 { + iface MIXER + name 'MIC2 Boost Volume' + value 7 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 7' + dbmin 0 + dbmax 4200 + dbvalue.0 4200 + } + } + control.11 { + iface MIXER + name 'Left Output Mixer MIC1 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.12 { + iface MIXER + name 'Left Output Mixer MIC2 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.13 { + iface MIXER + name 'Left Output Mixer PhonePN Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.14 { + iface MIXER + name 'Left Output Mixer PhoneN Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.15 { + iface MIXER + name 'Left Output Mixer LINEINL Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.16 { + iface MIXER + name 'Left Output Mixer DACL Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.17 { + iface MIXER + name 'Left Output Mixer DACR Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.18 { + iface MIXER + name 'Right Output Mixer MIC1 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.19 { + iface MIXER + name 'Right Output Mixer MIC2 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.20 { + iface MIXER + name 'Right Output Mixer PhonePN Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.21 { + iface MIXER + name 'Right Output Mixer PhoneP Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.22 { + iface MIXER + name 'Right Output Mixer LINEINR Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.23 { + iface MIXER + name 'Right Output Mixer DACR Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.24 { + iface MIXER + name 'Right Output Mixer DACL Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.25 { + iface MIXER + name 'Left Input Mixer MIC1 Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.26 { + iface MIXER + name 'Left Input Mixer MIC2 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.27 { + iface MIXER + name 'Left Input Mixer PhonePN Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.28 { + iface MIXER + name 'Left Input Mixer PhoneN Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.29 { + iface MIXER + name 'Left Input Mixer LINEINL Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.30 { + iface MIXER + name 'Left Input Mixer OMixerL Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.31 { + iface MIXER + name 'Left Input Mixer OMixerR Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.32 { + iface MIXER + name 'Right Input Mixer MIC1 Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.33 { + iface MIXER + name 'Right Input Mixer MIC2 Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.34 { + iface MIXER + name 'Right Input Mixer PhonePN Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.35 { + iface MIXER + name 'Right Input Mixer PhoneP Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.36 { + iface MIXER + name 'Right Input Mixer LINEINR Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.37 { + iface MIXER + name 'Right Input Mixer OMixerR Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.38 { + iface MIXER + name 'Right Input Mixer OMixerL Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.39 { + iface MIXER + name 'Left DAC Mixer I2SDACL Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.40 { + iface MIXER + name 'Left DAC Mixer ADCL Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.41 { + iface MIXER + name 'Right DAC Mixer I2SDACR Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.42 { + iface MIXER + name 'Right DAC Mixer ADCR Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.43 { + iface MIXER + name 'Left I2S Mixer I2SDACL Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.44 { + iface MIXER + name 'Left I2S Mixer ADCL Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.45 { + iface MIXER + name 'Right I2S Mixer I2SDACR Switch' + value false + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.46 { + iface MIXER + name 'Right I2S Mixer ADCR Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.47 { + iface MIXER + name 'Left LINEOUT Mux' + value 'Left OMixer' + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 'Left OMixer' + item.1 'LR OMixer' + } + } + control.48 { + iface MIXER + name 'Right LINEOUT Mux' + value 'Right OMixer' + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 'Right OMixer' + item.1 'LR OMixer' + } + } +} +state.allwinnerhdmi { + control.1 { + iface PCM + name 'Playback Channel Map' + value.0 0 + value.1 0 + value.2 0 + value.3 0 + value.4 0 + value.5 0 + value.6 0 + value.7 0 + comment { + access read + type INTEGER + count 8 + range '0 - 36' + } + } + control.2 { + iface PCM + name ELD + value '0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + comment { + access 'read volatile' + type BYTES + count 128 + } + } +}