diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-cp4.dts b/arch/arm64/boot/dts/rockchip/rk3588s-cp4.dts index 5381baf9a..55f18fcda 100755 --- a/arch/arm64/boot/dts/rockchip/rk3588s-cp4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-cp4.dts @@ -182,7 +182,7 @@ es8316_sound: es8316-sound { status = "okay"; compatible = "rockchip,multicodecs-card"; - rockchip,card-name = "rk3588-es8316"; + rockchip,card-name = "coolpi-es8316"; io-channels = <&saradc 3>; io-channel-names = "adc-detect"; keyup-threshold-microvolt = <1800000>; @@ -887,10 +887,6 @@ status = "okay"; }; -&hdmi0_in_vp1 { - status = "okay"; -}; - &hdptxphy_hdmi0 { status = "okay"; }; @@ -973,7 +969,7 @@ /*mipi dsi*/ &i2c4 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&i2c4m3_xfer>; @@ -1029,9 +1025,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8316"; reg = <0x10>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/configs/rk3588s_cp4b_defconfig b/arch/arm64/configs/rk3588s_cp4b_defconfig index 545aaa90c..204bafbaf 100644 --- a/arch/arm64/configs/rk3588s_cp4b_defconfig +++ b/arch/arm64/configs/rk3588s_cp4b_defconfig @@ -93,6 +93,10 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_GOV_INTERACTIVE=y CONFIG_CPUFREQ_DT=y CONFIG_ARM_ROCKCHIP_CPUFREQ=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=y +CONFIG_NVHE_EL2_DEBUG=y +CONFIG_PROTECTED_NVHE_STACKTRACE=y CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y @@ -310,6 +314,7 @@ CONFIG_DUMMY=y CONFIG_MACVLAN=y CONFIG_IPVLAN=y CONFIG_VXLAN=y +CONFIG_TUN=m CONFIG_VETH=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set @@ -332,7 +337,6 @@ CONFIG_VETH=y # CONFIG_NET_VENDOR_MELLANOX is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set -CONFIG_NET_VENDOR_MOTORCOMM=y # CONFIG_NET_VENDOR_MYRI is not set # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NVIDIA is not set @@ -356,6 +360,7 @@ CONFIG_STMMAC_ETH=y # CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_MOTORCOMM_PHY=y CONFIG_ROCKCHIP_PHY=y CONFIG_RK630_PHY=y CONFIG_CANFD_RK3576=y @@ -396,7 +401,6 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_RK805_PWRKEY=y # CONFIG_SERIO is not set -CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y @@ -702,6 +706,7 @@ CONFIG_ROCKCHIP_MPP_IEP2=y CONFIG_ROCKCHIP_MPP_JPGDEC=y CONFIG_ROCKCHIP_MPP_JPGENC=y CONFIG_ROCKCHIP_MPP_AV1DEC=y +CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_HRTIMER=y