Update configs for 4.14.96; Add initial Allwinner support to 4.14/4.19/4.20

diff --git a/4.14/arm64 b/4.14/arm64
index 8fcbaeb759238521668b621166f8b73e512aac76..6941183acdd1a40f036b183ebca7b37865cea05d 100644 (file)
--- a/4.14/arm64
+++ b/4.14/arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.94-gnu Kernel Configuration
+# Linux/arm64 4.14.96-gnu Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -8776,9 +8776,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set

diff --git a/4.14/armhf b/4.14/armhf
index 1f223767d193c6d22614cd58c3221c5354e7f813..692b8a705f5b90f0caba97eab8eebd0fdaef9f00 100644 (file)
--- a/4.14/armhf
+++ b/4.14/armhf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.94-gnu Kernel Configuration
+# Linux/arm 4.14.96-gnu Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -612,7 +612,13 @@ CONFIG_ARCH_R8A7792=y
 CONFIG_ARCH_R8A7793=y
 CONFIG_ARCH_R8A7794=y
 CONFIG_ARCH_SH73A0=y
-# CONFIG_ARCH_SUNXI is not set
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
+CONFIG_MACH_SUN8I=y
+CONFIG_MACH_SUN9I=y
 # CONFIG_ARCH_SIRF is not set
 CONFIG_ARCH_TANGO=y
 CONFIG_ARCH_TEGRA=y
@@ -1743,6 +1749,7 @@ CONFIG_CAN_LEDS=y
 CONFIG_CAN_FLEXCAN=m
 CONFIG_CAN_GRCAN=m
 CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_SUN4I=m
 CONFIG_CAN_TI_HECC=m
 CONFIG_CAN_C_CAN=m
 CONFIG_CAN_C_CAN_PLATFORM=m
@@ -2009,6 +2016,7 @@ CONFIG_OMAP_INTERCONNECT=y
 CONFIG_OMAP_OCP2SCP=m
 CONFIG_QCOM_EBI2=y
 CONFIG_SIMPLE_PM_BUS=y
+CONFIG_SUNXI_RSB=y
 CONFIG_TEGRA_GMI=m
 CONFIG_UNIPHIER_SYSTEM_BUS=y
 CONFIG_VEXPRESS_CONFIG=y
@@ -2142,6 +2150,7 @@ CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_NAND_ORION=m
 # CONFIG_MTD_NAND_VF610_NFC is not set
 CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_SUNXI=y
 CONFIG_MTD_NAND_HISI504=m
 CONFIG_MTD_NAND_QCOM=m
 CONFIG_MTD_NAND_MTK=m
@@ -2517,6 +2526,7 @@ CONFIG_AHCI_IMX=y
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MTK=m
 CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=y
 CONFIG_AHCI_TEGRA=m
 CONFIG_AHCI_QORIQ=m
 CONFIG_SATA_INIC162X=m
@@ -2786,6 +2796,8 @@ CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
 CONFIG_NET_VENDOR_ALACRITECH=y
 CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_SUN4I_EMAC=m
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@@ -3047,6 +3059,8 @@ CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
 # CONFIG_STMMAC_PCI is not set
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
@@ -3093,6 +3107,7 @@ CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_SUN4I=m
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
 CONFIG_LED_TRIGGER_PHY=y
@@ -3662,6 +3677,7 @@ CONFIG_KEYBOARD_STOWAWAY=m
 CONFIG_KEYBOARD_SUNKBD=m
 CONFIG_KEYBOARD_SH_KEYSC=m
 CONFIG_KEYBOARD_STMPE=m
+CONFIG_KEYBOARD_SUN4I_LRADC=m
 CONFIG_KEYBOARD_OMAP4=m
 CONFIG_KEYBOARD_TC3589X=m
 CONFIG_KEYBOARD_TM2_TOUCHKEY=m
@@ -3829,6 +3845,7 @@ CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_STMFTS=m
 CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 CONFIG_TOUCHSCREEN_SX8654=m
@@ -3926,6 +3943,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_SUN4I_PS2=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
 CONFIG_GAMEPORT=m
@@ -4178,6 +4196,7 @@ CONFIG_HAVE_S3C2410_I2C=y
 CONFIG_I2C_S3C2410=y
 CONFIG_I2C_SH_MOBILE=m
 CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SUN6I_P2WI=m
 CONFIG_I2C_TEGRA=m
 # CONFIG_I2C_UNIPHIER is not set
 # CONFIG_I2C_UNIPHIER_F is not set
@@ -4250,6 +4269,8 @@ CONFIG_SPI_S3C64XX=m
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SH_MSIOF=m
 CONFIG_SPI_SH_HSPI=m
+CONFIG_SPI_SUN4I=m
+CONFIG_SPI_SUN6I=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
@@ -4383,6 +4404,24 @@ CONFIG_PINCTRL_PFC_R8A7792=y
 CONFIG_PINCTRL_PFC_R8A7793=y
 CONFIG_PINCTRL_PFC_R8A7794=y
 CONFIG_PINCTRL_PFC_SH73A0=y
+CONFIG_PINCTRL_SUNXI=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A33=y
+CONFIG_PINCTRL_SUN8I_A83T=y
+CONFIG_PINCTRL_SUN8I_A83T_R=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
+CONFIG_PINCTRL_SUN8I_H3=y
+CONFIG_PINCTRL_SUN8I_H3_R=y
+CONFIG_PINCTRL_SUN8I_V3S=y
+CONFIG_PINCTRL_SUN9I_A80=y
+CONFIG_PINCTRL_SUN9I_A80_R=y
+# CONFIG_PINCTRL_SUN50I_A64 is not set
+# CONFIG_PINCTRL_SUN50I_A64_R is not set
+# CONFIG_PINCTRL_SUN50I_H5 is not set
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
@@ -4880,6 +4919,7 @@ CONFIG_DW_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_ORION_WATCHDOG=m
 CONFIG_RN5T618_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_TS4800_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
@@ -4953,6 +4993,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 #
 CONFIG_MFD_CORE=y
 CONFIG_MFD_ACT8945A=m
+CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_AS3711=y
 CONFIG_MFD_AS3722=y
 CONFIG_PMIC_ADP5520=y
@@ -4961,8 +5002,10 @@ CONFIG_MFD_ATMEL_FLEXCOM=m
 CONFIG_MFD_ATMEL_HLCDC=m
 CONFIG_MFD_BCM590XX=m
 CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AC100=m
 CONFIG_MFD_AXP20X=m
 CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_AXP20X_RSB=m
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_MFD_CROS_EC_SPI=m
@@ -5036,6 +5079,7 @@ CONFIG_MFD_STMPE=y
 #
 CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_LP3943=m
@@ -5197,6 +5241,7 @@ CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_WM8994=m
 CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
@@ -5229,6 +5274,7 @@ CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_IR_GPIO_TX=m
 CONFIG_IR_PWM_TX=m
+CONFIG_IR_SUNXI=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SIR=m
@@ -6009,6 +6055,11 @@ CONFIG_DRM_RCAR_DW_HDMI=m
 CONFIG_DRM_RCAR_LVDS=y
 CONFIG_DRM_RCAR_VSP=y
 CONFIG_DRM_SHMOBILE=m
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
+CONFIG_DRM_SUN4I_HDMI_CEC=y
+CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN8I_MIXER=m
 # CONFIG_DRM_OMAP is not set
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
@@ -6563,6 +6614,15 @@ CONFIG_SND_SOC_RCAR=m
 #
 # STMicroelectronics STM32 SOC audio support
 #
+
+#
+# Allwinner SoC Audio support
+#
+CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SND_SUN8I_CODEC=m
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
+CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SOC_TEGRA=m
 CONFIG_SND_SOC_TEGRA20_AC97=m
 CONFIG_SND_SOC_TEGRA20_DAS=m
@@ -6980,6 +7040,7 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
 #
 # Platform Glue Layer
 #
+# CONFIG_USB_MUSB_SUNXI is not set
 CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_AM35X=m
@@ -7333,6 +7394,7 @@ CONFIG_MMC_USHC=m
 CONFIG_MMC_USDHI6ROL0=m
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=y
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m
 CONFIG_MMC_SDHCI_XENON=m
@@ -7501,6 +7563,7 @@ CONFIG_RTC_DRV_88PM860X=m
 CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABB5ZES3=m
 CONFIG_RTC_DRV_ABX80X=m
+# CONFIG_RTC_DRV_AC100 is not set
 CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1307_HWMON=y
@@ -7616,6 +7679,8 @@ CONFIG_RTC_DRV_S3C=y
 CONFIG_RTC_DRV_SH=m
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_SUNXI=m
 CONFIG_RTC_DRV_MV=y
 CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_FTRTC010=m
@@ -7646,6 +7711,8 @@ CONFIG_DMA_OF=y
 CONFIG_ALTERA_MSGDMA=m
 CONFIG_AMBA_PL08X=y
 CONFIG_DMA_OMAP=y
+CONFIG_DMA_SUN4I=y
+CONFIG_DMA_SUN6I=m
 CONFIG_FSL_EDMA=m
 CONFIG_IMX_DMA=m
 CONFIG_IMX_SDMA=m
@@ -8256,6 +8323,19 @@ CONFIG_CLK_RENESAS_CPG_MSTP=y
 CONFIG_CLK_RENESAS_DIV6=y
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
+CONFIG_SUNXI_CCU=y
+CONFIG_SUN4I_A10_CCU=y
+CONFIG_SUN5I_CCU=y
+CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN8I_A23_CCU=y
+CONFIG_SUN8I_A33_CCU=y
+CONFIG_SUN8I_A83T_CCU=y
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_V3S_CCU=y
+# CONFIG_SUN8I_DE2_CCU is not set
+CONFIG_SUN8I_R40_CCU=y
+CONFIG_SUN9I_A80_CCU=y
+CONFIG_SUN8I_R_CCU=y
 CONFIG_TEGRA_CLK_EMC=y
 CONFIG_COMMON_CLK_TI_ADPLL=y
 CONFIG_CLK_UNIPHIER=y
@@ -8276,6 +8356,8 @@ CONFIG_ARMADA_370_XP_TIMER=y
 CONFIG_MESON6_TIMER=y
 CONFIG_ORION_TIMER=y
 CONFIG_OWL_TIMER=y
+CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
 CONFIG_TEGRA_TIMER=y
 CONFIG_CLKSRC_TI_32K=y
 CONFIG_ARM_ARCH_TIMER=y
@@ -8413,7 +8495,7 @@ CONFIG_SOC_SAMSUNG=y
 CONFIG_EXYNOS_PMU=y
 CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
 CONFIG_EXYNOS_PM_DOMAINS=y
-# CONFIG_SUNXI_SRAM is not set
+CONFIG_SUNXI_SRAM=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
@@ -8573,6 +8655,7 @@ CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
 CONFIG_RCAR_GYRO_ADC=m
 CONFIG_ROCKCHIP_SARADC=m
+CONFIG_SUN4I_GPADC=m
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC0832=m
 CONFIG_TI_ADC084S021=m
@@ -8925,6 +9008,7 @@ CONFIG_PWM_RENESAS_TPU=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
 CONFIG_PWM_STMPE=y
+CONFIG_PWM_SUN4I=m
 CONFIG_PWM_TEGRA=m
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
@@ -8964,7 +9048,7 @@ CONFIG_RESET_MESON=y
 # CONFIG_RESET_PISTACHIO is not set
 # CONFIG_RESET_SOCFPGA is not set
 # CONFIG_RESET_STM32 is not set
-# CONFIG_RESET_SUNXI is not set
+CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SYSCON=m
 CONFIG_RESET_UNIPHIER=m
 # CONFIG_RESET_ZYNQ is not set
@@ -8981,6 +9065,8 @@ CONFIG_FMC_CHARDEV=m
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN9I_USB=m
 CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_MESON_GXL_USB2=m
 CONFIG_BCM_KONA_USB2_PHY=m
@@ -9048,6 +9134,7 @@ CONFIG_NVMEM_IMX_OCOTP=m
 # CONFIG_MTK_EFUSE is not set
 CONFIG_QCOM_QFPROM=m
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_SUNXI_SID=m
 # CONFIG_NVMEM_VF610_OCOTP is not set
 CONFIG_STM=m
 CONFIG_STM_DUMMY=m
@@ -9374,9 +9461,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
@@ -9935,6 +10024,8 @@ CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
 CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 # CONFIG_CRYPTO_DEV_ROCKCHIP is not set
 CONFIG_CRYPTO_DEV_MEDIATEK=m
 CONFIG_CRYPTO_DEV_CHELSIO=m

diff --git a/4.14/powerpc b/4.14/powerpc
index 3b8bceb4a1fd6ee4d5b35679c14380a8050ae5a7..4b5a37a29b6f60d3781475948b6ebfeccb75d847 100644 (file)
--- a/4.14/powerpc
+++ b/4.14/powerpc
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.94-gnu Kernel Configuration
+# Linux/powerpc 4.14.96-gnu Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -8094,9 +8094,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set

diff --git a/4.14/powerpc64 b/4.14/powerpc64
index 9ebf27bd0814dfd7e2965de49021e17a983eea53..da182e5aa7d6835880934e3ae326ece9e3c18165 100644 (file)
--- a/4.14/powerpc64
+++ b/4.14/powerpc64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.94-gnu Kernel Configuration
+# Linux/powerpc 4.14.96-gnu Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -8257,9 +8257,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set

diff --git a/4.14/ppc64 b/4.14/ppc64
index 9ebf27bd0814dfd7e2965de49021e17a983eea53..da182e5aa7d6835880934e3ae326ece9e3c18165 100644 (file)
--- a/4.14/ppc64
+++ b/4.14/ppc64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.94-gnu Kernel Configuration
+# Linux/powerpc 4.14.96-gnu Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -8257,9 +8257,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set

diff --git a/4.14/ppc64el b/4.14/ppc64el
index 5acbd844a52350e12086123e24511b16273184b8..8234ccdbe3b280daadd358c96831351fc0365460 100644 (file)
--- a/4.14/ppc64el
+++ b/4.14/ppc64el
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.94-gnu Kernel Configuration
+# Linux/powerpc 4.14.96-gnu Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -8057,9 +8057,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set

diff --git a/4.14/s390x b/4.14/s390x
index c0af1f3930f12cc88809bd91bfddbdd4d56f7054..34cbfadbb3d0030226e828e566edfdbfdc230db9 100644 (file)
--- a/4.14/s390x
+++ b/4.14/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.94-gnu Kernel Configuration
+# Linux/s390 4.14.96-gnu Kernel Configuration
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -2461,9 +2461,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set

diff --git a/4.14/x86-32-nonpae b/4.14/x86-32-nonpae
index c01dc9115a0881b4cf659684465e55c8dffbad4e..dde58e4dbb456d069786abdb5fc00a9a4f717916 100644 (file)
--- a/4.14/x86-32-nonpae
+++ b/4.14/x86-32-nonpae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.14.94-gnu Kernel Configuration
+# Linux/i386 4.14.96-gnu Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -8622,9 +8622,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set

diff --git a/4.14/x86-32-pae b/4.14/x86-32-pae
index 05c4b9cac5f645b0c9ac2147c9ed39c849f8e27a..f7b04ab5f236b623e176b8ec90fb45cdb06dcf6d 100644 (file)
--- a/4.14/x86-32-pae
+++ b/4.14/x86-32-pae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.14.94-gnu Kernel Configuration
+# Linux/i386 4.14.96-gnu Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -8687,9 +8687,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set

diff --git a/4.14/x86-64 b/4.14/x86-64
index 77eb014f963399ee53d8025672f1031b5710e3fc..1d325d3c5a38619381a572dfe4d063793dc89321 100644 (file)
--- a/4.14/x86-64
+++ b/4.14/x86-64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.94-gnu Kernel Configuration
+# Linux/x86_64 4.14.96-gnu Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -8733,9 +8733,11 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set

diff --git a/4.19/arm64 b/4.19/arm64
index f7ea77f4a4cfa0332a8cd3bfb8acdf6fb9022d52..4f75d28e1449924c5a2167eac51c3c227cb3f7a1 100644 (file)
--- a/4.19/arm64
+++ b/4.19/arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.16-gnu Kernel Configuration
+# Linux/arm64 4.19.18-gnu Kernel Configuration
 #
 
 #

diff --git a/4.19/armhf b/4.19/armhf
index 5f90c18e145aab2864b7984da6e07f32b221e5ea..3be6f21aac31ae158ef0a9ee2949308b0e6190e0 100644 (file)
--- a/4.19/armhf
+++ b/4.19/armhf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.19.16-gnu Kernel Configuration
+# Linux/arm 4.19.18-gnu Kernel Configuration
 #
 
 #
@@ -464,7 +464,14 @@ CONFIG_ARCH_SH73A0=y
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_STM32 is not set
-# CONFIG_ARCH_SUNXI is not set
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
+CONFIG_MACH_SUN8I=y
+CONFIG_MACH_SUN9I=y
+CONFIG_ARCH_SUNXI_MC_SMP=y
 # CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_UNIPHIER=y
@@ -1851,6 +1858,7 @@ CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_FLEXCAN=m
 CONFIG_CAN_GRCAN=m
 CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_SUN4I=m
 CONFIG_CAN_TI_HECC=m
 CONFIG_CAN_C_CAN=m
 CONFIG_CAN_C_CAN_PLATFORM=m
@@ -2122,6 +2130,8 @@ CONFIG_OMAP_INTERCONNECT=y
 CONFIG_OMAP_OCP2SCP=m
 CONFIG_QCOM_EBI2=y
 CONFIG_SIMPLE_PM_BUS=y
+CONFIG_SUN50I_DE2_BUS=y
+CONFIG_SUNXI_RSB=y
 CONFIG_TEGRA_GMI=m
 CONFIG_TI_SYSC=y
 CONFIG_UNIPHIER_SYSTEM_BUS=y
@@ -2260,6 +2270,7 @@ CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_NAND_ORION=m
 # CONFIG_MTD_NAND_VF610_NFC is not set
 CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_SUNXI=y
 CONFIG_MTD_NAND_HISI504=m
 CONFIG_MTD_NAND_QCOM=m
 CONFIG_MTD_NAND_MTK=m
@@ -2633,6 +2644,7 @@ CONFIG_AHCI_IMX=y
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MTK=m
 CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=y
 CONFIG_AHCI_TEGRA=m
 CONFIG_AHCI_QORIQ=m
 CONFIG_SATA_INIC162X=m
@@ -2907,6 +2919,8 @@ CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
 CONFIG_NET_VENDOR_ALACRITECH=y
 CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_SUN4I_EMAC=m
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@@ -3188,6 +3202,8 @@ CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
 # CONFIG_STMMAC_PCI is not set
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
@@ -3236,6 +3252,7 @@ CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_I2C=m
 CONFIG_MDIO_MSCC_MIIM=m
+CONFIG_MDIO_SUN4I=m
 CONFIG_PHYLINK=m
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
@@ -3826,6 +3843,7 @@ CONFIG_KEYBOARD_STOWAWAY=m
 CONFIG_KEYBOARD_SUNKBD=m
 CONFIG_KEYBOARD_SH_KEYSC=m
 CONFIG_KEYBOARD_STMPE=m
+CONFIG_KEYBOARD_SUN4I_LRADC=m
 CONFIG_KEYBOARD_OMAP4=m
 CONFIG_KEYBOARD_TC3589X=m
 CONFIG_KEYBOARD_TM2_TOUCHKEY=m
@@ -4001,6 +4019,7 @@ CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_STMFTS=m
 CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 CONFIG_TOUCHSCREEN_SX8654=m
@@ -4098,6 +4117,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_SUN4I_PS2=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
 CONFIG_GAMEPORT=m
@@ -4356,6 +4376,7 @@ CONFIG_HAVE_S3C2410_I2C=y
 CONFIG_I2C_S3C2410=y
 CONFIG_I2C_SH_MOBILE=m
 CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SUN6I_P2WI=m
 CONFIG_I2C_TEGRA=m
 CONFIG_I2C_TEGRA_BPMP=m
 # CONFIG_I2C_UNIPHIER is not set
@@ -4430,6 +4451,8 @@ CONFIG_SPI_S3C64XX=m
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SH_MSIOF=m
 CONFIG_SPI_SH_HSPI=m
+CONFIG_SPI_SUN4I=m
+CONFIG_SPI_SUN6I=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
@@ -4563,6 +4586,21 @@ CONFIG_PINCTRL_PFC_R8A7792=y
 CONFIG_PINCTRL_PFC_R8A7793=y
 CONFIG_PINCTRL_PFC_R8A7794=y
 CONFIG_PINCTRL_PFC_SH73A0=y
+CONFIG_PINCTRL_SUNXI=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A33=y
+CONFIG_PINCTRL_SUN8I_A83T=y
+CONFIG_PINCTRL_SUN8I_A83T_R=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
+CONFIG_PINCTRL_SUN8I_H3=y
+CONFIG_PINCTRL_SUN8I_H3_R=y
+CONFIG_PINCTRL_SUN8I_V3S=y
+CONFIG_PINCTRL_SUN9I_A80=y
+CONFIG_PINCTRL_SUN9I_A80_R=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
@@ -5089,6 +5127,7 @@ CONFIG_DW_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_ORION_WATCHDOG=m
 CONFIG_RN5T618_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
 CONFIG_NPCM7XX_WATCHDOG=y
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_TS4800_WATCHDOG=m
@@ -5157,6 +5196,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 #
 CONFIG_MFD_CORE=y
 CONFIG_MFD_ACT8945A=m
+CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_AS3711=y
 CONFIG_MFD_AS3722=y
 CONFIG_PMIC_ADP5520=y
@@ -5165,8 +5205,10 @@ CONFIG_MFD_ATMEL_FLEXCOM=m
 CONFIG_MFD_ATMEL_HLCDC=m
 CONFIG_MFD_BCM590XX=m
 CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AC100=m
 CONFIG_MFD_AXP20X=m
 CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_AXP20X_RSB=m
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_CHARDEV=m
 CONFIG_MFD_MADERA=m
@@ -5243,6 +5285,7 @@ CONFIG_MFD_STMPE=y
 #
 CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_LP3943=m
@@ -5410,6 +5453,7 @@ CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_WM8994=m
 CONFIG_CEC_CORE=y
 CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_LIRC=y
@@ -5443,6 +5487,7 @@ CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_IR_GPIO_TX=m
 CONFIG_IR_PWM_TX=m
+CONFIG_IR_SUNXI=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SIR=m
@@ -5457,6 +5502,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
+# CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
 CONFIG_VIDEO_DEV=m
@@ -6265,6 +6311,14 @@ CONFIG_DRM_RCAR_DW_HDMI=m
 CONFIG_DRM_RCAR_LVDS=m
 CONFIG_DRM_RCAR_VSP=y
 CONFIG_DRM_SHMOBILE=m
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
+CONFIG_DRM_SUN4I_HDMI_CEC=y
+CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN6I_DSI=m
+# CONFIG_DRM_SUN8I_DW_HDMI is not set
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 # CONFIG_DRM_OMAP is not set
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_QXL=m
@@ -6859,6 +6913,15 @@ CONFIG_SND_SOC_RCAR=m
 #
 # STMicroelectronics STM32 SOC audio support
 #
+
+#
+# Allwinner SoC Audio support
+#
+CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SND_SUN8I_CODEC=m
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
+CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SOC_TEGRA=m
 CONFIG_SND_SOC_TEGRA20_AC97=m
 CONFIG_SND_SOC_TEGRA20_DAS=m
@@ -7311,6 +7374,7 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
 #
 # Platform Glue Layer
 #
+# CONFIG_USB_MUSB_SUNXI is not set
 CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_AM35X=m
@@ -7668,6 +7732,7 @@ CONFIG_MMC_USHC=m
 CONFIG_MMC_USDHI6ROL0=m
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=y
 CONFIG_MMC_CQHCI=m
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m
@@ -7844,6 +7909,7 @@ CONFIG_RTC_DRV_88PM860X=m
 CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABB5ZES3=m
 CONFIG_RTC_DRV_ABX80X=m
+# CONFIG_RTC_DRV_AC100 is not set
 CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1307_CENTURY=y
@@ -7961,6 +8027,8 @@ CONFIG_RTC_DRV_S3C=y
 CONFIG_RTC_DRV_SH=m
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_SUNXI=m
 CONFIG_RTC_DRV_MV=y
 CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_FTRTC010=m
@@ -7992,6 +8060,8 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DMA_OF=y
 CONFIG_ALTERA_MSGDMA=m
 CONFIG_AMBA_PL08X=y
+CONFIG_DMA_SUN4I=y
+CONFIG_DMA_SUN6I=m
 CONFIG_DW_AXI_DMAC=m
 CONFIG_FSL_EDMA=m
 CONFIG_IMX_DMA=m
@@ -8550,6 +8620,19 @@ CONFIG_CLK_RENESAS_CPG_MSTP=y
 CONFIG_CLK_RENESAS_DIV6=y
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
+CONFIG_SUNXI_CCU=y
+CONFIG_SUN4I_A10_CCU=y
+CONFIG_SUN5I_CCU=y
+CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN8I_A23_CCU=y
+CONFIG_SUN8I_A33_CCU=y
+CONFIG_SUN8I_A83T_CCU=y
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_V3S_CCU=y
+# CONFIG_SUN8I_DE2_CCU is not set
+CONFIG_SUN8I_R40_CCU=y
+CONFIG_SUN9I_A80_CCU=y
+CONFIG_SUN8I_R_CCU=y
 CONFIG_TEGRA_CLK_EMC=y
 CONFIG_CLK_TEGRA_BPMP=y
 CONFIG_COMMON_CLK_TI_ADPLL=y
@@ -8572,6 +8655,8 @@ CONFIG_ARMADA_370_XP_TIMER=y
 CONFIG_MESON6_TIMER=y
 CONFIG_ORION_TIMER=y
 CONFIG_OWL_TIMER=y
+CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
 CONFIG_TEGRA_TIMER=y
 CONFIG_NPCM7XX_TIMER=y
 CONFIG_CLKSRC_TI_32K=y
@@ -8740,6 +8825,7 @@ CONFIG_SOC_SAMSUNG=y
 CONFIG_EXYNOS_PMU=y
 CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
 CONFIG_EXYNOS_PM_DOMAINS=y
+CONFIG_SUNXI_SRAM=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
@@ -8909,6 +8995,7 @@ CONFIG_QCOM_SPMI_VADC=m
 CONFIG_RCAR_GYRO_ADC=m
 CONFIG_ROCKCHIP_SARADC=m
 CONFIG_SD_ADC_MODULATOR=m
+CONFIG_SUN4I_GPADC=m
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC0832=m
 CONFIG_TI_ADC084S021=m
@@ -9292,6 +9379,7 @@ CONFIG_PWM_RENESAS_TPU=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
 CONFIG_PWM_STMPE=y
+CONFIG_PWM_SUN4I=m
 CONFIG_PWM_TEGRA=m
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
@@ -9334,6 +9422,7 @@ CONFIG_RESET_MESON=y
 CONFIG_RESET_MESON_AUDIO_ARB=m
 CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SYSCON=m
 CONFIG_RESET_UNIPHIER=m
 CONFIG_RESET_UNIPHIER_USB3=m
@@ -9350,6 +9439,8 @@ CONFIG_FMC_CHARDEV=m
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN9I_USB=m
 CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_MESON_GXL_USB2=m
 CONFIG_PHY_MESON_GXL_USB3=m
@@ -9424,6 +9515,7 @@ CONFIG_NVMEM_IMX_OCOTP=m
 # CONFIG_MTK_EFUSE is not set
 CONFIG_QCOM_QFPROM=m
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_UNIPHIER_EFUSE=m
 # CONFIG_NVMEM_VF610_OCOTP is not set
 CONFIG_MESON_MX_EFUSE=m
@@ -10108,6 +10200,8 @@ CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 # CONFIG_CRYPTO_DEV_ROCKCHIP is not set
 CONFIG_CRYPTO_DEV_MEDIATEK=m
 CONFIG_CRYPTO_DEV_CHELSIO=m

diff --git a/4.19/powerpc b/4.19/powerpc
index c6b626d8b6c87c4a74a3cbe2243af845fd99c68f..402cb29e3a726eb6cf3d31bc36094a23f96dddcf 100644 (file)
--- a/4.19/powerpc
+++ b/4.19/powerpc
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.16-gnu Kernel Configuration
+# Linux/powerpc 4.19.18-gnu Kernel Configuration
 #
 
 #

diff --git a/4.19/powerpc64 b/4.19/powerpc64
index feff4f87aad2ad74a2c9662a4c679144f79191f1..f233c05647fe8d5937a5b716141a2e53dd488985 100644 (file)
--- a/4.19/powerpc64
+++ b/4.19/powerpc64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.16-gnu Kernel Configuration
+# Linux/powerpc 4.19.18-gnu Kernel Configuration
 #
 
 #

diff --git a/4.19/ppc64 b/4.19/ppc64
index c81efaa1197b281445a6f7a5c33b4dd785518b0d..39dfab28425230436b2a7ff1b2fc83b3502ef4b2 100644 (file)
--- a/4.19/ppc64
+++ b/4.19/ppc64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.16-gnu Kernel Configuration
+# Linux/powerpc 4.19.18-gnu Kernel Configuration
 #
 
 #

diff --git a/4.19/ppc64el b/4.19/ppc64el
index 25d7ea590e3bd38fc330ad32cc60a8acf95edebf..827b2a388ca18567844e272f566ce5c8edd0f6f1 100644 (file)
--- a/4.19/ppc64el
+++ b/4.19/ppc64el
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.16-gnu Kernel Configuration
+# Linux/powerpc 4.19.18-gnu Kernel Configuration
 #
 
 #

diff --git a/4.19/riscv64 b/4.19/riscv64
index 8bdefe9dd24cd482e283ceabacf2fbf0fc69195f..5f8d448d1b298b5c998bd064268ef47eb14431e0 100644 (file)
--- a/4.19/riscv64
+++ b/4.19/riscv64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/riscv 4.19.16-gnu Kernel Configuration
+# Linux/riscv 4.19.18-gnu Kernel Configuration
 #
 
 #

diff --git a/4.19/s390x b/4.19/s390x
index 00b35278533d817f85280d3e6ebda52919141006..00c237828053b7df4b1e69cecf58226802840e39 100644 (file)
--- a/4.19/s390x
+++ b/4.19/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.19.16-gnu Kernel Configuration
+# Linux/s390 4.19.18-gnu Kernel Configuration
 #
 
 #

diff --git a/4.19/x86-32-nonpae b/4.19/x86-32-nonpae
index 6fe1bb33e948bf1792d77829c9bfa74733b861db..53438acb3b80c479d93ca160a04074d8c83922f1 100644 (file)
--- a/4.19/x86-32-nonpae
+++ b/4.19/x86-32-nonpae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.19.16-gnu Kernel Configuration
+# Linux/i386 4.19.18-gnu Kernel Configuration
 #
 
 #

diff --git a/4.19/x86-32-pae b/4.19/x86-32-pae
index 74071675eee724931e5018087f823f2050b2a16f..de8da546acdd54257ad9fa33338a84a737ac9e56 100644 (file)
--- a/4.19/x86-32-pae
+++ b/4.19/x86-32-pae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.19.16-gnu Kernel Configuration
+# Linux/i386 4.19.18-gnu Kernel Configuration
 #
 
 #

diff --git a/4.19/x86-64 b/4.19/x86-64
index 3a9c6e2f19e1ad5b73ef05473af17e43dcbca7b5..cffdbd6f53b3e1fd733948e81f0b4d39a7407262 100644 (file)
--- a/4.19/x86-64
+++ b/4.19/x86-64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.19.16-gnu Kernel Configuration
+# Linux/x86_64 4.19.18-gnu Kernel Configuration
 #
 
 #

diff --git a/4.20/arm64 b/4.20/arm64
index 66dccc4fe504784bc47981afd76838ec49877c85..41dded0a067d837325dd7f7dbd026d5db86d4f5e 100644 (file)
--- a/4.20/arm64
+++ b/4.20/arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.20.3-gnu Kernel Configuration
+# Linux/arm64 4.20.5-gnu Kernel Configuration
 #
 
 #

diff --git a/4.20/armhf b/4.20/armhf
index 419d44ec841559dee891fc8b35e504b901691bb1..1844b4771fb8faeb2761b1a3cc7b5892f7abf314 100644 (file)
--- a/4.20/armhf
+++ b/4.20/armhf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.20.3-gnu Kernel Configuration
+# Linux/arm 4.20.5-gnu Kernel Configuration
 #
 
 #
@@ -466,7 +466,14 @@ CONFIG_ARCH_SH73A0=y
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_STM32 is not set
-# CONFIG_ARCH_SUNXI is not set
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
+CONFIG_MACH_SUN8I=y
+CONFIG_MACH_SUN9I=y
+CONFIG_ARCH_SUNXI_MC_SMP=y
 # CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_UNIPHIER=y
@@ -1859,6 +1866,7 @@ CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_FLEXCAN=m
 CONFIG_CAN_GRCAN=m
 CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_SUN4I=m
 CONFIG_CAN_TI_HECC=m
 CONFIG_CAN_C_CAN=m
 CONFIG_CAN_C_CAN_PLATFORM=m
@@ -2129,6 +2137,8 @@ CONFIG_OMAP_INTERCONNECT=y
 CONFIG_OMAP_OCP2SCP=m
 CONFIG_QCOM_EBI2=y
 CONFIG_SIMPLE_PM_BUS=y
+CONFIG_SUN50I_DE2_BUS=y
+CONFIG_SUNXI_RSB=y
 CONFIG_TEGRA_GMI=m
 CONFIG_TI_SYSC=y
 CONFIG_UNIPHIER_SYSTEM_BUS=y
@@ -2266,6 +2276,7 @@ CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_NAND_ORION=m
 # CONFIG_MTD_NAND_VF610_NFC is not set
 CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_SUNXI=y
 CONFIG_MTD_NAND_HISI504=m
 CONFIG_MTD_NAND_QCOM=m
 CONFIG_MTD_NAND_MTK=m
@@ -2642,6 +2653,7 @@ CONFIG_AHCI_IMX=y
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MTK=m
 CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=y
 CONFIG_AHCI_TEGRA=m
 CONFIG_AHCI_QORIQ=m
 CONFIG_SATA_INIC162X=m
@@ -2917,6 +2929,8 @@ CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
 CONFIG_NET_VENDOR_ALACRITECH=y
 CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_SUN4I_EMAC=m
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@@ -3204,6 +3218,8 @@ CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
 # CONFIG_STMMAC_PCI is not set
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
@@ -3252,6 +3268,7 @@ CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_I2C=m
 CONFIG_MDIO_MSCC_MIIM=m
+CONFIG_MDIO_SUN4I=m
 CONFIG_PHYLINK=m
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
@@ -3845,6 +3862,7 @@ CONFIG_KEYBOARD_SAMSUNG=m
 CONFIG_KEYBOARD_STOWAWAY=m
 CONFIG_KEYBOARD_SUNKBD=m
 CONFIG_KEYBOARD_STMPE=m
+CONFIG_KEYBOARD_SUN4I_LRADC=m
 CONFIG_KEYBOARD_OMAP4=m
 CONFIG_KEYBOARD_TC3589X=m
 CONFIG_KEYBOARD_TM2_TOUCHKEY=m
@@ -4020,6 +4038,7 @@ CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_STMFTS=m
 CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 CONFIG_TOUCHSCREEN_SX8654=m
@@ -4117,6 +4136,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_SUN4I_PS2=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
 CONFIG_GAMEPORT=m
@@ -4376,6 +4396,7 @@ CONFIG_HAVE_S3C2410_I2C=y
 CONFIG_I2C_S3C2410=y
 CONFIG_I2C_SH_MOBILE=m
 CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SUN6I_P2WI=m
 CONFIG_I2C_TEGRA=m
 CONFIG_I2C_TEGRA_BPMP=m
 # CONFIG_I2C_UNIPHIER is not set
@@ -4453,6 +4474,8 @@ CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SH_MSIOF=m
 CONFIG_SPI_SH_HSPI=m
 CONFIG_SPI_SLAVE_MT27XX=m
+CONFIG_SPI_SUN4I=m
+CONFIG_SPI_SUN6I=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
@@ -4591,6 +4614,21 @@ CONFIG_PINCTRL_PFC_R8A7792=y
 CONFIG_PINCTRL_PFC_R8A7793=y
 CONFIG_PINCTRL_PFC_R8A7794=y
 CONFIG_PINCTRL_PFC_SH73A0=y
+CONFIG_PINCTRL_SUNXI=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A33=y
+CONFIG_PINCTRL_SUN8I_A83T=y
+CONFIG_PINCTRL_SUN8I_A83T_R=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
+CONFIG_PINCTRL_SUN8I_H3=y
+CONFIG_PINCTRL_SUN8I_H3_R=y
+CONFIG_PINCTRL_SUN8I_V3S=y
+CONFIG_PINCTRL_SUN9I_A80=y
+CONFIG_PINCTRL_SUN9I_A80_R=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
@@ -5122,6 +5160,7 @@ CONFIG_DW_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_ORION_WATCHDOG=m
 CONFIG_RN5T618_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
 CONFIG_NPCM7XX_WATCHDOG=y
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_TS4800_WATCHDOG=m
@@ -5190,6 +5229,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 #
 CONFIG_MFD_CORE=y
 CONFIG_MFD_ACT8945A=m
+CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_AS3711=y
 CONFIG_MFD_AS3722=y
 CONFIG_PMIC_ADP5520=y
@@ -5199,8 +5239,10 @@ CONFIG_MFD_ATMEL_FLEXCOM=m
 CONFIG_MFD_ATMEL_HLCDC=m
 CONFIG_MFD_BCM590XX=m
 CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AC100=m
 CONFIG_MFD_AXP20X=m
 CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_AXP20X_RSB=m
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_CHARDEV=m
 CONFIG_MFD_MADERA=m
@@ -5277,6 +5319,7 @@ CONFIG_MFD_STMPE=y
 #
 CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_LP3943=m
@@ -5444,6 +5487,7 @@ CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_WM8994=m
 CONFIG_CEC_CORE=y
 CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_LIRC=y
@@ -5477,6 +5521,7 @@ CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_IR_GPIO_TX=m
 CONFIG_IR_PWM_TX=m
+CONFIG_IR_SUNXI=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SIR=m
@@ -5491,6 +5536,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
+# CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
 # CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
@@ -6298,6 +6344,14 @@ CONFIG_DRM_RCAR_DU=m
 CONFIG_DRM_RCAR_DW_HDMI=m
 CONFIG_DRM_RCAR_LVDS=m
 CONFIG_DRM_RCAR_VSP=y
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
+CONFIG_DRM_SUN4I_HDMI_CEC=y
+CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN6I_DSI=m
+# CONFIG_DRM_SUN8I_DW_HDMI is not set
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 # CONFIG_DRM_OMAP is not set
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_QXL=m
@@ -6893,6 +6947,16 @@ CONFIG_SND_SOC_RCAR=m
 #
 # STMicroelectronics STM32 SOC audio support
 #
+
+#
+# Allwinner SoC Audio support
+#
+CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SND_SUN8I_CODEC=m
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
+CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SUN4I_SPDIF=m
+CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
 CONFIG_SND_SOC_TEGRA=m
 CONFIG_SND_SOC_TEGRA20_AC97=m
 CONFIG_SND_SOC_TEGRA20_DAS=m
@@ -7351,6 +7415,7 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
 #
 # Platform Glue Layer
 #
+# CONFIG_USB_MUSB_SUNXI is not set
 CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_AM35X=m
@@ -7712,6 +7777,7 @@ CONFIG_MMC_USHC=m
 CONFIG_MMC_USDHI6ROL0=m
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=y
 CONFIG_MMC_CQHCI=m
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m
@@ -7891,6 +7957,7 @@ CONFIG_RTC_DRV_88PM860X=m
 CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABB5ZES3=m
 CONFIG_RTC_DRV_ABX80X=m
+# CONFIG_RTC_DRV_AC100 is not set
 CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1307_CENTURY=y
@@ -8007,6 +8074,8 @@ CONFIG_RTC_DRV_S3C=y
 CONFIG_RTC_DRV_SH=m
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_SUNXI=m
 CONFIG_RTC_DRV_MV=y
 CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_FTRTC010=m
@@ -8038,6 +8107,8 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DMA_OF=y
 CONFIG_ALTERA_MSGDMA=m
 CONFIG_AMBA_PL08X=y
+CONFIG_DMA_SUN4I=y
+CONFIG_DMA_SUN6I=m
 CONFIG_DW_AXI_DMAC=m
 CONFIG_FSL_EDMA=m
 CONFIG_IMX_DMA=m
@@ -8371,6 +8442,7 @@ CONFIG_VIDEO_IMX_CSI=m
 CONFIG_SOC_CAMERA_IMX074=m
 CONFIG_SOC_CAMERA_MT9T031=m
 CONFIG_VIDEO_OMAP4=m
+CONFIG_VIDEO_SUNXI=y
 CONFIG_TEGRA_VDE=m
 
 #
@@ -8608,6 +8680,19 @@ CONFIG_CLK_RENESAS_CPG_MSTP=y
 CONFIG_CLK_RENESAS_DIV6=y
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
+CONFIG_SUNXI_CCU=y
+CONFIG_SUN4I_A10_CCU=y
+CONFIG_SUN5I_CCU=y
+CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN8I_A23_CCU=y
+CONFIG_SUN8I_A33_CCU=y
+CONFIG_SUN8I_A83T_CCU=y
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_V3S_CCU=y
+# CONFIG_SUN8I_DE2_CCU is not set
+CONFIG_SUN8I_R40_CCU=y
+CONFIG_SUN9I_A80_CCU=y
+CONFIG_SUN8I_R_CCU=y
 CONFIG_TEGRA_CLK_EMC=y
 CONFIG_CLK_TEGRA_BPMP=y
 CONFIG_COMMON_CLK_TI_ADPLL=y
@@ -8630,6 +8715,8 @@ CONFIG_ARMADA_370_XP_TIMER=y
 CONFIG_MESON6_TIMER=y
 CONFIG_ORION_TIMER=y
 CONFIG_OWL_TIMER=y
+CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
 CONFIG_TEGRA_TIMER=y
 CONFIG_NPCM7XX_TIMER=y
 CONFIG_CLKSRC_TI_32K=y
@@ -8800,6 +8887,7 @@ CONFIG_SOC_SAMSUNG=y
 CONFIG_EXYNOS_PMU=y
 CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
 CONFIG_EXYNOS_PM_DOMAINS=y
+CONFIG_SUNXI_SRAM=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
@@ -8974,6 +9062,7 @@ CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_RCAR_GYRO_ADC=m
 CONFIG_ROCKCHIP_SARADC=m
 CONFIG_SD_ADC_MODULATOR=m
+CONFIG_SUN4I_GPADC=m
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC0832=m
 CONFIG_TI_ADC084S021=m
@@ -9359,6 +9448,7 @@ CONFIG_PWM_RENESAS_TPU=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
 CONFIG_PWM_STMPE=y
+CONFIG_PWM_SUN4I=m
 CONFIG_PWM_TEGRA=m
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
@@ -9402,6 +9492,7 @@ CONFIG_RESET_MESON_AUDIO_ARB=m
 CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_QCOM_PDC=m
 CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SYSCON=m
 CONFIG_RESET_UNIPHIER=m
 CONFIG_RESET_UNIPHIER_USB3=m
@@ -9418,6 +9509,8 @@ CONFIG_FMC_CHARDEV=m
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN9I_USB=m
 CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_MESON_GXL_USB2=m
 CONFIG_PHY_MESON_GXL_USB3=m
@@ -9499,6 +9592,7 @@ CONFIG_NVMEM_IMX_OCOTP=m
 # CONFIG_MTK_EFUSE is not set
 CONFIG_QCOM_QFPROM=m
 CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_UNIPHIER_EFUSE=m
 # CONFIG_NVMEM_VF610_OCOTP is not set
 CONFIG_MESON_MX_EFUSE=m
@@ -10189,6 +10283,8 @@ CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 # CONFIG_CRYPTO_DEV_ROCKCHIP is not set
 CONFIG_CRYPTO_DEV_MEDIATEK=m
 CONFIG_CRYPTO_DEV_CHELSIO=m

diff --git a/4.20/powerpc b/4.20/powerpc
index 64895994453b7fafb5cbf86b235a5c0a59c9fa6b..c33c6aed654534a9b2e3b6703cbfa772e38e12b4 100644 (file)
--- a/4.20/powerpc
+++ b/4.20/powerpc
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.3-gnu Kernel Configuration
+# Linux/powerpc 4.20.5-gnu Kernel Configuration
 #
 
 #

diff --git a/4.20/powerpc64 b/4.20/powerpc64
index 14105b538253132f3f1834fd780bebcf8d938df6..af324057a83c278bb447876a2a92b336ef90c26e 100644 (file)
--- a/4.20/powerpc64
+++ b/4.20/powerpc64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.3-gnu Kernel Configuration
+# Linux/powerpc 4.20.5-gnu Kernel Configuration
 #
 
 #

diff --git a/4.20/ppc64 b/4.20/ppc64
index c45fa1a36d575c107ef95f602667a07252c57d34..69c735f8fb967b3efbe48dbdd957bf15d5d2f7cc 100644 (file)
--- a/4.20/ppc64
+++ b/4.20/ppc64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.3-gnu Kernel Configuration
+# Linux/powerpc 4.20.5-gnu Kernel Configuration
 #
 
 #

diff --git a/4.20/ppc64el b/4.20/ppc64el
index a4b55426a2f5a3d2da93370e6468de23a01f1bad..0b7806bef7525b370dc2fcd3f7cf45ed08a6a491 100644 (file)
--- a/4.20/ppc64el
+++ b/4.20/ppc64el
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.3-gnu Kernel Configuration
+# Linux/powerpc 4.20.5-gnu Kernel Configuration
 #
 
 #

diff --git a/4.20/riscv64 b/4.20/riscv64
index 9d34eaddcf0f248bb160f2fd37673b7df5bdadcb..47c329c911c1d24e016a5111e7a82a125c215b12 100644 (file)
--- a/4.20/riscv64
+++ b/4.20/riscv64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/riscv 4.20.3-gnu Kernel Configuration
+# Linux/riscv 4.20.5-gnu Kernel Configuration
 #
 
 #

diff --git a/4.20/s390x b/4.20/s390x
index 84fff2510a85119fa316ec9c5454009359a6eb3a..fa7bcaa7fb035e39b85d4942a1cec51f3131ad7d 100644 (file)
--- a/4.20/s390x
+++ b/4.20/s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.20.3-gnu Kernel Configuration
+# Linux/s390 4.20.5-gnu Kernel Configuration
 #
 
 #

diff --git a/4.20/x86-32-nonpae b/4.20/x86-32-nonpae
index 8f3a1a2913803f9562265e703e82454131969834..78f085d8956d3a8e4184805260574871b2fae69a 100644 (file)
--- a/4.20/x86-32-nonpae
+++ b/4.20/x86-32-nonpae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.20.3-gnu Kernel Configuration
+# Linux/i386 4.20.5-gnu Kernel Configuration
 #
 
 #

diff --git a/4.20/x86-32-pae b/4.20/x86-32-pae
index 266fd5ec1c0f877e4eea312ffae348dceae46073..b85c9370e6feade1adcff775ef35801fe7bbf0ec 100644 (file)
--- a/4.20/x86-32-pae
+++ b/4.20/x86-32-pae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.20.3-gnu Kernel Configuration
+# Linux/i386 4.20.5-gnu Kernel Configuration
 #
 
 #

diff --git a/4.20/x86-64 b/4.20/x86-64
index 0c796254bb56ad81ab2d78335e00e14727cce3ed..0d93b63afcedca526b7282ac472b09d8835869b7 100644 (file)
--- a/4.20/x86-64
+++ b/4.20/x86-64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.20.3-gnu Kernel Configuration
+# Linux/x86_64 4.20.5-gnu Kernel Configuration
 #
 
 #