diff --git a/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3568-nanopi5-common.dtsi b/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3568-nanopi5-common.dtsi index 2124b30e4ea..41cdf3bd6ce 100644 --- a/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3568-nanopi5-common.dtsi +++ b/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3568-nanopi5-common.dtsi @@ -141,6 +141,7 @@ status = "disabled"; compatible = "simple-audio-card"; simple-audio-card,name = "ROCKCHIP,SPDIF"; + simple-audio-card,mclk-fs = <128>; simple-audio-card,cpu { sound-dai = <&spdif_8ch>; }; @@ -296,7 +297,7 @@ clock-frequency = <400000>; vdd_cpu: tcs4525@1c { - compatible = "tcs,tcs452x"; + compatible = "tcs,tcs4525"; reg = <0x1c>; vin-supply = <&vcc3v3_sys>; regulator-compatible = "fan53555-reg"; @@ -795,6 +796,7 @@ max-frequency = <200000000>; pinctrl-names = "default"; pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>; + full-pwr-cycle-in-suspend; status = "okay"; }; @@ -939,10 +941,18 @@ &vp0 { rockchip,plane-mask = <( 1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | - 1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_ESMART1 | - 1 << ROCKCHIP_VOP2_SMART0 )>; + 1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_ESMART1 )>; rockchip,primary-plane = ; - cursor-win-id = ; + cursor-win-id = ; +}; + +&vp1 { + rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_SMART0 | 1 << ROCKCHIP_VOP2_SMART1)>; + rockchip,primary-plane = ; +}; + +&vp2 { + status = "disabled"; }; &wdt { diff --git a/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-common.dtsi b/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-common.dtsi index 7ca0d2a9c6e..1a8d9c49d36 100644 --- a/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-common.dtsi +++ b/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-common.dtsi @@ -35,17 +35,11 @@ hdmi0_sound: hdmi0-sound { status = "disabled"; - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <128>; - simple-audio-card,name = "rockchip,hdmi0"; - - simple-audio-card,cpu { - sound-dai = <&i2s5_8ch>; - }; - simple-audio-card,codec { - sound-dai = <&hdmi0>; - }; + compatible = "rockchip,hdmi"; + rockchip,mclk-fs = <128>; + rockchip,card-name = "rockchip,hdmi0"; + rockchip,cpu = <&i2s5_8ch>; + rockchip,codec = <&hdmi0>; }; mach: board { @@ -136,6 +130,10 @@ status = "okay"; }; +&avsd { + status = "okay"; +}; + &combphy0_ps { status = "okay"; }; @@ -527,6 +525,8 @@ }; &rkvenc0 { + venc-supply = <&vdd_vdenc_s0>; + mem-supply = <&vdd_vdenc_mem_s0>; status = "okay"; }; @@ -535,6 +535,8 @@ }; &rkvenc1 { + venc-supply = <&vdd_vdenc_s0>; + mem-supply = <&vdd_vdenc_mem_s0>; status = "okay"; }; @@ -590,6 +592,7 @@ max-frequency = <200000000>; mmc-hs400-1_8v; mmc-hs400-enhanced-strobe; + full-pwr-cycle-in-suspend; status = "okay"; }; diff --git a/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts b/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts index c808ae528c8..1c167aa0552 100644 --- a/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts +++ b/kernel-5.10/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts @@ -40,7 +40,6 @@ rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx2>; rockchip,codec = <&dp0 1>; - rockchip,jack-det; }; rt5616_sound: rt5616-sound { @@ -109,17 +108,11 @@ hdmi1_sound: hdmi1-sound { status = "disabled"; - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <128>; - simple-audio-card,name = "rockchip,hdmi1"; - - simple-audio-card,cpu { - sound-dai = <&i2s6_8ch>; - }; - simple-audio-card,codec { - sound-dai = <&hdmi1>; - }; + compatible = "rockchip,hdmi"; + rockchip,mclk-fs = <128>; + rockchip,card-name = "rockchip,hdmi1"; + rockchip,cpu = <&i2s6_8ch>; + rockchip,codec = <&hdmi1>; }; hdmiin_sound: hdmiin-sound { @@ -388,9 +381,9 @@ #sound-dai-cells = <0>; compatible = "rt5616"; reg = <0x1b>; - 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>; @@ -685,3 +678,33 @@ /delete-property/ enable-active-high; gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>; }; + +&uart0 { + pinctrl-0 = <&uart0m0_xfer>; + status = "disabled"; +}; + +&uart3 { + pinctrl-0 = <&uart3m1_xfer>; + status = "disabled"; +}; + +&uart4 { + pinctrl-0 = <&uart4m2_xfer>; + status = "disabled"; +}; + +&uart6 { + pinctrl-0 = <&uart6m1_xfer>; + status = "disabled"; +}; + +&uart7 { + pinctrl-0 = <&uart7m2_xfer>; + status = "disabled"; +}; + +&uart8 { + pinctrl-0 = <&uart8m1_xfer>; + status = "disabled"; +}; diff --git a/kernel-5.10/arch/arm64/configs/nanopi5_android_defconfig b/kernel-5.10/arch/arm64/configs/nanopi5_android_defconfig index 0053c297112..9a4bd59cc7a 100644 --- a/kernel-5.10/arch/arm64/configs/nanopi5_android_defconfig +++ b/kernel-5.10/arch/arm64/configs/nanopi5_android_defconfig @@ -441,7 +441,7 @@ CONFIG_USB_SIERRA_NET=y # CONFIG_WLAN_VENDOR_TI is not set # CONFIG_WLAN_VENDOR_ZYDAS is not set # CONFIG_WLAN_VENDOR_QUANTENNA is not set -CONFIG_WL_ROCKCHIP=y +CONFIG_WL_ROCKCHIP=m CONFIG_WIFI_BUILD_MODULE=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=y @@ -465,38 +465,6 @@ CONFIG_TOUCHSCREEN_GT9XX=y CONFIG_TOUCHSCREEN_PROT_MT_SYNC=y CONFIG_ROCKCHIP_REMOTECTL=y CONFIG_ROCKCHIP_REMOTECTL_PWM=y -CONFIG_SENSOR_DEVICE=y -CONFIG_GSENSOR_DEVICE=y -CONFIG_GS_MMA8452=y -CONFIG_MPU6880_ACC=y -CONFIG_MPU6500_ACC=y -CONFIG_GS_KXTJ9=y -CONFIG_GS_LIS3DH=y -CONFIG_GS_MMA7660=y -CONFIG_GS_MC3230=y -CONFIG_GS_LSM303D=y -CONFIG_LSM330_ACC=y -CONFIG_BMA2XX_ACC=y -CONFIG_COMPASS_DEVICE=y -CONFIG_COMPASS_AK8975=y -CONFIG_COMPASS_AK8963=y -CONFIG_GYROSCOPE_DEVICE=y -CONFIG_GYRO_L3G4200D=y -CONFIG_GYRO_L3G20D=y -CONFIG_GYRO_EWTSA=y -CONFIG_GYRO_MPU6500=y -CONFIG_GYRO_MPU6880=y -CONFIG_GYRO_LSM330=y -CONFIG_LIGHT_DEVICE=y -CONFIG_LS_CM3217=y -CONFIG_LS_CM3218=y -CONFIG_LS_UCS14620=y -CONFIG_LS_STK3410=y -CONFIG_PROXIMITY_DEVICE=y -CONFIG_PS_STK3410=y -CONFIG_PS_UCS14620=y -CONFIG_HALL_DEVICE=y -CONFIG_HS_MH248=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_RK805_PWRKEY=y @@ -916,6 +884,7 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y +CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_TWOFISH=y diff --git a/kernel-5.10/arch/arm64/configs/nanopi5_linux_defconfig b/kernel-5.10/arch/arm64/configs/nanopi5_linux_defconfig index 4ef0a9fa058..06abbdf536a 100644 --- a/kernel-5.10/arch/arm64/configs/nanopi5_linux_defconfig +++ b/kernel-5.10/arch/arm64/configs/nanopi5_linux_defconfig @@ -47,7 +47,13 @@ CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARM64_ERRATUM_824069 is not set # CONFIG_ARM64_ERRATUM_819472 is not set # CONFIG_ARM64_ERRATUM_832075 is not set +# CONFIG_ARM64_ERRATUM_1418040 is not set +# CONFIG_ARM64_ERRATUM_1165522 is not set +# CONFIG_ARM64_ERRATUM_1286807 is not set +# CONFIG_ARM64_ERRATUM_1463225 is not set # CONFIG_ARM64_ERRATUM_1542419 is not set +# CONFIG_ARM64_ERRATUM_1508412 is not set +# CONFIG_ARM64_ERRATUM_2051678 is not set # CONFIG_ARM64_ERRATUM_2054223 is not set # CONFIG_ARM64_ERRATUM_2067961 is not set # CONFIG_CAVIUM_ERRATUM_22375 is not set @@ -71,6 +77,14 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y +# CONFIG_ARM64_PTR_AUTH is not set +# CONFIG_ARM64_AMU_EXTN is not set +# CONFIG_ARM64_TLB_RANGE is not set +# CONFIG_ARM64_BTI is not set +# CONFIG_ARM64_E0PD is not set +# CONFIG_ARCH_RANDOM is not set +# CONFIG_ARM64_MTE is not set +# CONFIG_ARM64_SVE is not set CONFIG_RANDOMIZE_BASE=y # CONFIG_EFI is not set CONFIG_PM_WAKELOCKS=y @@ -96,7 +110,6 @@ CONFIG_ARM_ROCKCHIP_CPUFREQ=y CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_ROCKCHIP_SIP=y CONFIG_ARM64_CRYPTO=y -CONFIG_CRYPTO_SHA512_ARM64=y CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_SHA512_ARM64_CE=y @@ -962,36 +975,6 @@ CONFIG_TOUCHSCREEN_FE_PANELS=y CONFIG_TOUCHSCREEN_GT9XX=y CONFIG_ROCKCHIP_REMOTECTL=y CONFIG_ROCKCHIP_REMOTECTL_PWM=y -CONFIG_SENSOR_DEVICE=y -CONFIG_GSENSOR_DEVICE=y -CONFIG_GS_MMA8452=y -CONFIG_MPU6880_ACC=y -CONFIG_MPU6500_ACC=y -CONFIG_GS_KXTJ9=y -CONFIG_GS_LIS3DH=y -CONFIG_GS_MMA7660=y -CONFIG_GS_MC3230=y -CONFIG_GS_LSM303D=y -CONFIG_LSM330_ACC=y -CONFIG_BMA2XX_ACC=y -CONFIG_COMPASS_DEVICE=y -CONFIG_COMPASS_AK8975=y -CONFIG_COMPASS_AK8963=y -CONFIG_GYROSCOPE_DEVICE=y -CONFIG_GYRO_L3G4200D=y -CONFIG_GYRO_L3G20D=y -CONFIG_GYRO_EWTSA=y -CONFIG_GYRO_MPU6500=y -CONFIG_GYRO_MPU6880=y -CONFIG_GYRO_LSM330=y -CONFIG_LIGHT_DEVICE=y -CONFIG_LS_CM3217=y -CONFIG_LS_CM3218=y -CONFIG_LS_STK3410=y -CONFIG_PROXIMITY_DEVICE=y -CONFIG_PS_STK3410=y -CONFIG_HALL_DEVICE=y -CONFIG_HS_MH248=y CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_ATI_REMOTE2=m @@ -1126,19 +1109,12 @@ CONFIG_VIDEO_EM28XX_V4L2=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ROCKCHIP_CIF=y +CONFIG_VIDEO_ROCKCHIP_RKISP1=y CONFIG_VIDEO_ROCKCHIP_ISP=y +CONFIG_VIDEO_ROCKCHIP_ISPP=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_ROCKCHIP_RGA=y # CONFIG_VIDEO_IR_I2C is not set -CONFIG_VIDEO_TC35874X=y -CONFIG_VIDEO_GC8034=m -CONFIG_VIDEO_IMX464=m -CONFIG_VIDEO_OS04A10=m -CONFIG_VIDEO_OV4689=y -CONFIG_VIDEO_OV5695=m -CONFIG_VIDEO_OV7251=m -CONFIG_VIDEO_OV13850=y -CONFIG_VIDEO_DW9714=y # CONFIG_VGA_ARB is not set CONFIG_DRM=y CONFIG_DRM_IGNORE_IOTCL_PERMIT=y @@ -1195,6 +1171,7 @@ CONFIG_ROCKCHIP_MPP_VEPU2=y CONFIG_ROCKCHIP_MPP_IEP2=y CONFIG_ROCKCHIP_MPP_JPGDEC=y CONFIG_ROCKCHIP_MPP_AV1DEC=y +CONFIG_ROCKCHIP_MPP_VDPP=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y @@ -1224,6 +1201,7 @@ CONFIG_SND_SOC_ROCKCHIP=y CONFIG_SND_SOC_ROCKCHIP_I2S=y CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y CONFIG_SND_SOC_ROCKCHIP_PDM=y +CONFIG_SND_SOC_ROCKCHIP_SAI=y CONFIG_SND_SOC_ROCKCHIP_SPDIF=y CONFIG_SND_SOC_ROCKCHIP_SPDIFRX=y CONFIG_SND_SOC_ROCKCHIP_VAD=m @@ -1245,9 +1223,10 @@ CONFIG_SND_SOC_RK3308=m CONFIG_SND_SOC_RK3328=y CONFIG_SND_SOC_RK817=m CONFIG_SND_SOC_RK_CODEC_DIGITAL=y -CONFIG_SND_SOC_RT5616=m +CONFIG_SND_SOC_RK_DSM=y +CONFIG_SND_SOC_RT5616=y CONFIG_SND_SOC_RT5640=m -CONFIG_SND_SOC_RT5651=y +CONFIG_SND_SOC_RT5651=m CONFIG_SND_SOC_SPDIF=y CONFIG_SND_SIMPLE_CARD=y CONFIG_HID_BATTERY_STRENGTH=y @@ -1447,6 +1426,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_UEVENT=y CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_NCM=y CONFIG_USB_CONFIGFS_RNDIS=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_FS=y @@ -1544,12 +1524,6 @@ CONFIG_ASHMEM=y CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y CONFIG_ION_CMA_HEAP=y -CONFIG_FIQ_DEBUGGER=y -CONFIG_FIQ_DEBUGGER_NO_SLEEP=y -CONFIG_FIQ_DEBUGGER_CONSOLE=y -CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y -CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y -CONFIG_RK_CONSOLE_THREAD=y CONFIG_FB_TFT=m CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m @@ -1592,6 +1566,7 @@ CONFIG_CPU_RK1808=y CONFIG_CPU_RK3328=y CONFIG_CPU_RK3368=y CONFIG_CPU_RK3399=y +CONFIG_CPU_RK3562=y CONFIG_CPU_RK3568=y CONFIG_CPU_RK3588=y CONFIG_ROCKCHIP_CPUINFO=y @@ -1606,7 +1581,12 @@ CONFIG_ROCKCHIP_SYSTEM_MONITOR=y CONFIG_ROCKCHIP_VENDOR_STORAGE=y CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE=y CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y -CONFIG_ROCKCHIP_FIQ_DEBUGGER=y +CONFIG_FIQ_DEBUGGER=y +CONFIG_FIQ_DEBUGGER_NO_SLEEP=y +CONFIG_FIQ_DEBUGGER_CONSOLE=y +CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y +CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y +CONFIG_RK_CONSOLE_THREAD=y CONFIG_ROCKCHIP_DEBUG=y CONFIG_VENDOR_FRIENDLYELEC=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y diff --git a/kernel-5.10/arch/arm64/configs/nanopi6_android_defconfig b/kernel-5.10/arch/arm64/configs/nanopi6_android_defconfig index 5d90f5d37fd..1def89f5189 100644 --- a/kernel-5.10/arch/arm64/configs/nanopi6_android_defconfig +++ b/kernel-5.10/arch/arm64/configs/nanopi6_android_defconfig @@ -441,7 +441,7 @@ CONFIG_USB_SIERRA_NET=y # CONFIG_WLAN_VENDOR_TI is not set # CONFIG_WLAN_VENDOR_ZYDAS is not set # CONFIG_WLAN_VENDOR_QUANTENNA is not set -CONFIG_WL_ROCKCHIP=y +CONFIG_WL_ROCKCHIP=m CONFIG_WIFI_BUILD_MODULE=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=y @@ -466,38 +466,6 @@ CONFIG_TOUCHSCREEN_GT9XX=y CONFIG_TOUCHSCREEN_PROT_MT_SYNC=y CONFIG_ROCKCHIP_REMOTECTL=y CONFIG_ROCKCHIP_REMOTECTL_PWM=y -CONFIG_SENSOR_DEVICE=y -CONFIG_GSENSOR_DEVICE=y -CONFIG_GS_MMA8452=y -CONFIG_MPU6880_ACC=y -CONFIG_MPU6500_ACC=y -CONFIG_GS_KXTJ9=y -CONFIG_GS_LIS3DH=y -CONFIG_GS_MMA7660=y -CONFIG_GS_MC3230=y -CONFIG_GS_LSM303D=y -CONFIG_LSM330_ACC=y -CONFIG_BMA2XX_ACC=y -CONFIG_COMPASS_DEVICE=y -CONFIG_COMPASS_AK8975=y -CONFIG_COMPASS_AK8963=y -CONFIG_GYROSCOPE_DEVICE=y -CONFIG_GYRO_L3G4200D=y -CONFIG_GYRO_L3G20D=y -CONFIG_GYRO_EWTSA=y -CONFIG_GYRO_MPU6500=y -CONFIG_GYRO_MPU6880=y -CONFIG_GYRO_LSM330=y -CONFIG_LIGHT_DEVICE=y -CONFIG_LS_CM3217=y -CONFIG_LS_CM3218=y -CONFIG_LS_UCS14620=y -CONFIG_LS_STK3410=y -CONFIG_PROXIMITY_DEVICE=y -CONFIG_PS_STK3410=y -CONFIG_PS_UCS14620=y -CONFIG_HALL_DEVICE=y -CONFIG_HS_MH248=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_RK805_PWRKEY=y @@ -921,6 +889,7 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y +CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_TWOFISH=y diff --git a/kernel-5.10/arch/arm64/configs/nanopi6_linux_defconfig b/kernel-5.10/arch/arm64/configs/nanopi6_linux_defconfig index 7867db4b108..dec5d5e5dff 100644 --- a/kernel-5.10/arch/arm64/configs/nanopi6_linux_defconfig +++ b/kernel-5.10/arch/arm64/configs/nanopi6_linux_defconfig @@ -47,7 +47,13 @@ CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARM64_ERRATUM_824069 is not set # CONFIG_ARM64_ERRATUM_819472 is not set # CONFIG_ARM64_ERRATUM_832075 is not set +# CONFIG_ARM64_ERRATUM_1418040 is not set +# CONFIG_ARM64_ERRATUM_1165522 is not set +# CONFIG_ARM64_ERRATUM_1286807 is not set +# CONFIG_ARM64_ERRATUM_1463225 is not set # CONFIG_ARM64_ERRATUM_1542419 is not set +# CONFIG_ARM64_ERRATUM_1508412 is not set +# CONFIG_ARM64_ERRATUM_2051678 is not set # CONFIG_ARM64_ERRATUM_2054223 is not set # CONFIG_ARM64_ERRATUM_2067961 is not set # CONFIG_CAVIUM_ERRATUM_22375 is not set @@ -71,6 +77,14 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y +# CONFIG_ARM64_PTR_AUTH is not set +# CONFIG_ARM64_AMU_EXTN is not set +# CONFIG_ARM64_TLB_RANGE is not set +# CONFIG_ARM64_BTI is not set +# CONFIG_ARM64_E0PD is not set +# CONFIG_ARCH_RANDOM is not set +# CONFIG_ARM64_MTE is not set +# CONFIG_ARM64_SVE is not set CONFIG_RANDOMIZE_BASE=y # CONFIG_EFI is not set CONFIG_PM_WAKELOCKS=y @@ -96,7 +110,6 @@ CONFIG_ARM_ROCKCHIP_CPUFREQ=y CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_ROCKCHIP_SIP=y CONFIG_ARM64_CRYPTO=y -CONFIG_CRYPTO_SHA512_ARM64=y CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_SHA512_ARM64_CE=y @@ -961,36 +974,6 @@ CONFIG_TOUCHSCREEN_FE_PANELS=y CONFIG_TOUCHSCREEN_GT9XX=y CONFIG_ROCKCHIP_REMOTECTL=y CONFIG_ROCKCHIP_REMOTECTL_PWM=y -CONFIG_SENSOR_DEVICE=y -CONFIG_GSENSOR_DEVICE=y -CONFIG_GS_MMA8452=y -CONFIG_MPU6880_ACC=y -CONFIG_MPU6500_ACC=y -CONFIG_GS_KXTJ9=y -CONFIG_GS_LIS3DH=y -CONFIG_GS_MMA7660=y -CONFIG_GS_MC3230=y -CONFIG_GS_LSM303D=y -CONFIG_LSM330_ACC=y -CONFIG_BMA2XX_ACC=y -CONFIG_COMPASS_DEVICE=y -CONFIG_COMPASS_AK8975=y -CONFIG_COMPASS_AK8963=y -CONFIG_GYROSCOPE_DEVICE=y -CONFIG_GYRO_L3G4200D=y -CONFIG_GYRO_L3G20D=y -CONFIG_GYRO_EWTSA=y -CONFIG_GYRO_MPU6500=y -CONFIG_GYRO_MPU6880=y -CONFIG_GYRO_LSM330=y -CONFIG_LIGHT_DEVICE=y -CONFIG_LS_CM3217=y -CONFIG_LS_CM3218=y -CONFIG_LS_STK3410=y -CONFIG_PROXIMITY_DEVICE=y -CONFIG_PS_STK3410=y -CONFIG_HALL_DEVICE=y -CONFIG_HS_MH248=y CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_ATI_REMOTE2=m @@ -1125,20 +1108,14 @@ CONFIG_VIDEO_EM28XX_V4L2=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ROCKCHIP_CIF=y +CONFIG_VIDEO_ROCKCHIP_RKISP1=y CONFIG_VIDEO_ROCKCHIP_ISP=y +CONFIG_VIDEO_ROCKCHIP_ISPP=y CONFIG_VIDEO_ROCKCHIP_HDMIRX=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_ROCKCHIP_RGA=y # CONFIG_VIDEO_IR_I2C is not set -CONFIG_VIDEO_TC35874X=y -CONFIG_VIDEO_GC8034=m -CONFIG_VIDEO_IMX464=m -CONFIG_VIDEO_OS04A10=m -CONFIG_VIDEO_OV4689=y -CONFIG_VIDEO_OV5695=m -CONFIG_VIDEO_OV7251=m -CONFIG_VIDEO_OV13850=y -CONFIG_VIDEO_DW9714=y +CONFIG_VIDEO_IMX415=m # CONFIG_VGA_ARB is not set CONFIG_DRM=y CONFIG_DRM_IGNORE_IOTCL_PERMIT=y @@ -1196,6 +1173,7 @@ CONFIG_ROCKCHIP_MPP_VEPU2=y CONFIG_ROCKCHIP_MPP_IEP2=y CONFIG_ROCKCHIP_MPP_JPGDEC=y CONFIG_ROCKCHIP_MPP_AV1DEC=y +CONFIG_ROCKCHIP_MPP_VDPP=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y @@ -1225,6 +1203,7 @@ CONFIG_SND_SOC_ROCKCHIP=y CONFIG_SND_SOC_ROCKCHIP_I2S=y CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y CONFIG_SND_SOC_ROCKCHIP_PDM=y +CONFIG_SND_SOC_ROCKCHIP_SAI=y CONFIG_SND_SOC_ROCKCHIP_SPDIF=y CONFIG_SND_SOC_ROCKCHIP_SPDIFRX=y CONFIG_SND_SOC_ROCKCHIP_VAD=m @@ -1239,16 +1218,17 @@ CONFIG_SND_SOC_ES7202=m CONFIG_SND_SOC_ES7243E=m CONFIG_SND_SOC_ES8311=m CONFIG_SND_SOC_ES8316=m -CONFIG_SND_SOC_ES8323=y +CONFIG_SND_SOC_ES8323=m CONFIG_SND_SOC_PCM179X_I2C=m CONFIG_SND_SOC_PCM512x_I2C=m CONFIG_SND_SOC_RK3308=m CONFIG_SND_SOC_RK3328=y CONFIG_SND_SOC_RK817=m CONFIG_SND_SOC_RK_CODEC_DIGITAL=y +CONFIG_SND_SOC_RK_DSM=y CONFIG_SND_SOC_RT5616=y CONFIG_SND_SOC_RT5640=m -CONFIG_SND_SOC_RT5651=y +CONFIG_SND_SOC_RT5651=m CONFIG_SND_SOC_SPDIF=y CONFIG_SND_SIMPLE_CARD=y CONFIG_HID_BATTERY_STRENGTH=y @@ -1448,6 +1428,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_UEVENT=y CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_NCM=y CONFIG_USB_CONFIGFS_RNDIS=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_FS=y @@ -1545,12 +1526,6 @@ CONFIG_ASHMEM=y CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y CONFIG_ION_CMA_HEAP=y -CONFIG_FIQ_DEBUGGER=y -CONFIG_FIQ_DEBUGGER_NO_SLEEP=y -CONFIG_FIQ_DEBUGGER_CONSOLE=y -CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y -CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y -CONFIG_RK_CONSOLE_THREAD=y CONFIG_FB_TFT=m CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m @@ -1593,6 +1568,7 @@ CONFIG_CPU_RK1808=y CONFIG_CPU_RK3328=y CONFIG_CPU_RK3368=y CONFIG_CPU_RK3399=y +CONFIG_CPU_RK3562=y CONFIG_CPU_RK3568=y CONFIG_CPU_RK3588=y CONFIG_ROCKCHIP_CPUINFO=y @@ -1607,7 +1583,12 @@ CONFIG_ROCKCHIP_SYSTEM_MONITOR=y CONFIG_ROCKCHIP_VENDOR_STORAGE=y CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE=y CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y -CONFIG_ROCKCHIP_FIQ_DEBUGGER=y +CONFIG_FIQ_DEBUGGER=y +CONFIG_FIQ_DEBUGGER_NO_SLEEP=y +CONFIG_FIQ_DEBUGGER_CONSOLE=y +CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y +CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y +CONFIG_RK_CONSOLE_THREAD=y CONFIG_ROCKCHIP_DEBUG=y CONFIG_VENDOR_FRIENDLYELEC=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y diff --git a/kernel-5.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/kernel-5.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 29c61c8602d..a4977a8a4ba 100644 --- a/kernel-5.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/kernel-5.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -10622,27 +10622,18 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win, unsigned lon return 0; } -static struct drm_plane *vop2_cursor_plane_init(struct vop2_video_port *vp) +static struct drm_plane *vop2_cursor_plane_init(struct vop2_video_port *vp, + uint32_t possible_crtcs) { struct vop2 *vop2 = vp->vop2; struct drm_plane *cursor = NULL; struct vop2_win *win; - unsigned long possible_crtcs = 0; win = vop2_find_win_by_phys_id(vop2, vp->cursor_win_id); if (win) { - if (vop2->disable_win_move) { - const struct vop2_data *vop2_data = vop2->data; - struct drm_crtc *crtc = vop2_find_crtc_by_plane_mask(vop2, win->phys_id); - - if (crtc) - possible_crtcs = drm_crtc_mask(crtc); - else - possible_crtcs = (1 << vop2_data->nr_vps) - 1; - } - if (win->possible_crtcs) possible_crtcs = win->possible_crtcs; + win->type = DRM_PLANE_TYPE_CURSOR; win->zpos = vop2->registered_num_wins - 1; if (!vop2_plane_init(vop2, win, possible_crtcs)) @@ -10892,7 +10883,7 @@ static int vop2_create_crtc(struct vop2 *vop2) struct vop2_win *win = NULL; struct vop2_video_port *vp; const struct vop2_video_port_data *vp_data; - uint32_t possible_crtcs; + uint32_t all_crtcs, possible_crtcs; uint64_t soc_id; uint32_t registered_num_crtcs = 0; uint32_t plane_mask = 0; @@ -10905,7 +10896,7 @@ static int vop2_create_crtc(struct vop2 *vop2) struct rockchip_drm_private *private = drm_dev->dev_private; /* all planes can attach to any crtc */ - possible_crtcs = (1 << vop2_data->nr_vps) - 1; + all_crtcs = (1 << vop2_data->nr_vps) - 1; /* * We set plane_mask from dts or bootloader @@ -10939,6 +10930,8 @@ static int vop2_create_crtc(struct vop2 *vop2) if (vop2->disable_win_move) possible_crtcs = BIT(registered_num_crtcs); + else + possible_crtcs = all_crtcs; /* * we assume a vp with a zere plane_mask(set from dts or bootloader) @@ -11067,7 +11060,7 @@ static int vop2_create_crtc(struct vop2 *vop2) } if (vp->cursor_win_id >= 0) { - cursor = vop2_cursor_plane_init(vp); + cursor = vop2_cursor_plane_init(vp, possible_crtcs); if (!cursor) DRM_WARN("failed to init cursor plane for vp%d\n", vp->id); else @@ -11170,8 +11163,9 @@ static int vop2_create_crtc(struct vop2 *vop2) if (crtc) possible_crtcs = drm_crtc_mask(crtc); else - possible_crtcs = (1 << vop2_data->nr_vps) - 1; + possible_crtcs = all_crtcs; } + if (win->possible_crtcs) possible_crtcs = win->possible_crtcs; @@ -11440,7 +11434,8 @@ static bool vop2_plane_mask_check(struct vop2 *vop2) plane_mask != vop2_data->plane_mask_base) { DRM_WARN("all windows should be assigned, full plane mask: 0x%x, current plane mask: 0x%x\n", vop2_data->plane_mask_base, plane_mask); - return false; + if ((plane_mask & vop2_data->plane_mask_base) != plane_mask) + return false; } return true; diff --git a/kernel-5.10/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c b/kernel-5.10/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c index 067314d4916..6116e01ef1b 100644 --- a/kernel-5.10/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c +++ b/kernel-5.10/drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c @@ -3034,10 +3034,9 @@ static int hdmirx_audio_startup(struct device *dev, void *data) { struct rk_hdmirx_dev *hdmirx_dev = dev_get_drvdata(dev); - if (tx_5v_power_present(hdmirx_dev) && hdmirx_dev->audio_present) - return 0; - dev_err(dev, "%s: device is no connected or audio is off\n", __func__); - return -ENODEV; + if (!tx_5v_power_present(hdmirx_dev) || !hdmirx_dev->audio_present) + dev_warn_once(dev, "%s: device is no connected or audio is off\n", __func__); + return 0; } static void hdmirx_audio_shutdown(struct device *dev, void *data) diff --git a/kernel-5.10/drivers/usb/dwc3/core.c b/kernel-5.10/drivers/usb/dwc3/core.c index 8384e534bc0..165441aeb07 100644 --- a/kernel-5.10/drivers/usb/dwc3/core.c +++ b/kernel-5.10/drivers/usb/dwc3/core.c @@ -169,13 +169,9 @@ static void __dwc3_set_mode(struct work_struct *work) break; } - /* - * When current_dr_role is not set, there's no role switching. - * Only perform GCTL.CoreSoftReset when there's DRD role switching. - */ - if (dwc->current_dr_role && ((DWC3_IP_IS(DWC3) || - DWC3_VER_IS_PRIOR(DWC31, 190A)) && - dwc->desired_dr_role != DWC3_GCTL_PRTCAP_OTG)) { + /* For DRD host or device mode only */ + if ((DWC3_IP_IS(DWC3) || DWC3_VER_IS_PRIOR(DWC31, 190A)) && + dwc->desired_dr_role != DWC3_GCTL_PRTCAP_OTG) { reg = dwc3_readl(dwc->regs, DWC3_GCTL); reg |= DWC3_GCTL_CORESOFTRESET; dwc3_writel(dwc->regs, DWC3_GCTL, reg); diff --git a/kernel-5.10/drivers/usb/storage/uas-detect.h b/kernel-5.10/drivers/usb/storage/uas-detect.h index 3f720faa6f9..d73282c0ec5 100644 --- a/kernel-5.10/drivers/usb/storage/uas-detect.h +++ b/kernel-5.10/drivers/usb/storage/uas-detect.h @@ -116,6 +116,19 @@ static int uas_use_uas_driver(struct usb_interface *intf, if (le16_to_cpu(udev->descriptor.idVendor) == 0x0bc2) flags |= US_FL_NO_ATA_1X; + /* + * RTL9210-based enclosure from HIKSEMI, MD202 reportedly have issues + * with UAS. This isn't distinguishable with just idVendor and + * idProduct, use manufacturer and product too. + * + * Reported-by: Hongling Zeng + */ + if (le16_to_cpu(udev->descriptor.idVendor) == 0x0bda && + le16_to_cpu(udev->descriptor.idProduct) == 0x9210 && + (udev->manufacturer && !strcmp(udev->manufacturer, "HIKSEMI")) && + (udev->product && !strcmp(udev->product, "MD202"))) + flags |= US_FL_IGNORE_UAS; + usb_stor_adjust_quirks(udev, &flags); if (flags & US_FL_IGNORE_UAS) { diff --git a/kernel-5.10/drivers/usb/storage/unusual_uas.h b/kernel-5.10/drivers/usb/storage/unusual_uas.h index d009e69b700..1d6871618fe 100644 --- a/kernel-5.10/drivers/usb/storage/unusual_uas.h +++ b/kernel-5.10/drivers/usb/storage/unusual_uas.h @@ -89,13 +89,6 @@ UNUSUAL_DEV(0x0bc2, 0x331a, 0x0000, 0x9999, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_REPORT_LUNS), -/* Reported-by: Hongling Zeng */ -UNUSUAL_DEV(0x0bda, 0x9210, 0x0000, 0x9999, - "Hiksemi", - "External HDD", - USB_SC_DEVICE, USB_PR_DEVICE, NULL, - US_FL_IGNORE_UAS), - /* Reported-by: Benjamin Tissoires */ UNUSUAL_DEV(0x13fd, 0x3940, 0x0000, 0x9999, "Initio Corporation",