diff --git a/arch/arm64/boot/dts/seco/seco-px30-d23-revc.dtsi b/arch/arm64/boot/dts/seco/seco-px30-d23-revc.dtsi index 27b76ab344d2eadfce468ffc703c52bfa603a821..5475afde7f6fb52ec3a62f95d4afba9c8c8eb1e8 100644 --- a/arch/arm64/boot/dts/seco/seco-px30-d23-revc.dtsi +++ b/arch/arm64/boot/dts/seco/seco-px30-d23-revc.dtsi @@ -605,8 +605,6 @@ compatible = "rockchip,rk809-codec", "rockchip,rk817-codec"; clocks = <&cru SCLK_I2S1_OUT>; clock-names = "mclk"; - pinctrl-names = "default"; - pinctrl-0 = <&i2s1_2ch_mclk>; hp-volume = <20>; spk-volume = <3>; status = "okay"; @@ -879,19 +877,6 @@ }; }; - i2s1 { - i2s1_2ch_bus: i2s1-2ch-bus { - rockchip,pins = - <2 RK_PC1 RK_FUNC_1 &pcfg_pull_none>, - <2 RK_PC2 RK_FUNC_1 &pcfg_pull_none>, - <2 RK_PC4 RK_FUNC_1 &pcfg_pull_none>, - <2 RK_PC5 RK_FUNC_1 &pcfg_pull_none>; - }; - - i2s_8ch_mclk: i2s-8ch-mclk { - rockchip,pins = <2 RK_PC3 RK_FUNC_1 &pcfg_pull_none>; - }; - }; lcd_vdd_gpio { lcd_vdd_gpio_en: lcd_vdd_gpio_en { diff --git a/arch/arm64/configs/seco_px30_d23-linux_defconfig b/arch/arm64/configs/seco_px30_d23-linux_defconfig index 8139ca9b63d426b8d9cf35d2f550ff56557da811..6092303888ba4d247296d04cca7756f0612e5197 100644 --- a/arch/arm64/configs/seco_px30_d23-linux_defconfig +++ b/arch/arm64/configs/seco_px30_d23-linux_defconfig @@ -354,9 +354,9 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y CONFIG_SOUND=y CONFIG_SND=y -CONFIG_SND_SEQUENCER=y -CONFIG_SND_SEQ_DUMMY=y -CONFIG_SND_HRTIMER=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_HRTIMER=m CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_SPI is not set @@ -365,8 +365,8 @@ CONFIG_SND_SOC=y CONFIG_SND_SOC_ROCKCHIP=y CONFIG_SND_SOC_ROCKCHIP_I2S=y CONFIG_SND_SOC_RK817=y -CONFIG_SND_SOC_RT5640=y -CONFIG_SND_SOC_TLV320AIC3X=y +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_TLV320AIC3X=m CONFIG_SND_SIMPLE_CARD=y CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HIDRAW=y