Reverting sunxi/sunxi64 NEXT to 4.14. (#1087)

* Bump to 4.18, removing the obvious, fixing build problems, put some on waiting.

* Pin 4.18 to DEV, rollback 4.14 to NEXT, adjust configs, remove one deprecated patch from NEXT and add board-h3-address-some-stability-issues.patch

* Adjust few boards in development to new reality, removing it from NEXT for now

* Adjust few board configs

* Board config adjustement

* Adjust few boards configs

* Port NeoCore2 and Neo21.1 to 4.14.y

* Adjust board config

* Adjust board config

config/boards/bananapim2ultra.csc

@@ -6,10 +6,6 @@ MODULES=""
 MODULES_NEXT=""
 OVERLAY_PREFIX=""
 #
-KERNEL_TARGET="next,dev"
+KERNEL_TARGET="dev"
 CLI_TARGET=""
 DESKTOP_TARGET=""
-#
-BOARDRATING=""
-HARDWARE="https://linux-sunxi.org/Banana_Pi_M2_Ultra"
-FORUMS="http://forum.armbian.com/index.php/forum/11-other-boards/"

config/boards/bananapim3.csc

@@ -7,8 +7,8 @@ MODULES=""
 MODULES_NEXT=""
 OVERLAY_PREFIX="sun8i-a83t"
 #
-KERNEL_TARGET="next,dev"
+KERNEL_TARGET="dev"
-CLI_TARGET="stretch:next"
+CLI_TARGET="stretch:dev"
-DESKTOP_TARGET="stretch:next"
+DESKTOP_TARGET="stretch:dev"
 #
 CLI_BETA_TARGET=""

config/boards/cubietruck.conf

@@ -6,7 +6,7 @@ MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i ap6210"
 MODULES_NEXT="brcmfmac rfcomm hidp bonding"
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET="stretch,xenial:next"
+CLI_TARGET="bionic,stretch:next"
-DESKTOP_TARGET="xenial:default,next"
+DESKTOP_TARGET=""
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""

config/boards/espressobin.conf

@@ -6,7 +6,7 @@ MODULES=""
 MODULES_NEXT=""
 BUILD_DESKTOP="no"
 #
-KERNEL_TARGET="default,next,dev"
+KERNEL_TARGET="default,next"
 CLI_TARGET="stretch,xenial:default,next"
 #
 CLI_BETA_TARGET=""

config/boards/lepotato.conf

@@ -6,7 +6,7 @@ BOOTCONFIG="libretech-cc_defconfig"
 MODULES=""
 MODULES_NEXT=""
 #
-KERNEL_TARGET="default,next,dev"
+KERNEL_TARGET="default,next"
 CLI_TARGET="stretch:default,next"
 DESKTOP_TARGET="stretch:default,next"
 #

config/boards/nanopiair.conf

@@ -12,6 +12,6 @@ CPUMAX="912000"
 BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET="stretch,xenial:next"
+CLI_TARGET="stretch,bionic:next"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""

config/boards/nanopik1plus.conf

@@ -8,8 +8,8 @@ CPUMIN="408000"
 CPUMAX="1296000"
 #
 KERNEL_TARGET="next,dev"
-CLI_TARGET="stretch:next"
+CLI_TARGET="bionic,stretch:next"
-DESKTOP_TARGET="stretch:next"
+DESKTOP_TARGET=""
 #
 CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""

config/boards/nanopik2-s905.conf

@@ -6,7 +6,7 @@ BOOTCONFIG="nanopi-k2_defconfig"
 MODULES=""
 MODULES_NEXT=""
 #
-KERNEL_TARGET="default,next,dev"
+KERNEL_TARGET="default,next"
 CLI_TARGET="stretch:default,next"
 CLI_BETA_TARGET=""
 DESKTOP_TARGET="stretch:default,next"

config/boards/nanopineocore2.conf

@@ -12,6 +12,6 @@ CPUMAX="1392000"
 BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="next,dev"
-CLI_TARGET="stretch:next"
+CLI_TARGET="bionic,stretch:next"
 #
-CLI_BETA_TARGET="bionic:dev"
+CLI_BETA_TARGET=""

config/boards/odroidc2.conf

@@ -8,7 +8,7 @@ BOOTCONFIG_DEV="odroid-c2_defconfig"
 MODULES="bonding"
 MODULES_NEXT=""
 #
-KERNEL_TARGET="default,next,dev"
+KERNEL_TARGET="default,next"
 CLI_TARGET="stretch:default,next"
 DESKTOP_TARGET="stretch:default,next"
 #

config/boards/orangepilite2.wip

@@ -6,9 +6,9 @@ BOOTCONFIG="orangepi_lite2_defconfig"
 MODULES=""
 MODULES_NEXT=""
 #
-KERNEL_TARGET="next,dev"
+KERNEL_TARGET="dev"
-CLI_TARGET="stretch:next"
+CLI_TARGET=""
 DESKTOP_TARGET=""
 #
-CLI_BETA_TARGET="stretch:next"
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""

config/boards/orangepioneplus.wip

@@ -6,9 +6,9 @@ BOOTCONFIG="orangepi_one_plus_defconfig"
 MODULES=""
 MODULES_NEXT=""
 #
-KERNEL_TARGET="next,dev"
+KERNEL_TARGET="dev"
-CLI_TARGET="stretch:next"
+CLI_TARGET=""
 DESKTOP_TARGET=""
 #
-CLI_BETA_TARGET="stretch:next"
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""

config/boards/orangepizeroplus.conf

@@ -11,6 +11,6 @@ CPUMAX="1200000"
 BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="next,dev"
-CLI_TARGET="stretch,xenial:next"
+CLI_TARGET="stretch,bionic:next"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""

config/boards/pineh64.wip

@@ -6,9 +6,9 @@ BOOTCONFIG="pine_h64_defconfig"
 MODULES=""
 MODULES_NEXT=""
 #
-KERNEL_TARGET="next,dev"
+KERNEL_TARGET="dev"
-CLI_TARGET="stretch:next"
+CLI_TARGET=""
 DESKTOP_TARGET=""
 #
-CLI_BETA_TARGET="stretch:next"
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""

config/kernel/linux-sunxi64-dev.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.18.0-rc7 Kernel Configuration
+# Linux/arm64 4.18.3 Kernel Configuration
 #
 
 #
@@ -830,14 +830,14 @@ CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_OSF=m
 CONFIG_NF_TABLES=m
-# CONFIG_NF_TABLES_SET is not set
+CONFIG_NF_TABLES_SET=m
 # CONFIG_NF_TABLES_INET is not set
 # CONFIG_NF_TABLES_NETDEV is not set
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_COUNTER=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
@@ -849,7 +849,7 @@ CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=y
@@ -986,7 +986,7 @@ CONFIG_IP_VS_LBLC=m
 CONFIG_IP_VS_LBLCR=m
 CONFIG_IP_VS_DH=m
 CONFIG_IP_VS_SH=m
-# CONFIG_IP_VS_MH is not set
+CONFIG_IP_VS_MH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
@@ -1563,6 +1563,7 @@ CONFIG_OF_MDIO=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
+CONFIG_OF_CONFIGFS=y
 CONFIG_OF_NUMA=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
@@ -1731,7 +1732,7 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_CACHE is not set
-# CONFIG_DM_WRITECACHE is not set
+CONFIG_DM_WRITECACHE=m
 # CONFIG_DM_ERA is not set
 # CONFIG_DM_MIRROR is not set
 # CONFIG_DM_RAID is not set
@@ -1796,13 +1797,15 @@ CONFIG_NLMON=m
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
 CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_ALACRITECH is not set
+CONFIG_NET_VENDOR_ALACRITECH=y
 CONFIG_NET_VENDOR_ALLWINNER=y
-# CONFIG_SUN4I_EMAC is not set
+CONFIG_SUN4I_EMAC=y
 # CONFIG_ALTERA_TSE is not set
-# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_NET_VENDOR_AMAZON=y
-# CONFIG_NET_VENDOR_AMD is not set
+CONFIG_NET_VENDOR_AMD=y
-# CONFIG_NET_VENDOR_AQUANTIA is not set
+CONFIG_AMD_XGBE=m
+# CONFIG_AMD_XGBE_DCB is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_AURORA is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
@@ -1810,8 +1813,16 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_GEMINI_ETHERNET is not set
 # CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
+CONFIG_NET_VENDOR_EZCHIP=y
-# CONFIG_NET_VENDOR_HISILICON is not set
+# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_HISILICON=y
+# CONFIG_HIX5HD2_GMAC is not set
+# CONFIG_HISI_FEMAC is not set
+CONFIG_HIP04_ETH=m
+CONFIG_HNS_MDIO=m
+# CONFIG_HNS is not set
+# CONFIG_HNS_DSAF is not set
+# CONFIG_HNS_ENET is not set
 CONFIG_NET_VENDOR_HUAWEI=y
 # CONFIG_NET_VENDOR_INTEL is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
@@ -1860,10 +1871,9 @@ CONFIG_MDIO_BUS_MUX=y
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MSCC_MIIM=m
-# CONFIG_MDIO_MSCC_MIIM is not set
 # CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_SUN4I is not set
+CONFIG_MDIO_SUN4I=y
 CONFIG_PHYLINK=m
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
@@ -1872,41 +1882,42 @@ CONFIG_LED_TRIGGER_PHY=y
 #
 # MII PHY device drivers
 #
-CONFIG_SFP=m
+# CONFIG_SFP is not set
-# CONFIG_AMD_PHY is not set
+CONFIG_AMD_PHY=m
-# CONFIG_AQUANTIA_PHY is not set
+CONFIG_AQUANTIA_PHY=m
-CONFIG_ASIX_PHY=m
+# CONFIG_ASIX_PHY is not set
-# CONFIG_AT803X_PHY is not set
+CONFIG_AT803X_PHY=m
 # CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
+CONFIG_BCM87XX_PHY=m
-# CONFIG_BROADCOM_PHY is not set
+CONFIG_BCM_NET_PHYLIB=m
-# CONFIG_CICADA_PHY is not set
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
 # CONFIG_CORTINA_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
+CONFIG_DAVICOM_PHY=m
 # CONFIG_DP83822_PHY is not set
 CONFIG_DP83TC811_PHY=m
-# CONFIG_DP83848_PHY is not set
+CONFIG_DP83848_PHY=m
 # CONFIG_DP83867_PHY is not set
 CONFIG_FIXED_PHY=y
-# CONFIG_ICPLUS_PHY is not set
+CONFIG_ICPLUS_PHY=m
 # CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_LSI_ET1011C_PHY is not set
+CONFIG_LSI_ET1011C_PHY=m
-# CONFIG_LXT_PHY is not set
+CONFIG_LXT_PHY=m
-# CONFIG_MARVELL_PHY is not set
+CONFIG_MARVELL_PHY=m
 # CONFIG_MARVELL_10G_PHY is not set
-# CONFIG_MICREL_PHY is not set
+CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROSEMI_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
+CONFIG_NATIONAL_PHY=m
-# CONFIG_QSEMI_PHY is not set
+CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=y
+CONFIG_REALTEK_PHY=m
 # CONFIG_RENESAS_PHY is not set
-CONFIG_ROCKCHIP_PHY=m
+# CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_SMSC_PHY is not set
+CONFIG_SMSC_PHY=m
-# CONFIG_STE10XP is not set
+CONFIG_STE10XP=m
-# CONFIG_TERANETICS_PHY is not set
+CONFIG_TERANETICS_PHY=m
-# CONFIG_VITESSE_PHY is not set
+CONFIG_VITESSE_PHY=m
 # CONFIG_XILINX_GMII2RGMII is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_PPP=m
@@ -1922,7 +1933,7 @@ CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
-CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
@@ -1967,6 +1978,7 @@ CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
 CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_RTL8189ES=m
 CONFIG_ATH_COMMON=m
 CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
@@ -1995,6 +2007,7 @@ CONFIG_ATH10K_USB=m
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_DEBUGFS is not set
 # CONFIG_WCN36XX is not set
+CONFIG_RTL8188EU=m
 # CONFIG_WLAN_VENDOR_ATMEL is not set
 CONFIG_WLAN_VENDOR_BROADCOM=y
 CONFIG_B43=m
@@ -2032,6 +2045,8 @@ CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_WLAN_VENDOR_INTEL is not set
 # CONFIG_WLAN_VENDOR_INTERSIL is not set
 # CONFIG_WLAN_VENDOR_MARVELL is not set
+CONFIG_RTL8812AU=m
+CONFIG_RTL8814AU=m
 CONFIG_WLAN_VENDOR_MEDIATEK=y
 CONFIG_MT7601U=m
 CONFIG_WLAN_VENDOR_RALINK=y
@@ -2055,6 +2070,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
+CONFIG_RTL8189FS=m
 CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
 CONFIG_RTL8XXXU=m
@@ -2062,6 +2078,7 @@ CONFIG_RTL8XXXU_UNTESTED=y
 # CONFIG_WLAN_VENDOR_RSI is not set
 # CONFIG_WLAN_VENDOR_ST is not set
 # CONFIG_WLAN_VENDOR_TI is not set
+# CONFIG_WLAN_VENDOR_XRADIO is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 # CONFIG_MAC80211_HWSIM is not set
@@ -2516,6 +2533,7 @@ CONFIG_PINCTRL_SUN50I_H6_R=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_GENERIC=y
 
@@ -2784,9 +2802,9 @@ CONFIG_THERMAL=m
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE=y
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
@@ -2805,7 +2823,7 @@ CONFIG_THERMAL_EMULATION=y
 #
 CONFIG_SUN50I_H6_THS=m
 # CONFIG_QCOM_SPMI_TEMP_ALARM is not set
-# CONFIG_GENERIC_ADC_THERMAL is not set
+CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -2816,11 +2834,11 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
-# CONFIG_GPIO_WATCHDOG is not set
+CONFIG_GPIO_WATCHDOG=m
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_ARM_SP805_WATCHDOG is not set
+CONFIG_ARM_SP805_WATCHDOG=m
-# CONFIG_ARM_SBSA_WATCHDOG is not set
+CONFIG_ARM_SBSA_WATCHDOG=m
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_SUNXI_WATCHDOG=y
@@ -2993,7 +3011,7 @@ CONFIG_REGULATOR_SY8106A=m
 # CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_REGULATOR_VCTRL is not set
-CONFIG_CEC_CORE=m
+CONFIG_CEC_CORE=y
 CONFIG_CEC_NOTIFIER=y
 CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=m
@@ -3017,7 +3035,7 @@ CONFIG_RC_DEVICES=y
 CONFIG_IR_IMON_RAW=m
 # CONFIG_IR_MCEUSB is not set
 # CONFIG_IR_REDRAT3 is not set
-# CONFIG_IR_SPI is not set
+CONFIG_IR_SPI=m
 # CONFIG_IR_STREAMZAP is not set
 # CONFIG_IR_IGORPLUGUSB is not set
 # CONFIG_IR_IGUANA is not set
@@ -3040,7 +3058,6 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 # CONFIG_MEDIA_CEC_SUPPORT is not set
-# CONFIG_MEDIA_CEC_RC is not set
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
@@ -3230,6 +3247,7 @@ CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_XILINX=m
 CONFIG_VIDEO_XILINX_TPG=m
 CONFIG_VIDEO_XILINX_VTC=m
+CONFIG_VIDEO_SUN6I_CSI=m
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 CONFIG_DVB_PLATFORM_DRIVERS=y
@@ -3529,7 +3547,7 @@ CONFIG_DRM_KMS_CMA_HELPER=y
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_SIL164 is not set
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+CONFIG_DRM_I2C_NXP_TDA9950=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_MALI_DISPLAY is not set
 
@@ -3544,13 +3562,13 @@ CONFIG_DRM_KMS_CMA_HELPER=y
 # CONFIG_DRM_UDL is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_RCAR_LVDS=m
-CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I=y
-CONFIG_DRM_SUN4I_HDMI=m
+CONFIG_DRM_SUN4I_HDMI=y
 CONFIG_DRM_SUN4I_HDMI_CEC=y
-CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN4I_BACKEND=y
 CONFIG_DRM_SUN6I_DSI=m
-CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_MIXER=y
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_PANEL=y
 
@@ -3562,19 +3580,19 @@ CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+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_ORISETECH_OTM8009A is not set
+CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
-# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
-# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
-# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
-# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
-# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -3583,7 +3601,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
-# CONFIG_DRM_CDNS_DSI is not set
+CONFIG_DRM_CDNS_DSI=m
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_LVDS_ENCODER is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -3592,11 +3610,11 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
+CONFIG_DRM_THINE_THC63LVD1024=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
-CONFIG_DRM_DW_HDMI=m
+CONFIG_DRM_DW_HDMI=y
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
@@ -3657,7 +3675,7 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_AMS369FG06 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_HX8357 is not set
-# CONFIG_LCD_OTM3225A is not set
+CONFIG_LCD_OTM3225A=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PWM=m
@@ -3682,10 +3700,14 @@ CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
-CONFIG_SOUND=y
+# CONFIG_LOGO_LINUX_MONO is not set
-CONFIG_SND=y
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+CONFIG_LOGO_ARMBIAN_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_PCM_ELD=y
@@ -3837,7 +3859,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
-# CONFIG_SND_SOC_SSM2305 is not set
+CONFIG_SND_SOC_SSM2305=m
 # CONFIG_SND_SOC_SSM2602_SPI is not set
 # CONFIG_SND_SOC_SSM2602_I2C is not set
 # CONFIG_SND_SOC_SSM4567 is not set
@@ -3860,7 +3882,7 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 # CONFIG_SND_SOC_TSCS42XX is not set
-# CONFIG_SND_SOC_TSCS454 is not set
+CONFIG_SND_SOC_TSCS454=m
 # CONFIG_SND_SOC_WM8510 is not set
 # CONFIG_SND_SOC_WM8523 is not set
 CONFIG_SND_SOC_WM8524=m
@@ -3874,7 +3896,7 @@ CONFIG_SND_SOC_WM8524=m
 # CONFIG_SND_SOC_WM8753 is not set
 # CONFIG_SND_SOC_WM8770 is not set
 # CONFIG_SND_SOC_WM8776 is not set
-# CONFIG_SND_SOC_WM8782 is not set
+CONFIG_SND_SOC_WM8782=m
 # CONFIG_SND_SOC_WM8804_I2C is not set
 # CONFIG_SND_SOC_WM8804_SPI is not set
 # CONFIG_SND_SOC_WM8903 is not set
@@ -3908,92 +3930,107 @@ CONFIG_HID_GENERIC=y
 #
 # Special HID drivers
 #
-# CONFIG_HID_A4TECH is not set
+CONFIG_HID_A4TECH=m
-# CONFIG_HID_ACCUTOUCH is not set
+CONFIG_HID_ACCUTOUCH=m
-# CONFIG_HID_ACRUX is not set
+CONFIG_HID_ACRUX=m
-# CONFIG_HID_APPLE is not set
+CONFIG_HID_ACRUX_FF=y
-# CONFIG_HID_APPLEIR is not set
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
 # CONFIG_HID_ASUS is not set
-# CONFIG_HID_AUREAL is not set
+CONFIG_HID_AUREAL=m
-# CONFIG_HID_BELKIN is not set
+CONFIG_HID_BELKIN=m
-# CONFIG_HID_BETOP_FF is not set
+CONFIG_HID_BETOP_FF=m
-# CONFIG_HID_CHERRY is not set
+CONFIG_HID_CHERRY=m
-# CONFIG_HID_CHICONY is not set
+CONFIG_HID_CHICONY=m
-# CONFIG_HID_CORSAIR is not set
+CONFIG_HID_CORSAIR=m
-# CONFIG_HID_PRODIKEYS is not set
+CONFIG_HID_PRODIKEYS=m
 # CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CP2112 is not set
+CONFIG_HID_CP2112=m
-# CONFIG_HID_CYPRESS is not set
+CONFIG_HID_CYPRESS=m
-# CONFIG_HID_DRAGONRISE is not set
+CONFIG_HID_DRAGONRISE=m
-# CONFIG_HID_EMS_FF is not set
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELAN=m
-# CONFIG_HID_ELECOM is not set
+CONFIG_HID_ELECOM=m
-# CONFIG_HID_ELO is not set
+CONFIG_HID_ELO=m
-# CONFIG_HID_EZKEY is not set
+CONFIG_HID_EZKEY=m
-# CONFIG_HID_GEMBIRD is not set
+CONFIG_HID_GEMBIRD=m
-# CONFIG_HID_GFRM is not set
+CONFIG_HID_GFRM=m
-# CONFIG_HID_HOLTEK is not set
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
 CONFIG_HID_GOOGLE_HAMMER=m
-# CONFIG_HID_GT683R is not set
+CONFIG_HID_GT683R=m
-# CONFIG_HID_KEYTOUCH is not set
+CONFIG_HID_KEYTOUCH=m
-# CONFIG_HID_KYE is not set
+CONFIG_HID_KYE=m
-# CONFIG_HID_UCLOGIC is not set
+CONFIG_HID_UCLOGIC=m
-# CONFIG_HID_WALTOP is not set
+CONFIG_HID_WALTOP=m
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_GYRATION=m
-# CONFIG_HID_ICADE is not set
+CONFIG_HID_ICADE=m
-CONFIG_HID_ITE=y
+# CONFIG_HID_ITE is not set
 # CONFIG_HID_JABRA is not set
-# CONFIG_HID_TWINHAN is not set
+CONFIG_HID_TWINHAN=m
-# CONFIG_HID_KENSINGTON is not set
+CONFIG_HID_KENSINGTON=m
-# CONFIG_HID_LCPOWER is not set
+CONFIG_HID_LCPOWER=m
-# CONFIG_HID_LED is not set
+CONFIG_HID_LED=m
-# CONFIG_HID_LENOVO is not set
+CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=y
+CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=y
+CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=y
+CONFIG_HID_LOGITECH_HIDPP=m
-# CONFIG_LOGITECH_FF is not set
+CONFIG_LOGITECH_FF=y
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
+CONFIG_LOGIRUMBLEPAD2_FF=y
-# CONFIG_LOGIG940_FF is not set
+CONFIG_LOGIG940_FF=y
-# CONFIG_LOGIWHEELS_FF is not set
+CONFIG_LOGIWHEELS_FF=y
-# CONFIG_HID_MAGICMOUSE is not set
+CONFIG_HID_MAGICMOUSE=m
 # CONFIG_HID_MAYFLASH is not set
-CONFIG_HID_REDRAGON=y
+CONFIG_HID_REDRAGON=m
-# CONFIG_HID_MICROSOFT is not set
+CONFIG_HID_MICROSOFT=m
-# CONFIG_HID_MONTEREY is not set
+CONFIG_HID_MONTEREY=m
-# CONFIG_HID_MULTITOUCH is not set
+CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NTI is not set
+CONFIG_HID_NTI=m
-# CONFIG_HID_NTRIG is not set
+CONFIG_HID_NTRIG=m
-# CONFIG_HID_ORTEK is not set
+CONFIG_HID_ORTEK=m
-# CONFIG_HID_PANTHERLORD is not set
+CONFIG_HID_PANTHERLORD=m
-# CONFIG_HID_PENMOUNT is not set
+CONFIG_PANTHERLORD_FF=y
-# CONFIG_HID_PETALYNX is not set
+CONFIG_HID_PENMOUNT=m
-# CONFIG_HID_PICOLCD is not set
+CONFIG_HID_PETALYNX=m
-# CONFIG_HID_PLANTRONICS is not set
+CONFIG_HID_PICOLCD=m
-# CONFIG_HID_PRIMAX is not set
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
 # CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
+CONFIG_HID_ROCCAT=m
-# CONFIG_HID_SAITEK is not set
+CONFIG_HID_SAITEK=m
-# CONFIG_HID_SAMSUNG is not set
+CONFIG_HID_SAMSUNG=m
-# CONFIG_HID_SONY is not set
+CONFIG_HID_SONY=m
-# CONFIG_HID_SPEEDLINK is not set
+CONFIG_SONY_FF=y
-# CONFIG_HID_STEAM is not set
+CONFIG_HID_SPEEDLINK=m
-# CONFIG_HID_STEELSERIES is not set
+CONFIG_HID_STEAM=m
-# CONFIG_HID_SUNPLUS is not set
+CONFIG_HID_STEELSERIES=m
-# CONFIG_HID_RMI is not set
+CONFIG_HID_SUNPLUS=m
-# CONFIG_HID_GREENASIA is not set
+CONFIG_HID_RMI=m
-# CONFIG_HID_SMARTJOYPLUS is not set
+CONFIG_HID_GREENASIA=m
-# CONFIG_HID_TIVO is not set
+CONFIG_GREENASIA_FF=y
-# CONFIG_HID_TOPSEED is not set
+CONFIG_HID_SMARTJOYPLUS=m
-# CONFIG_HID_THINGM is not set
+CONFIG_SMARTJOYPLUS_FF=y
-# CONFIG_HID_THRUSTMASTER is not set
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
 # CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_WACOM is not set
+CONFIG_HID_WACOM=m
-# CONFIG_HID_WIIMOTE is not set
+CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XINMO is not set
+CONFIG_HID_XINMO=m
-# CONFIG_HID_ZEROPLUS is not set
+CONFIG_HID_ZEROPLUS=m
-# CONFIG_HID_ZYDACRON is not set
+CONFIG_ZEROPLUS_FF=y
-# CONFIG_HID_SENSOR_HUB is not set
+CONFIG_HID_ZYDACRON=m
-# CONFIG_HID_ALPS is not set
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
 
 #
 # USB HID support
@@ -4005,7 +4042,7 @@ CONFIG_USB_HIDDEV=y
 #
 # I2C HID support
 #
-# CONFIG_I2C_HID is not set
+CONFIG_I2C_HID=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -4212,7 +4249,7 @@ CONFIG_USB_SERIAL_DEBUG=m
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_YUREX is not set
 CONFIG_USB_EZUSB_FX2=m
-# CONFIG_USB_HUB_USB251XB is not set
+CONFIG_USB_HUB_USB251XB=m
 # CONFIG_USB_HSIC_USB3503 is not set
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
@@ -4274,7 +4311,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SPI=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_PLTFM=y
-# CONFIG_MMC_DW_BLUEFIELD is not set
+CONFIG_MMC_DW_BLUEFIELD=m
 CONFIG_MMC_DW_EXYNOS=y
 CONFIG_MMC_DW_HI3798CV200=m
 CONFIG_MMC_DW_K3=y
@@ -4297,7 +4334,7 @@ CONFIG_LEDS_CLASS=y
 #
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
-# CONFIG_LEDS_CR0014114 is not set
+CONFIG_LEDS_CR0014114=m
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LM3642 is not set
 CONFIG_LEDS_LM3692X=m
@@ -4314,7 +4351,7 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_PWM=m
-# CONFIG_LEDS_REGULATOR is not set
+CONFIG_LEDS_REGULATOR=m
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
 # CONFIG_LEDS_TCA6507 is not set
@@ -4335,24 +4372,24 @@ CONFIG_LEDS_USER=y
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
-# CONFIG_LEDS_TRIGGER_TIMER is not set
+CONFIG_LEDS_TRIGGER_TIMER=m
-# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+CONFIG_LEDS_TRIGGER_ONESHOT=m
-# CONFIG_LEDS_TRIGGER_DISK is not set
+CONFIG_LEDS_TRIGGER_DISK=y
-# CONFIG_LEDS_TRIGGER_MTD is not set
+CONFIG_LEDS_TRIGGER_MTD=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_ACTIVITY=m
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
-# CONFIG_LEDS_TRIGGER_GPIO is not set
+CONFIG_LEDS_TRIGGER_GPIO=m
-# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
-# CONFIG_LEDS_TRIGGER_CAMERA is not set
+CONFIG_LEDS_TRIGGER_CAMERA=m
-# CONFIG_LEDS_TRIGGER_PANIC is not set
+CONFIG_LEDS_TRIGGER_PANIC=y
-# CONFIG_LEDS_TRIGGER_NETDEV is not set
+CONFIG_LEDS_TRIGGER_NETDEV=m
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
@@ -4619,7 +4656,7 @@ CONFIG_FB_TFT_PCD8544=m
 CONFIG_FB_TFT_RA8875=m
 CONFIG_FB_TFT_S6D02A1=m
 CONFIG_FB_TFT_S6D1121=m
-# CONFIG_FB_TFT_SH1106 is not set
+CONFIG_FB_TFT_SH1106=m
 CONFIG_FB_TFT_SSD1289=m
 CONFIG_FB_TFT_SSD1305=m
 CONFIG_FB_TFT_SSD1306=m
@@ -4637,7 +4674,14 @@ CONFIG_FB_FLEX=m
 CONFIG_FB_TFT_FBTFT_DEVICE=m
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
-# CONFIG_MOST is not set
+CONFIG_MOST=m
+# CONFIG_MOST_CDEV is not set
+# CONFIG_MOST_NET is not set
+# CONFIG_MOST_SOUND is not set
+# CONFIG_MOST_VIDEO is not set
+# CONFIG_MOST_DIM2 is not set
+# CONFIG_MOST_I2C is not set
+# CONFIG_MOST_USB is not set
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
 
@@ -4788,6 +4832,7 @@ CONFIG_IIO_BUFFER=y
 CONFIG_IIO_BUFFER_CB=m
 # CONFIG_IIO_BUFFER_HW_CONSUMER is not set
 CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_CONFIGFS=m
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
@@ -4809,6 +4854,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
 # CONFIG_DMARD10 is not set
+CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_KXSD9 is not set
@@ -4895,6 +4941,8 @@ CONFIG_SUN4I_GPADC=m
 #
 # Hid Sensor IIO Common
 #
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
 
 #
 # SSP Sensor Common
@@ -4919,8 +4967,9 @@ CONFIG_SUN4I_GPADC=m
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
 # CONFIG_LTC2632 is not set
-# CONFIG_AD5686_SPI is not set
+CONFIG_AD5686=m
-# CONFIG_AD5696_I2C is not set
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
 # CONFIG_AD5755 is not set
 # CONFIG_AD5761 is not set
 # CONFIG_AD5764 is not set
@@ -4935,7 +4984,7 @@ CONFIG_SUN4I_GPADC=m
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
 # CONFIG_TI_DAC082S085 is not set
-# CONFIG_TI_DAC5571 is not set
+CONFIG_TI_DAC5571=m
 # CONFIG_VF610_DAC is not set
 
 #
@@ -4965,6 +5014,7 @@ CONFIG_SUN4I_GPADC=m
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
+CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
@@ -4987,6 +5037,7 @@ CONFIG_SUN4I_GPADC=m
 # CONFIG_AM2315 is not set
 # CONFIG_DHT11 is not set
 # CONFIG_HDC100X is not set
+CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
@@ -5022,6 +5073,8 @@ CONFIG_SUN4I_GPADC=m
 # CONFIG_SENSORS_ISL29018 is not set
 # CONFIG_SENSORS_ISL29028 is not set
 # CONFIG_ISL29125 is not set
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
 # CONFIG_JSA1212 is not set
 # CONFIG_RPR0521 is not set
 # CONFIG_LTR501 is not set
@@ -5036,7 +5089,7 @@ CONFIG_LV0104CS=m
 # CONFIG_TCS3472 is not set
 # CONFIG_SENSORS_TSL2563 is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL4531 is not set
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
@@ -5053,6 +5106,7 @@ CONFIG_LV0104CS=m
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 # CONFIG_MMC35240 is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
@@ -5066,6 +5120,8 @@ CONFIG_LV0104CS=m
 #
 # Inclinometer sensors
 #
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 
 #
 # Triggers - standalone
@@ -5095,6 +5151,7 @@ CONFIG_MCP4018=m
 #
 # CONFIG_ABP060MG is not set
 # CONFIG_BMP280 is not set
+CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
 # CONFIG_MPL115_SPI is not set
@@ -5129,6 +5186,7 @@ CONFIG_MCP4018=m
 # Temperature sensors
 #
 # CONFIG_MAXIM_THERMOCOUPLE is not set
+CONFIG_HID_SENSOR_TEMP=m
 # CONFIG_MLX90614 is not set
 CONFIG_MLX90632=m
 # CONFIG_TMP006 is not set
@@ -5594,7 +5652,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
-CONFIG_TEST_OVERFLOW=m
+# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_LKM is not set
@@ -5712,11 +5770,11 @@ CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=y
 # CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-# CONFIG_CRYPTO_AEGIS128 is not set
+CONFIG_CRYPTO_AEGIS128=m
-# CONFIG_CRYPTO_AEGIS128L is not set
+CONFIG_CRYPTO_AEGIS128L=m
-# CONFIG_CRYPTO_AEGIS256 is not set
+CONFIG_CRYPTO_AEGIS256=m
-# CONFIG_CRYPTO_MORUS640 is not set
+CONFIG_CRYPTO_MORUS640=m
-# CONFIG_CRYPTO_MORUS1280 is not set
+CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=y
 
@@ -5783,7 +5841,7 @@ CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_CHACHA20=y
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SERPENT=y
-# CONFIG_CRYPTO_SM4 is not set
+CONFIG_CRYPTO_SM4=m
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_TEA is not set
 CONFIG_CRYPTO_TWOFISH=y
@@ -5797,7 +5855,7 @@ CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_LZ4HC=y
-# CONFIG_CRYPTO_ZSTD is not set
+CONFIG_CRYPTO_ZSTD=m
 
 #
 # Random Number Generation
@@ -5839,7 +5897,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 # CONFIG_CRYPTO_SHA512_ARM64_CE is not set
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
 # CONFIG_CRYPTO_SM3_ARM64_CE is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
+CONFIG_CRYPTO_SM4_ARM64_CE=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_CRC32_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64=y

config/sources/rockchip.conf

@@ -33,7 +33,7 @@ case $BRANCH in
 
 	dev)
 	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
-	KERNELBRANCH='branch:master'
+	KERNELBRANCH='branch:linux-4.18.y'
 	KERNELDIR=$MAINLINE_KERNEL_DIR
 
 	KERNEL_USE_GCC='> 7.0'

config/sources/sun50iw6.conf

@@ -27,7 +27,7 @@ BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
 case $BRANCH in
 	next)
 	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
-	KERNELBRANCH='branch:linux-4.17.y'
+	KERNELBRANCH='branch:linux-4.18.y'
 	KERNELDIR=$MAINLINE_KERNEL_DIR
 	KERNEL_USE_GCC='> 7.0'
 	KERNELPATCHDIR='sunxi-next'

config/sources/sun8i.conf

@@ -16,10 +16,6 @@ case $BRANCH in
 	;;
 
 	dev)
-	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
-	KERNELBRANCH='branch:linux-4.17.y'
-	KERNELDIR=$MAINLINE_KERNEL_DIR
-
 	GOVERNOR=ondemand
 
 	ASOUND_STATE='asound.state.sun8i-dev'

config/sources/sunxi64_common.inc

@@ -30,7 +30,7 @@ case $BRANCH in
 		ATF_TARGET_MAP='PLAT=sun50iw1p1 DEBUG=1 bl31;;build/sun50iw1p1/debug/bl31.bin'
 
 		KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
-		KERNELBRANCH='branch:linux-4.17.y'
+		KERNELBRANCH='branch:linux-4.14.y'
 		KERNELDIR=$MAINLINE_KERNEL_DIR
 		KERNEL_USE_GCC='> 7.0'
 		KERNELPATCHDIR='sunxi-next'
@@ -46,7 +46,7 @@ case $BRANCH in
 		ATF_TARGET_MAP='PLAT=sun50iw1p1 DEBUG=1 bl31;;build/sun50iw1p1/debug/bl31.bin'
 
 		KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
-		KERNELBRANCH='branch:master'
+		KERNELBRANCH='branch:linux-4.18.y'
 		KERNELDIR=$MAINLINE_KERNEL_DIR
 		KERNEL_USE_GCC='> 7.0'
 		KERNELPATCHDIR='sunxi-dev'

config/sources/sunxi_common.inc

@@ -27,7 +27,7 @@ case $BRANCH in
 	next)
 
 		KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
-		KERNELBRANCH='branch:linux-4.17.y'
+		KERNELBRANCH='branch:linux-4.14.y'
 		KERNELDIR=$MAINLINE_KERNEL_DIR
 
 		KERNEL_USE_GCC='> 7.0'
@@ -37,7 +37,7 @@ case $BRANCH in
 	dev)
 
 		KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
-		KERNELBRANCH='branch:master'
+		KERNELBRANCH='branch:linux-4.18.y'
 		KERNELDIR=$MAINLINE_KERNEL_DIR
 
 		KERNEL_USE_GCC='> 7.0'

patch/kernel/sunxi-dev/board-h2plus-nanopi-duo-add-device.patch

@@ -1,15 +1,15 @@
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index e3d5a6c..7cd0b4e 100644
+index 27440439..47f4946d 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -992,6 +992,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
+@@ -1008,6 +1008,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
- 	sun8i-a83t-bananapi-m3.dtb \
- 	sun8i-a83t-cubietruck-plus.dtb \
  	sun8i-a83t-tbs-a711.dtb \
+ 	sun8i-h2-plus-bananapi-m2-zero.dtb \
+ 	sun8i-h2-plus-libretech-all-h3-cc.dtb \
 +	sun8i-h2-plus-nanopi-duo.dtb \
  	sun8i-h2-plus-orangepi-r1.dtb \
- 	sun8i-h2-plus-bananapi-m2-zero.dtb \
  	sun8i-h2-plus-orangepi-zero.dtb \
+ 	sun8i-h2-plus-sunvell-r69.dtb \
 diff --git a/arch/arm/boot/dts/sun8i-h2-plus-nanopi-duo.dts b/arch/arm/boot/dts/sun8i-h2-plus-nanopi-duo.dts
 new file mode 100644
 index 0000000..040f99f
@@ -103,9 +103,9 @@ index 0000000..040f99f
 +
 +	wifi_pwrseq: wifi_pwrseq {
 +		compatible = "mmc-pwrseq-simple";
-+		pinctrl-names = "default"; 
++		pinctrl-names = "default";
-+		pinctrl-0 = <&wifi_en_npi>; 
++		pinctrl-0 = <&wifi_en_npi>;
-+		reset-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>;  // PG13 WL_RESTN 
++		reset-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>;  // PG13 WL_RESTN
 +		post-power-on-delay-ms = <50>;
 +	};
 +};

patch/kernel/sunxi-dev/board-h3-address-some-stability-issues.patch

@@ -0,0 +1,151 @@
+From 8477a566b36aaae77e53a9949f963ce6ebad55fe Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman <megous@megous.com>
+Date: Thu, 12 Jan 2017 16:34:57 +0100
+Subject: [PATCH] clk: sunxi-ng: Set maximum M = 1 for H3 pll-cpux clock
+
+When using M factor greater than 1 system is experiencing
+occasional lockups.
+
+This change was verified to fix lockups with PLL stress
+tester available at https://github.com/megous/h3-firmware.
+
+Note that M factor must not be used outside the kernel
+either, so for example u-boot needs a similar patch.
+---
+ drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c
+index 77ed0b0ba6819..8d47742def49d 100644
+--- a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c
++++ b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c
+@@ -30,15 +30,21 @@
+ 
+ #include "ccu-sun8i-h3.h"
+ 
+-static SUNXI_CCU_NKMP_WITH_GATE_LOCK(pll_cpux_clk, "pll-cpux",
+-				     "osc24M", 0x000,
+-				     8, 5,	/* N */
+-				     4, 2,	/* K */
+-				     0, 2,	/* M */
+-				     16, 2,	/* P */
+-				     BIT(31),	/* gate */
+-				     BIT(28),	/* lock */
+-				     CLK_SET_RATE_UNGATE);
++static struct ccu_nkmp pll_cpux_clk = {
++	.enable		= BIT(31),
++	.lock		= BIT(28),
++	.n		= _SUNXI_CCU_MULT(8, 5),
++	.k		= _SUNXI_CCU_MULT(4, 2),
++	.m		= _SUNXI_CCU_DIV_MAX(0, 2, 1),
++	.p		= _SUNXI_CCU_DIV(16, 2),
++	.common		= {
++		.reg		= 0x000,
++		.hw.init	= CLK_HW_INIT("pll-cpux",
++					      "osc24M",
++					      &ccu_nkmp_ops,
++					      CLK_SET_RATE_UNGATE),
++	},
++};
+ 
+ /*
+  * The Audio PLL is supposed to have 4 outputs: 3 fixed factors from
+From c313a0ac340bf1131d475527171764dc49901895 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman <megous@megous.com>
+Date: Wed, 5 Apr 2017 15:43:48 +0200
+Subject: [PATCH] clk: sunxi-ng: Limit pll_cpux P factor for rates > 288MHz on
+ H3
+
+Datasheet for H3 mandates that CPUX PLL must not use postdivider
+(P factor must be 1) for clock rates above 288MHz.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c
+index 8d47742def49d..7cc9467f373f2 100644
+--- a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c
++++ b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c
+@@ -37,6 +37,7 @@ static struct ccu_nkmp pll_cpux_clk = {
+ 	.k		= _SUNXI_CCU_MULT(4, 2),
+ 	.m		= _SUNXI_CCU_DIV_MAX(0, 2, 1),
+ 	.p		= _SUNXI_CCU_DIV(16, 2),
++	.max_rate_for_p	= 288000000,
+ 	.common		= {
+ 		.reg		= 0x000,
+ 		.hw.init	= CLK_HW_INIT("pll-cpux",
+From f07a20e4ce93e7e0f333f9f6e57f14fd4ab66abd Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman <megous@megous.com>
+Date: Thu, 12 Jan 2017 16:37:24 +0100
+Subject: [PATCH] clk: sunxi-ng: Allow to limit the use of NKMP clock's P
+ factor
+
+Some SoCs mandate the maximum clock rate for which the use
+of postdivider P factor is allowed. Allow to configure maximum
+clock rate.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/clk/sunxi-ng/ccu_nkmp.c | 13 ++++++++-----
+ drivers/clk/sunxi-ng/ccu_nkmp.h |  1 +
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.c b/drivers/clk/sunxi-ng/ccu_nkmp.c
+index ebd9436d2c7cd..96dbc543b2cbc 100644
+--- a/drivers/clk/sunxi-ng/ccu_nkmp.c
++++ b/drivers/clk/sunxi-ng/ccu_nkmp.c
+@@ -33,16 +33,19 @@ static unsigned long ccu_nkmp_calc_rate(unsigned long parent,
+ }
+ 
+ static void ccu_nkmp_find_best(unsigned long parent, unsigned long rate,
+-			       struct _ccu_nkmp *nkmp)
++			       struct _ccu_nkmp *nkmp, struct ccu_nkmp *_nkmp)
+ {
+ 	unsigned long best_rate = 0;
+ 	unsigned long best_n = 0, best_k = 0, best_m = 0, best_p = 0;
+-	unsigned long _n, _k, _m, _p;
++	unsigned long _n, _k, _m, _p, _max_p;
++
++	_max_p = (_nkmp->max_rate_for_p == 0 || rate <= _nkmp->max_rate_for_p) ?
++		nkmp->max_p : nkmp->min_p;
+ 
+ 	for (_k = nkmp->min_k; _k <= nkmp->max_k; _k++) {
+ 		for (_n = nkmp->min_n; _n <= nkmp->max_n; _n++) {
+ 			for (_m = nkmp->min_m; _m <= nkmp->max_m; _m++) {
+-				for (_p = nkmp->min_p; _p <= nkmp->max_p; _p <<= 1) {
++				for (_p = nkmp->min_p; _p <= _max_p; _p <<= 1) {
+ 					unsigned long tmp_rate;
+ 
+ 					tmp_rate = ccu_nkmp_calc_rate(parent,
+@@ -146,7 +149,7 @@ static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,
+ 	_nkmp.min_p = 1;
+ 	_nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);
+ 
+-	ccu_nkmp_find_best(*parent_rate, rate, &_nkmp);
++	ccu_nkmp_find_best(*parent_rate, rate, &_nkmp, nkmp);
+ 
+ 	rate = ccu_nkmp_calc_rate(*parent_rate, _nkmp.n, _nkmp.k,
+ 				  _nkmp.m, _nkmp.p);
+@@ -177,7 +180,7 @@ static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,
+ 	_nkmp.min_p = 1;
+ 	_nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);
+ 
+-	ccu_nkmp_find_best(parent_rate, rate, &_nkmp);
++	ccu_nkmp_find_best(parent_rate, rate, &_nkmp, nkmp);
+ 
+ 	n_mask = GENMASK(nkmp->n.width + nkmp->n.shift - 1, nkmp->n.shift);
+ 	k_mask = GENMASK(nkmp->k.width + nkmp->k.shift - 1, nkmp->k.shift);
+diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.h b/drivers/clk/sunxi-ng/ccu_nkmp.h
+index 6940503e7fc46..bbea3e5ed6fba 100644
+--- a/drivers/clk/sunxi-ng/ccu_nkmp.h
++++ b/drivers/clk/sunxi-ng/ccu_nkmp.h
+@@ -33,6 +33,7 @@ struct ccu_nkmp {
+ 	struct ccu_mult_internal	k;
+ 	struct ccu_div_internal		m;
+ 	struct ccu_div_internal		p;
++	unsigned long max_rate_for_p;
+ 
+ 	unsigned int		fixed_post_div;
+ 

patch/kernel/sunxi-dev/board-h5-add-0000-nanopi-k1plus.patch

@@ -0,0 +1,397 @@
+From ba9ba2949e86b5a00b0ae89b5e298b4cd46118ee Mon Sep 17 00:00:00 2001
+From: wuweidong <625769020@qq.com>
+Date: Mon, 27 Nov 2017 10:23:51 +0800
+Subject: [PATCH] arm64: dts: sun50i-h5-nanopi: Add a new board NanoPi K1 Plus
+
+---
+ arch/arm64/boot/dts/allwinner/Makefile        |   1 +
+ .../allwinner/sun50i-h5-nanopi-k1-plus.dts    | 555 ++++++++++++++++++
+ 2 files changed, 556 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts
+
+diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
+index c03224962034..eb4494332002 100644
+--- a/arch/arm64/boot/dts/allwinner/Makefile
++++ b/arch/arm64/boot/dts/allwinner/Makefile
+@@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinebook.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb
++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-k1-plus.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts
+new file mode 100644
+index 000000000000..52337a18721f
+--- /dev/null
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts
+@@ -0,0 +1,367 @@
++/*
++ * Copyright (C) 2016 ARM Ltd.
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include "sun50i-h5.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/pinctrl/sun4i-a10.h>
++
++/ {
++	model = "FriendlyElec NanoPi K1 Plus";
++	compatible = "friendlyelec,nanopi-k1-plus", "allwinner,sun50i-h5";
++
++	reg_vcc3v3: vcc3v3 {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++	};
++
++	aliases {
++		ethernet0 = &emac;
++		serial0 = &uart0;
++	};
++
++	chosen {
++		stdout-path = "serial0:115200n8";
++	};
++
++	connector {
++		compatible = "hdmi-connector";
++		type = "a";
++
++		port {
++			hdmi_con_in: endpoint {
++				remote-endpoint = <&hdmi_out_con>;
++			};
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		status {
++			label = "nanopi:blue:status";
++			gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "heartbeat";
++			};
++		pwr {
++			label = "nanopi:green:pwr";
++			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
++		};
++
++	};
++
++	r-gpio-keys {
++		compatible = "gpio-keys";
++
++		sw4 {
++			label = "sw4";
++			linux,code = <BTN_0>;
++			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	reg_gmac_3v3: gmac-3v3 {
++		compatible = "regulator-fixed";
++		pinctrl-names = "default";
++		pinctrl-0 = <&gmac_power_pin_nanopi>;
++		regulator-name = "gmac-3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		startup-delay-us = <100000>;
++		enable-active-high;
++		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
++	};
++
++	reg_usb0_vbus: usb0-vbus {
++		compatible = "regulator-fixed";
++		regulator-name = "usb0-vbus";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		enable-active-high;
++		gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */
++		status = "okay";
++	};
++
++	wifi_pwrseq: wifi_pwrseq {
++        compatible = "mmc-pwrseq-simple";
++        pinctrl-names = "default";
++        pinctrl-0 = <&wifi_en_npi>;
++        reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
++        post-power-on-delay-ms = <200>;
++    };
++
++	rfkill_bt {
++		compatible = "rfkill-gpio";
++		pinctrl-names = "default";
++		pinctrl-0 = <&bt_pwr_pin>;
++		reset-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
++		clocks = <&osc32k>;
++		clock-frequency = <32768>;
++		rfkill-name = "sunxi-bt";
++		rfkill-type = "bluetooth";
++	};
++
++	pcm5102a: pcm5102a-codec {
++        #sound-dai-cells = <0>;
++        compatible = "ti,pcm5102a";
++        status = "disabled";
++    };
++};
++
++&codec {
++	allwinner,audio-routing =
++		"Line Out", "LINEOUT",
++		"MIC1", "Mic",
++		"Mic",  "MBIAS";
++	status = "okay";
++};
++
++&de {
++	status = "okay";
++};
++
++&ehci0 {
++	status = "okay";
++};
++
++&ehci1 {
++	status = "okay";
++};
++
++&ehci2 {
++	status = "okay";
++};
++
++&ehci3 {
++	status = "okay";
++};
++
++&external_mdio {
++	ext_rgmii_phy: ethernet-phy@1 {
++		compatible = "ethernet-phy-ieee802.3-c22";
++		reg = <0>;
++	};
++};
++
++&emac {
++	pinctrl-names = "default";
++	pinctrl-0 = <&emac_rgmii_pins>;
++	phy-supply = <&reg_gmac_3v3>;
++	phy-handle = <&ext_rgmii_phy>;
++	phy-mode = "rgmii";
++	local-mac-address = [ 00 00 00 00 00 00 ];
++	allwinner,leds-active-low;
++	status = "okay";
++};
++
++&ir {
++	pinctrl-names = "default";
++	pinctrl-0 = <&ir_pins_a>;
++	status = "okay";
++};
++
++&mmc0 {
++	vmmc-supply = <&reg_vcc3v3>;
++	bus-width = <4>;
++	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
++	status = "okay";
++};
++
++&mmc1 {
++    vmmc-supply = <&reg_vcc3v3>;
++    vqmmc-supply = <&reg_vcc3v3>;
++    mmc-pwrseq = <&wifi_pwrseq>;
++    bus-width = <4>;
++    non-removable;
++    status = "okay";
++    brcmf: bcrmf@1 {
++        reg = <1>;
++        compatible = "brcm,bcm4329-fmac";
++    };
++};
++
++&mmc2 {
++    vmmc-supply = <&reg_vcc3v3>;
++    bus-width = <8>;
++    non-removable;
++    cap-mmc-hw-reset;
++    boot_device = <0>;
++    status = "okay";
++};
++
++&mmc2_8bit_pins {
++    /* Increase drive strength for DDR modes */
++    drive-strength = <40>;
++    /* eMMC is missing pull-ups */
++    bias-pull-up;
++};
++
++&hdmi {
++	status = "okay";
++};
++
++&hdmi_out {
++	hdmi_out_con: endpoint {
++		remote-endpoint = <&hdmi_con_in>;
++	};
++};
++
++
++&pio {
++	leds_npi: led_pins@0 {
++		pins = "PA10";
++		function = "gpio_out";
++	};
++	gmac_power_pin_nanopi: gmac_power_pin@0 {
++		pins = "PD6";
++		function = "gpio_out";
++	};
++	bt_pwr_pin: bt_pwr_pin@0 {
++		pins = "PG13";
++		function = "gpio_out";
++	};
++	spi0_cs_pins: spi0_cs_pins {
++        pins = "PC3", "PA6";
++        function = "gpio_out";
++    };
++};
++&r_pio {
++	leds_r_npi: led_pins@0 {
++		pins = "PL10";
++		function = "gpio_out";
++	};
++	vdd_cpux_r_npi: regulator_pins@0 {
++		allwinner,pins = "PL6";
++		allwinner,function = "gpio_out";
++		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
++		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
++	};
++	wifi_en_npi: wifi_en_pin {
++        pins = "PL7";
++        function = "gpio_out";
++    };
++};
++&ohci0 {
++	status = "okay";
++};
++
++&ohci1 {
++	status = "okay";
++};
++
++&ohci2 {
++	status = "okay";
++};
++
++&ohci3 {
++	status = "okay";
++};
++
++&spi0 {
++	status = "okay";
++        spi-flash@0 {
++                #address-cells = <1>;
++                #size-cells = <0>;
++                compatible = "jedec,spi-nor";
++                reg = <0>; /* Chip select 0 */
++                spi-max-frequency = <10000000>;
++                status = "okay";
++                partitions {
++                        compatible = "fixed-partitions";
++                        #address-cells = <1>;
++                        #size-cells = <1>;
++                        partition@0 {
++                                label = "uboot";
++                                reg = <0x0 0x100000>;
++                        };
++                        partition@100000 {
++                                label = "env";
++                                reg = <0x100000 0x100000>;
++                        };
++                };
++        };
++};
++
++&uart0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart0_pins_a>;
++	status = "okay";
++};
++
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart1_pins>;
++	status = "disabled";
++};
++
++&uart2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart2_pins>;
++	status = "disabled";
++};
++
++&uart3 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart3_pins>, <&uart3_rts_cts_pins>;
++	status = "okay";
++};
++&usb_otg {
++	dr_mode = "otg";
++	status = "okay";
++};
++
++&usbphy {
++	/* USB Type-A ports' VBUS is always on */
++	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
++	usb0_vbus-supply = <&reg_usb0_vbus>;
++	status = "okay";
++};
++
++&i2s0 {
++	sound-dai = <&pcm5102a>;
++	status = "disabled";
++};
+\ No newline at end of file

patch/kernel/sunxi-dev/board-h5-add-0001-nanopi-neo-core2.patch

@@ -0,0 +1,227 @@
+diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
+index c6fc096..731e2ae 100644
+--- a/arch/arm64/boot/dts/allwinner/Makefile
++++ b/arch/arm64/boot/dts/allwinner/Makefile
+@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-libretech-all-h3-cc.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb
++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-core2.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-k1-plus.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-core2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-core2.dts
+new file mode 100644
+index 0000000..80b6dec
+--- /dev/null
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-core2.dts
+@@ -0,0 +1,209 @@
++/*
++ * Copyright (C) 2017 Antony Antony <antony@phenome.org>
++ * Copyright (C) 2016 ARM Ltd.
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include "sun50i-h5.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/pinctrl/sun4i-a10.h>
++
++/ {
++	model = "FriendlyARM NanoPi NEO Core2";
++	compatible = "friendlyarm,nanopi-neo-core2", "allwinner,sun50i-h5";
++
++	aliases {
++		ethernet0 = &emac;
++		serial0 = &uart0;
++	};
++
++	chosen {
++		stdout-path = "serial0:115200n8";
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		pwr {
++			label = "nanopi:red:pwr";
++			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
++			linux,default-trigger = "default-on";
++		};
++
++		status {
++			label = "nanopi:green:status";
++			gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
++			linux,default-trigger = "heartbeat";
++		};
++	};
++
++	reg_gmac_3v3: gmac-3v3 {
++		compatible = "regulator-fixed";
++		pinctrl-names = "default";
++		regulator-name = "gmac-3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		startup-delay-us = <100000>;
++		enable-active-high;
++		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
++	};
++
++	reg_vcc3v3: vcc3v3 {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++	};
++
++	wifi_pwrseq: wifi_pwrseq {
++		compatible = "mmc-pwrseq-simple";
++		pinctrl-names = "default";
++		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
++		post-power-on-delay-ms = <200>;
++	};
++};
++
++&cpu0 {
++	cpu-supply = <&vdd_cpux>;
++};
++
++&codec {
++	allwinner,audio-routing =
++		"Line Out", "LINEOUT",
++		"MIC1", "Mic",
++		"Mic",  "MBIAS";
++	status = "okay";
++};
++
++&ehci0 {
++	status = "okay";
++};
++
++&ehci3 {
++	status = "okay";
++};
++
++&emac {
++	pinctrl-names = "default";
++	pinctrl-0 = <&emac_rgmii_pins>;
++	phy-supply = <&reg_gmac_3v3>;
++	phy-handle = <&ext_rgmii_phy>;
++	phy-mode = "rgmii";
++	status = "okay";
++};
++
++&external_mdio {
++	ext_rgmii_phy: ethernet-phy@7 {
++		compatible = "ethernet-phy-ieee802.3-c22";
++		reg = <7>;
++	};
++};
++
++&mmc0 {
++	vmmc-supply = <&reg_vcc3v3>;
++	bus-width = <4>;
++	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
++	status = "okay";
++};
++
++&mmc1 {
++	vmmc-supply = <&reg_vcc3v3>;
++	vqmmc-supply = <&reg_vcc3v3>;
++	mmc-pwrseq = <&wifi_pwrseq>;
++	bus-width = <4>;
++	non-removable;
++	status = "okay";
++
++	brcmf: wifi@1 {
++		reg = <1>;
++		compatible = "brcm,bcm4329-fmac";
++	};
++};
++
++&mmc2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc2_8bit_pins>;
++	vmmc-supply = <&reg_vcc3v3>;
++	bus-width = <8>;
++	non-removable;
++	cap-mmc-hw-reset;
++	status = "okay";
++};
++
++&ohci0 {
++	status = "okay";
++};
++
++&ohci3 {
++	status = "okay";
++};
++
++&r_i2c {
++	status = "okay";
++
++	vdd_cpux: regulator@65 {
++		compatible = "silergy,sy8106a";
++		reg = <0x65>;
++		regulator-min-microvolt = <1000000>;
++		regulator-max-microvolt = <1400000>;
++		regulator-ramp-delay = <200>;
++		regulator-boot-on;
++		regulator-always-on;
++	};
++};
++
++&uart0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart0_pins_a>;
++	status = "okay";
++};
++
++&usb_otg {
++	dr_mode = "host";
++	status = "okay";
++};
++
++&usbphy {
++	/* USB Type-A ports' VBUS is always on */
++	status = "okay";
++};

patch/kernel/sunxi-dev/board-h5-add-0003-nanopi-m1-plus2.patch

@@ -0,0 +1,262 @@
+diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
+index 323f30fa..ac1eead4 100644
+--- a/arch/arm64/boot/dts/allwinner/Makefile
++++ b/arch/arm64/boot/dts/allwinner/Makefile
+@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-core2.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-k1-plus.dtb
++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-m1-plus2.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-m1-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-m1-plus2.dts
+new file mode 100644
+index 0000000..a6bf32d
+--- /dev/null
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-m1-plus2.dts
+@@ -0,0 +1,244 @@
++/*
++ * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io>
++ * Copyright (C) 2017 Armbian
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include "sun50i-h5.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++
++/ {
++	model = "FriendlyARM Nanopi M1 Plus 2";
++	compatible = "friendlyarm,nanopi-neo2", "allwinner,sun50i-h5";
++
++	aliases {
++		ethernet0 = &emac;
++		serial0 = &uart0;
++	};
++
++	chosen {
++		stdout-path = "serial0:115200n8";
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		pwr {
++			label = "nanopi:green:pwr";
++			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
++		};
++
++		status {
++			label = "nanopi:blue:status";
++			gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;
++		};
++	};
++
++	reg_gmac_3v3: gmac-3v3 {
++		compatible = "regulator-fixed";
++		regulator-name = "gmac-3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		startup-delay-us = <100000>;
++		enable-active-high;
++		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
++	};
++
++	reg_vcc3v3: vcc3v3 {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++	};
++
++	reg_usb0_vbus: usb0-vbus {
++		compatible = "regulator-fixed";
++		regulator-name = "usb0-vbus";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		enable-active-high;
++		gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */
++		status = "okay";
++	};
++
++	 wifi_pwrseq: wifi_pwrseq {
++        compatible = "mmc-pwrseq-simple";
++        reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */
++        post-power-on-delay-ms = <50>;
++    };
++
++};
++
++&ehci0 {
++	status = "okay";
++};
++
++&ehci1 {
++	status = "okay";
++};
++
++&ehci2 {
++	status = "okay";
++};
++
++&ehci3 {
++	status = "okay";
++};
++
++&emac {
++	pinctrl-names = "default";
++	pinctrl-0 = <&emac_rgmii_pins>;
++	phy-supply = <&reg_gmac_3v3>;
++	phy-handle = <&ext_rgmii_phy>;
++	phy-mode = "rgmii";
++	status = "okay";
++};
++
++&mdio {
++	ext_rgmii_phy: ethernet-phy@7 {
++		compatible = "ethernet-phy-ieee802.3-c22";
++		reg = <7>;
++	};
++};
++
++&mmc0 {
++	vmmc-supply = <&reg_vcc3v3>;
++	bus-width = <4>;
++	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
++	status = "okay";
++};
++
++&mmc1 {
++        vmmc-supply = <&reg_vcc3v3>;
++        vqmmc-supply = <&reg_vcc3v3>;
++        mmc-pwrseq = <&wifi_pwrseq>;
++        bus-width = <4>;
++        non-removable;
++        status = "okay";
++
++        brcmf: brcmf@1 {
++                reg = <1>;
++                compatible = "brcm,bcm4329-fmac";
++                interrupt-parent = <&r_pio>;
++                interrupts = <0 7 IRQ_TYPE_LEVEL_LOW>; /* PL7 / EINT7 */
++                interrupt-names = "host-wake";
++                pinctrl-names = "default";
++                pinctrl-0 = <&wifi_wake>;
++        };
++};
++
++&mmc2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc2_8bit_pins>;
++	vmmc-supply = <&reg_vcc3v3>;
++	bus-width = <8>;
++	non-removable;
++	cap-mmc-hw-reset;
++	status = "okay";
++};
++
++&de {
++	status = "okay";
++};
++
++&ohci0 {
++	status = "okay";
++};
++
++&ohci1 {
++	status = "okay";
++};
++
++&ohci2 {
++	status = "okay";
++};
++
++&ohci3 {
++	status = "okay";
++};
++
++&hdmi {
++	status = "okay";
++};
++
++&mixer0 {
++	status = "okay";
++};
++
++&r_pio {
++	wifi_wake: wifi_wake@0 {
++		pins = "PL7";
++		function = "irq";
++		bias-pull-up;
++	};
++};
++
++&sound_hdmi {
++	status = "okay";
++};
++
++&tcon0 {
++	status = "okay";
++};
++
++&r_i2c {
++	status = "okay";
++};
++
++&uart0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart0_pins_a>;
++	status = "okay";
++};
++
++&usb_otg {
++	dr_mode = "peripheral";
++	status = "okay";
++};
++
++&usbphy {
++	/* USB Type-A port's VBUS is always on */
++	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
++	usb0_vbus-supply = <&reg_usb0_vbus>;
++	status = "okay";
++};

patch/kernel/sunxi-dev/board-h5-orangepi-zero-plus2-onboard-led.patch

@@ -0,0 +1,27 @@
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+index 53c8c116..0a531e55 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+@@ -82,6 +82,22 @@
+ 		reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */
+ 		post-power-on-delay-ms = <200>;
+ 	};
++
++	leds {
++		compatible = "gpio-leds";
++		pwr {
++			label = "orangepi:green:pwr";
++			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
++			default-state = "on";
++			};
++		status {
++			label = "orangepi:red:status";
++			linux,default-trigger = "mmc0";
++			gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */
++			default-state = "on";
++			};
++		};
++
+ };
+ 
+ &de {

patch/kernel/sunxi-dev/board-h6-add-orangepi-one-plus-and-lite2.patch

@@ -255,3 +255,252 @@ index 000000000..385015396
 +	usb1_vbus-supply = <&reg_usb_vbus>;
 +	status = "okay";
 +};
+diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
+index a9797d233..4972f2901
+--- a/arch/arm64/boot/dts/allwinner/Makefile
++++ b/arch/arm64/boot/dts/allwinner/Makefile
+@@ -1,6 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-nanopi-a64.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-olinuxino.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-orangepi-win.dtb
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts
+new file mode 100644
+index 000000000..b9aff606e
+--- /dev/null
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts
+@@ -0,0 +1,231 @@
++// SPDX-License-Identifier: (GPL-2.0+ or MIT)
++/*
++ * Copyright (c) 2017 Icenowy Zheng <icenowy@aosc.io>
++ */
++
++/dts-v1/;
++
++#include "sun50i-h6.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++
++/ {
++	model = "Orange Pi Lite 2";
++	compatible = "pine64,pine-h64", "allwinner,sun50i-h6";
++
++	aliases {
++		serial0 = &uart0;
++	};
++
++	chosen {
++		stdout-path = "serial0:115200n8";
++	};
++
++	reg_vcc3v3: vcc3v3 {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++	};
++
++	reg_vcc1v8: vcc1v8 {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc1v8";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++	};
++
++	reg_usb_vbus: vbus {
++		compatible = "regulator-fixed";
++		regulator-name = "usb-vbus";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		startup-delay-us = <100000>;
++		gpio = <&r_pio 0 5 GPIO_ACTIVE_HIGH>;
++		enable-active-high;
++	};
++};
++
++&cpu0 {
++	cpu-supply = <&reg_dcdca>;
++};
++
++&dwc3 {
++	status = "okay";
++};
++
++&ehci0 {
++	status = "okay";
++};
++
++&ehci3 {
++	status = "okay";
++};
++
++&mmc0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc0_pins>;
++	vmmc-supply = <&reg_vcc3v3>;
++	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
++	bus-width = <4>;
++	status = "okay";
++};
++
++&mmc2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc2_pins>;
++	vmmc-supply = <&reg_vcc3v3>;
++	vqmmc-supply = <&reg_vcc1v8>;
++	non-removable;
++	cap-mmc-hw-reset;
++	bus-width = <8>;
++	status = "okay";
++};
++
++&ohci0 {
++	status = "okay";
++};
++
++&ohci3 {
++	status = "okay";
++};
++
++&r_i2c {
++	pinctrl-names = "default";
++	pinctrl-0 = <&r_i2c_pins>;
++	status = "okay";
++
++	axp805: pmic@36 {
++		compatible = "x-powers,axp805", "x-powers,axp806";
++		reg = <0x36>;
++		interrupt-parent = <&r_intc>;
++		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
++		interrupt-controller;
++		#interrupt-cells = <1>;
++		x-powers,master-mode;
++
++		regulators {
++			reg_aldo1: aldo1 {
++				regulator-always-on;
++				regulator-min-microvolt = <3300000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-name = "vcc-pl";
++			};
++
++			reg_aldo2: aldo2 {
++				regulator-min-microvolt = <3300000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-name = "vcc-ac200";
++			};
++
++			reg_aldo3: aldo3 {
++				/* This regulator is connected with CLDO1 */
++				regulator-always-on;
++				regulator-min-microvolt = <3300000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-name = "vcc-3v3-1";
++			};
++
++			reg_bldo1: bldo1 {
++				regulator-always-on;
++				regulator-min-microvolt = <1800000>;
++				regulator-max-microvolt = <1800000>;
++				regulator-name = "vcc-ddr-bias-pll";
++			};
++
++			reg_bldo2: bldo2 {
++				regulator-always-on;
++				regulator-min-microvolt = <1800000>;
++				regulator-max-microvolt = <1800000>;
++				regulator-name = "vcc-efuse-emmc-pcie-hdmi";
++			};
++
++			reg_bldo3: bldo3 {
++				regulator-min-microvolt = <1800000>;
++				regulator-max-microvolt = <1800000>;
++				regulator-name = "vcc-wifi-io";
++			};
++
++			bldo4 {
++				/* unused */
++			};
++
++			reg_cldo1: cldo1 {
++				/* This regulator is connected with ALDO3 */
++				regulator-always-on;
++				regulator-min-microvolt = <3300000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-name = "vcc-3v3-2";
++			};
++
++			reg_cldo2: cldo2 {
++				regulator-min-microvolt = <3300000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-name = "vcc-wifi-1";
++			};
++
++			reg_cldo3: cldo3 {
++				regulator-min-microvolt = <3300000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-name = "vcc-wifi-2";
++			};
++
++			reg_dcdca: dcdca {
++				regulator-always-on;
++				regulator-min-microvolt = <810000>;
++				regulator-max-microvolt = <1080000>;
++				regulator-name = "vdd-cpu";
++			};
++
++			reg_dcdcc: dcdcc {
++				regulator-min-microvolt = <810000>;
++				regulator-max-microvolt = <1080000>;
++				regulator-name = "vdd-gpu";
++			};
++
++			reg_dcdcd: dcdcd {
++				regulator-always-on;
++				regulator-min-microvolt = <960000>;
++				regulator-max-microvolt = <960000>;
++				regulator-name = "vdd-sys";
++			};
++
++			reg_dcdce: dcdce {
++				regulator-always-on;
++				regulator-min-microvolt = <1400000>;
++				regulator-max-microvolt = <1400000>;
++				regulator-name = "vcc-dram";
++			};
++
++			sw {
++				/* unused */
++			};
++		};
++	};
++};
++
++&uart0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart0_ph_pins>;
++	status = "okay";
++};
++
++&usb2otg {
++	dr_mode = "host";
++	status = "okay";
++};
++
++&usb2phy {
++	usb0_vbus-supply = <&reg_usb_vbus>;
++	usb3_vbus-supply = <&reg_usb_vbus>;
++	status = "okay";
++};
++
++&usb3 {
++	status = "okay";
++};
++
++&usb3phy {
++	phy-supply = <&reg_usb_vbus>;
++	status = "okay";
++};