[ sunxi / sunxi64 ] Patches cleanup, config cleanup, board config cleanup, disabling broken UART1 patch for Lite+/One+ ... should be fine in 5.1.y when we get there.

2025-09-24 19:47:06 +07:00 · 2019-04-28 09:02:55 +02:00
parent 00702cfe62
commit b50b7e685e
11 changed files with 4209 additions and 8795 deletions
--- a/config/boards/orangepipc2.conf
+++ b/config/boards/orangepipc2.conf
@@ -4,8 +4,6 @@ BOARDFAMILY="sun50iw2"
 BOOTCONFIG="orangepi_pc2_defconfig"
 MODULES=""
 MODULES_NEXT=""
-CPUMIN="120000"
-CPUMAX="1400000"
 #
 KERNEL_TARGET="next,dev"
 CLI_TARGET="stretch,bionic:next"
--- a/config/boards/orangepiprime.conf
+++ b/config/boards/orangepiprime.conf
@@ -4,8 +4,6 @@ BOARDFAMILY="sun50iw2"
 BOOTCONFIG="orangepi_prime_defconfig"
 MODULES=""
 MODULES_NEXT=""
-CPUMIN="120000"
-CPUMAX="1400000"
 #
 KERNEL_TARGET="next,dev"
 CLI_TARGET="stretch,bionic:next"
--- a/config/kernel/linux-sunxi64-dev.config
+++ b/config/kernel/linux-sunxi64-dev.config
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.20.12 Kernel Configuration
+# Linux/arm64 5.0.10 Kernel Configuration
 #

 #
-# Compiler: aarch64-linux-gnu-gcc (Linaro GCC 7.2-2017.11) 7.2.1 20171011
+# Compiler: aarch64-linux-gnu-gcc (Linaro GCC 7.4-2019.02) 7.4.1 20181213 [linaro-7.4-2019.02 revision 56ec6f6b99cc167ff0c2f8e1a2eed33b1edc85d4]
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=70201
+CONFIG_GCC_VERSION=70401
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -32,8 +33,6 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_AUDIT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y

 #
 # IRQ subsystem
@@ -223,6 +222,7 @@ CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ZONE_DMA32=y
 CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SMP=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
@@ -248,6 +248,7 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_MESON is not set
 # CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
@@ -265,16 +266,6 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set

-#
-# Bus support
-#
-# CONFIG_PCI is not set
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-
 #
 # Kernel Features
 #
@@ -282,6 +273,7 @@ CONFIG_ARCH_SUNXI=y
 #
 # ARM errata workarounds via the alternatives framework
 #
+CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
 CONFIG_ARM64_ERRATUM_826319=y
 CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_824069=y
@@ -291,6 +283,7 @@ CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_1188873=y
+CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1286807=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 CONFIG_CAVIUM_ERRATUM_23144=y
@@ -342,6 +335,7 @@ CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_KEXEC is not set
+# CONFIG_KEXEC_FILE is not set
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
@@ -349,6 +343,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
+CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARMV8_DEPRECATED is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set

@@ -367,6 +362,11 @@ CONFIG_ARM64_UAO=y
 # CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
+
+#
+# ARMv8.3 architectural features
+#
+CONFIG_ARM64_PTR_AUTH=y
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_MODULE_PLTS=y
 # CONFIG_RANDOMIZE_BASE is not set
@@ -398,6 +398,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_CPU_PM=y
+# CONFIG_ENERGY_MODEL is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y

@@ -458,6 +459,7 @@ CONFIG_ARM_SCMI_POWER_DOMAIN=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ARM_SCPI_POWER_DOMAIN=y
 # CONFIG_ARM_SDE_INTERFACE is not set
+# CONFIG_INTEL_STRATIX10_SERVICE is not set
 CONFIG_HAVE_ARM_SMCCC=y
 # CONFIG_GOOGLE_FIRMWARE is not set

@@ -481,6 +483,7 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_CRYPTO_CHACHA20_NEON=y
+# CONFIG_CRYPTO_NHPOLY1305_NEON is not set
 CONFIG_CRYPTO_AES_ARM64_BS=y

 #
@@ -577,7 +580,6 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
 CONFIG_BLK_WBT=y
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
-CONFIG_BLK_WBT_SQ=y
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_DEBUG_FS is not set
 # CONFIG_BLK_SED_OPAL is not set
@@ -595,14 +597,6 @@ CONFIG_BLK_PM=y
 #
 # IO Schedulers
 #
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
@@ -695,6 +689,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_MEMORY_ISOLATION=y
+# CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -731,6 +726,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
+CONFIG_SKB_EXTENSIONS=y

 #
 # Networking options
@@ -898,9 +894,6 @@ CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=y
-CONFIG_NF_NAT_PROTO_UDPLITE=y
-CONFIG_NF_NAT_PROTO_SCTP=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1120,7 +1113,6 @@ CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NFT_MASQ_IPV4=m
 CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_IP_NF_IPTABLES=y
@@ -1231,6 +1223,8 @@ CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_LEGACY=y
 CONFIG_NET_DSA_TAG_GSWIP=y
+CONFIG_NET_DSA_TAG_KSZ=y
+CONFIG_NET_DSA_TAG_KSZ9477=y
 CONFIG_VLAN_8021Q=y
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1395,6 +1389,7 @@ CONFIG_CAN_VXCAN=m
 CONFIG_CAN_SLCAN=m
 CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
+# CONFIG_CAN_FLEXCAN is not set
 # CONFIG_CAN_GRCAN is not set
 # CONFIG_CAN_XILINXCAN is not set
 # CONFIG_CAN_C_CAN is not set
@@ -1532,6 +1527,9 @@ CONFIG_HAVE_EBPF_JIT=y
 # Device Drivers
 #
 CONFIG_ARM_AMBA=y
+CONFIG_HAVE_PCI=y
+# CONFIG_PCI is not set
+# CONFIG_PCCARD is not set

 #
 # Generic Driver Options
@@ -1592,7 +1590,6 @@ CONFIG_GNSS_SIRF_SERIAL=m
 CONFIG_GNSS_UBX_SERIAL=m
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
@@ -1601,6 +1598,7 @@ CONFIG_MTD_OF_PARTS=y
 #
 # Partition parsers
 #
+# CONFIG_MTD_REDBOOT_PARTS is not set

 #
 # User Modules And Translation Layers
@@ -1642,7 +1640,6 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PHYSMAP_OF is not set
 # CONFIG_MTD_PLATRAM is not set

 #
@@ -1734,6 +1731,7 @@ CONFIG_ATA_OVER_ETH=m
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
+CONFIG_PVPANIC=m
 # CONFIG_C2PORT is not set

 #
@@ -1801,7 +1799,6 @@ CONFIG_SCSI_MOD=y
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
 # CONFIG_SCSI_PROC_FS is not set

 #
@@ -1835,7 +1832,6 @@ CONFIG_SCSI_UFSHCD=m
 # CONFIG_SCSI_UFS_BSG is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_VIRTIO is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_HAVE_PATA_PLATFORM=y
@@ -1926,7 +1922,9 @@ CONFIG_NLMON=m
 CONFIG_NET_DSA_LANTIQ_GSWIP=m
 # CONFIG_NET_DSA_MT7530 is not set
 # CONFIG_NET_DSA_MV88E6060 is not set
-# CONFIG_MICROCHIP_KSZ is not set
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 # CONFIG_NET_DSA_MV88E6XXX is not set
 # CONFIG_NET_DSA_QCA8K is not set
 CONFIG_NET_DSA_REALTEK_SMI=m
@@ -2008,7 +2006,7 @@ CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_BUS=y
 # CONFIG_MDIO_BCM_UNIMAC is not set
 CONFIG_MDIO_BITBANG=y
-CONFIG_MDIO_BUS_MUX=y
+CONFIG_MDIO_BUS_MUX=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_GPIO is not set
@@ -2118,6 +2116,7 @@ CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
+# CONFIG_USB_NET_AQC111 is not set
 CONFIG_WLAN=y
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_RTL8189ES=m
@@ -2234,6 +2233,7 @@ CONFIG_RTL8812AU=m
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 # CONFIG_MAC80211_HWSIM is not set
 CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m

 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -2466,6 +2466,7 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_SERIO_APBPS2 is not set
+CONFIG_SERIO_OLPC_APSP=m
 # CONFIG_SERIO_SUN4I_PS2 is not set
 CONFIG_SERIO_GPIO_PS2=m
 # CONFIG_USERIO is not set
@@ -2487,6 +2488,7 @@ CONFIG_LEGACY_PTY_COUNT=16
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
+CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y

 #
@@ -2538,11 +2540,6 @@ CONFIG_HVC_DRIVER=y
 CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
-# CONFIG_R3964 is not set
-
-#
-# PCMCIA character devices
-#
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 # CONFIG_XILLYBUS is not set
@@ -2613,6 +2610,9 @@ CONFIG_I2C_SLAVE=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
@@ -2633,6 +2633,7 @@ CONFIG_SPI_PL022=y
 # CONFIG_SPI_SC18IS602 is not set
 CONFIG_SPI_SUN4I=y
 CONFIG_SPI_SUN6I=y
+CONFIG_SPI_MXIC=m
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
@@ -2678,6 +2679,7 @@ CONFIG_PINCTRL_AXP209=m
 # CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SX150X is not set
+# CONFIG_PINCTRL_OCELOT is not set
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SUN8I_H3_R=y
 CONFIG_PINCTRL_SUN50I_A64=y
@@ -2698,6 +2700,7 @@ CONFIG_GPIO_GENERIC=y
 #
 # CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_ALTERA is not set
+CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_DWAPB=y
 # CONFIG_GPIO_FTGPIO010 is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
@@ -2706,7 +2709,8 @@ CONFIG_GPIO_HLWD=m
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_SYSCON is not set
+CONFIG_GPIO_SAMA5D2_PIOBU=m
+CONFIG_GPIO_SYSCON=m
 # CONFIG_GPIO_XGENE is not set
 # CONFIG_GPIO_XILINX is not set

@@ -2910,6 +2914,8 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_OCC_P8_I2C=m
+CONFIG_SENSORS_OCC=y
 CONFIG_SENSORS_PCF8591=m
 # CONFIG_PMBUS is not set
 CONFIG_SENSORS_PWM_FAN=m
@@ -2976,13 +2982,8 @@ CONFIG_CLOCK_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 # CONFIG_QORIQ_THERMAL is not set
-
-#
-# ACPI INT340X thermal drivers
-#
 CONFIG_SUN50I_H6_THS=m
 CONFIG_SUN8I_THS=m
-# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
 CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
@@ -3039,7 +3040,6 @@ CONFIG_MFD_SUN4I_GPADC=y
 # CONFIG_MFD_AS3722 is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-CONFIG_MFD_AT91_USART=m
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
@@ -3163,6 +3163,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
+CONFIG_REGULATOR_MCP16502=m
 # CONFIG_REGULATOR_MT6311 is not set
 # CONFIG_REGULATOR_PFUZE100 is not set
 # CONFIG_REGULATOR_PV88060 is not set
@@ -3217,6 +3218,7 @@ CONFIG_IR_PWM_TX=m
 CONFIG_IR_SUNXI=m
 # CONFIG_IR_SERIAL is not set
 # CONFIG_IR_SIR is not set
+CONFIG_RC_XBOX_DVD=m
 CONFIG_MEDIA_SUPPORT=m

 #
@@ -3411,6 +3413,7 @@ CONFIG_USB_HACKRF=m
 CONFIG_USB_MSI2500=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CADENCE is not set
+CONFIG_VIDEO_ASPEED=m
 CONFIG_VIDEO_MUX=m
 # CONFIG_SOC_CAMERA is not set
 CONFIG_VIDEO_XILINX=m
@@ -3623,6 +3626,7 @@ CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
 CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
 CONFIG_DVB_RTL2830=m
 CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
@@ -3708,10 +3712,8 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_TTM=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_SCHED=m

 #
 # I2C encoder or helper chips
@@ -3758,10 +3760,12 @@ CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
 CONFIG_DRM_PANEL_JDI_LT070ME05000=m
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
+CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
@@ -3769,6 +3773,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y

@@ -3802,7 +3807,6 @@ CONFIG_DRM_DW_HDMI_CEC=m
 # CONFIG_DRM_MXSFB is not set
 # CONFIG_DRM_TINYDRM is not set
 # CONFIG_DRM_PL111 is not set
-CONFIG_DRM_LIMA=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y

@@ -3822,7 +3826,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_BACKLIGHT=m
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set

@@ -3970,6 +3974,7 @@ CONFIG_SND_SUN50I_CODEC_ANALOG=m
 CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
+CONFIG_SND_SOC_XILINX_I2S=m
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_ZX_TDM is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -3983,6 +3988,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
+CONFIG_SND_SOC_AK4118=m
 CONFIG_SND_SOC_AK4458=m
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
@@ -4594,6 +4600,7 @@ CONFIG_MMC_SUNXI=y
 # CONFIG_MMC_MTK is not set
 # CONFIG_MMC_SDHCI_XENON is not set
 # CONFIG_MMC_SDHCI_OMAP is not set
+CONFIG_MMC_SDHCI_AM654=m
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -4664,6 +4671,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
@@ -4891,7 +4899,6 @@ CONFIG_AD9834=m
 #
 # Resolver to digital converters
 #
-# CONFIG_AD2S90 is not set
 # CONFIG_AD2S1210 is not set

 #
@@ -4990,6 +4997,7 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_XGENE is not set
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_VC5 is not set
+CONFIG_COMMON_CLK_BD718XX=m
 CONFIG_SUNXI_CCU=y
 CONFIG_SUN50I_A64_CCU=y
 CONFIG_SUN50I_H6_CCU=y
@@ -5169,6 +5177,7 @@ CONFIG_STK8BA50=m
 # Analog to digital converters
 #
 CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7124=m
 CONFIG_AD7266=m
 CONFIG_AD7291=m
 CONFIG_AD7298=m
@@ -5178,6 +5187,7 @@ CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
 CONFIG_AD7923=m
+CONFIG_AD7949=m
 CONFIG_AD799X=m
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP288_ADC=m
@@ -5291,6 +5301,7 @@ CONFIG_AD5758=m
 # CONFIG_MCP4922 is not set
 # CONFIG_TI_DAC082S085 is not set
 CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
 # CONFIG_VF610_DAC is not set

 #
@@ -5414,6 +5425,7 @@ CONFIG_TSL2772=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 CONFIG_VL6180=m
 CONFIG_ZOPT2201=m
@@ -5436,6 +5448,9 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 CONFIG_SENSORS_HMC5843=m
 CONFIG_SENSORS_HMC5843_I2C=m
 CONFIG_SENSORS_HMC5843_SPI=m
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m

 #
 # Multiplexers
@@ -5466,6 +5481,7 @@ CONFIG_AD5272=m
 CONFIG_MCP4018=m
 # CONFIG_MCP4131 is not set
 # CONFIG_MCP4531 is not set
+CONFIG_MCP41010=m
 # CONFIG_TPL0102 is not set

 #
@@ -5511,6 +5527,7 @@ CONFIG_VL53L0X_I2C=m
 #
 # Resolver to digital converters
 #
+# CONFIG_AD2S90 is not set
 # CONFIG_AD2S1200 is not set

 #
@@ -5538,6 +5555,7 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_MADERA_IRQ=m
 CONFIG_PARTITION_PERCPU=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
@@ -5557,6 +5575,8 @@ CONFIG_PHY_SUN9I_USB=y
 CONFIG_PHY_SUN50I_USB3=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
 CONFIG_PHY_CADENCE_DP=m
+CONFIG_PHY_CADENCE_SIERRA=m
+CONFIG_PHY_FSL_IMX8MQ_USB=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_CPCAP_USB is not set
@@ -5994,6 +6014,8 @@ CONFIG_CRYPTO_OFB=m
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=y
 # CONFIG_CRYPTO_KEYWRAP is not set
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m

 #
 # Hash modes
@@ -6010,7 +6032,7 @@ CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
 # CONFIG_CRYPTO_CRCT10DIF is not set
 CONFIG_CRYPTO_GHASH=y
-# CONFIG_CRYPTO_POLY1305 is not set
+CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -6023,6 +6045,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 # CONFIG_CRYPTO_SHA3 is not set
 # CONFIG_CRYPTO_SM3 is not set
+CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TGR192 is not set
 CONFIG_CRYPTO_WP512=y

@@ -6075,6 +6098,7 @@ CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
 CONFIG_CRYPTO_USER_API_AEAD=y
+# CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
 # CONFIG_CRYPTO_HW is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -6098,6 +6122,7 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # Library routines
 #
 CONFIG_RAID6_PQ=y
+CONFIG_RAID6_PQ_BENCHMARK=y
 CONFIG_BITREVERSE=y
 CONFIG_HAVE_ARCH_BITREVERSE=y
 CONFIG_RATIONAL=y
@@ -6169,8 +6194,9 @@ CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
 CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y
-CONFIG_DMA_DIRECT_OPS=y
 CONFIG_SWIOTLB=y
+CONFIG_DMA_REMAP=y
+CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_SGL_ALLOC=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
@@ -6189,7 +6215,6 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set

@@ -6236,7 +6261,10 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
 # CONFIG_KASAN is not set
+CONFIG_KASAN_STACK=1
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
--- a/patch/atf/atf-sunxi64/enable-additional-regulators.patch.disabled
+++ b/patch/atf/atf-sunxi64/enable-additional-regulators.patch.disabled
--- a/patch/atf/atf-sunxi64/set-rsb-to-nonsec.patch.disabled
+++ b/patch/atf/atf-sunxi64/set-rsb-to-nonsec.patch.disabled
--- a/patch/kernel/sunxi-dev/board-h6-add-orangepi-one-plus-and-lite2.patch_broken_below_5.1
+++ b/patch/kernel/sunxi-dev/board-h6-add-orangepi-one-plus-and-lite2.patch_broken_below_5.1
--- a/patch/kernel/sunxi-dev/patch-5.0.7-8.patch
+++ b/patch/kernel/sunxi-dev/patch-5.0.7-8.patch
--- a/patch/kernel/sunxi-dev/patch-5.0.8-9.patch
+++ b/patch/kernel/sunxi-dev/patch-5.0.8-9.patch
--- a/patch/kernel/sunxi-dev/patch-5.0.9-10.patch
+++ b/patch/kernel/sunxi-dev/patch-5.0.9-10.patch
--- a/patch/kernel/sunxi-dev/xxx-orangepizero-plus2-default-regulator.patch
+++ b/patch/kernel/sunxi-dev/xxx-orangepizero-plus2-default-regulator.patch
@@ -13,15 +13,15 @@ index 50ad2e4fd..e1ee1cd09 100644
 +		regulator-type = "voltage";
 +		regulator-boot-on;
 +		regulator-always-on;
-+		regulator-min-microvolt = <1100000>;
-+		regulator-max-microvolt = <1100000>;
+		regulator-min-microvolt = <1108475>;
+		regulator-max-microvolt = <1307810>;
 +		regulator-ramp-delay = <50>; /* 4ms */
-+
+		enable-gpios =  <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
 +		gpios = <&r_pio 0 6 0>; /* PL6 */
 +		enable-active-high;
 +		gpios-states = <0x1>;
-+		states = <1100000 0x0
-+			  1100000 0x1>;
+		states = <1108475 0x0
+			  1307810 0x1>;
 +	};
 +};
 +
--- a/patch/kernel/sunxi-next/xxx-orangepizero-plus2-default-regulator.patch
+++ b/patch/kernel/sunxi-next/xxx-orangepizero-plus2-default-regulator.patch
@@ -13,15 +13,15 @@ index 50ad2e4fd..e1ee1cd09 100644
 +		regulator-type = "voltage";
 +		regulator-boot-on;
 +		regulator-always-on;
-+		regulator-min-microvolt = <1100000>;
-+		regulator-max-microvolt = <1100000>;
+		regulator-min-microvolt = <1108475>;
+		regulator-max-microvolt = <1307810>;
 +		regulator-ramp-delay = <50>; /* 4ms */
-+
+		enable-gpios =  <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
 +		gpios = <&r_pio 0 6 0>; /* PL6 */
 +		enable-active-high;
 +		gpios-states = <0x1>;
-+		states = <1100000 0x0
-+			  1100000 0x1>;
+		states = <1108475 0x0
+			  1307810 0x1>;
 +	};
 +};
 +