Merge tag 'sunxi-config64-for-5.5-1' of https://git.kernel.org/pub/scm/linux/kernel...

One new patch to the arm64 defconfig to enable the new crypto engine
driver.

* tag 'sunxi-config64-for-5.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: defconfig: add new Allwinner crypto options

Link: https://lore.kernel.org/r/539241d6-9b2e-4d5b-bd63-f912cf6ebf96.lettre@localhost
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm64/configs/defconfig
index be192baf1c56d9d5cc80737aaf84e50273414bf5,f2f330b8416d5fd8e8fd22a4561c3a9885924361..7d16f10a9251b6c0cad777fac0f079bc9aace185
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -29,7 -29,6 +29,7 @@@ CONFIG_BLK_DEV_INITRD=
  CONFIG_KALLSYMS_ALL=y
  # CONFIG_COMPAT_BRK is not set
  CONFIG_PROFILING=y
 +CONFIG_ARCH_ACTIONS=y
  CONFIG_ARCH_AGILEX=y
  CONFIG_ARCH_SUNXI=y
  CONFIG_ARCH_ALPINE=y
@@@ -91,7 -90,6 +91,7 @@@ CONFIG_ARM_TEGRA186_CPUFREQ=
  CONFIG_ARM_SCPI_PROTOCOL=y
  CONFIG_RASPBERRYPI_FIRMWARE=y
  CONFIG_INTEL_STRATIX10_SERVICE=y
 +CONFIG_INTEL_STRATIX10_RSU=m
  CONFIG_TI_SCI_PROTOCOL=y
  CONFIG_EFI_CAPSULE_LOADER=y
  CONFIG_IMX_SCU=y
@@@ -116,6 -114,8 +116,8 @@@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=
  CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
  CONFIG_CRYPTO_CHACHA20_NEON=m
  CONFIG_CRYPTO_AES_ARM64_BS=m
+ CONFIG_CRYPTO_DEV_ALLWINNER=y
+ CONFIG_CRYPTO_DEV_SUN8I_CE=m
  CONFIG_JUMP_LABEL=y
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
@@@ -213,7 -213,6 +215,7 @@@ CONFIG_MTD_NAND_DENALI_DT=
  CONFIG_MTD_NAND_MARVELL=y
  CONFIG_MTD_NAND_QCOM=y
  CONFIG_MTD_SPI_NOR=y
 +CONFIG_SPI_CADENCE_QUADSPI=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_NBD=m
  CONFIG_VIRTIO_BLK=y
@@@ -414,7 -413,6 +416,7 @@@ CONFIG_PINCTRL_QDF2XXX=
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_PINCTRL_SDM845=y
  CONFIG_PINCTRL_SM8150=y
 +CONFIG_GPIO_ALTERA=m
  CONFIG_GPIO_DWAPB=y
  CONFIG_GPIO_MB86S7X=y
  CONFIG_GPIO_PL061=y
@@@ -727,7 -725,7 +729,7 @@@ CONFIG_TEGRA_IOMMU_SMMU=
  CONFIG_ARM_SMMU=y
  CONFIG_ARM_SMMU_V3=y
  CONFIG_QCOM_IOMMU=y
 -CONFIG_REMOTEPROC=m
 +CONFIG_REMOTEPROC=y
  CONFIG_QCOM_Q6V5_MSS=m
  CONFIG_QCOM_Q6V5_PAS=m
  CONFIG_QCOM_SYSMON=m
@@@ -745,11 -743,9 +747,11 @@@ CONFIG_QCOM_SMD_RPM=
  CONFIG_QCOM_SMP2P=y
  CONFIG_QCOM_SMSM=y
  CONFIG_ARCH_R8A774A1=y
 +CONFIG_ARCH_R8A774B1=y
  CONFIG_ARCH_R8A774C0=y
  CONFIG_ARCH_R8A7795=y
  CONFIG_ARCH_R8A7796=y
 +CONFIG_ARCH_R8A77961=y
  CONFIG_ARCH_R8A77965=y
  CONFIG_ARCH_R8A77970=y
  CONFIG_ARCH_R8A77980=y
@@@ -807,7 -803,6 +809,7 @@@ CONFIG_PHY_ROCKCHIP_TYPEC=
  CONFIG_PHY_UNIPHIER_USB2=y
  CONFIG_PHY_UNIPHIER_USB3=y
  CONFIG_PHY_TEGRA_XUSB=y
 +CONFIG_ARM_SMMU_V3_PMU=m
  CONFIG_FSL_IMX8_DDR_PMU=m
  CONFIG_HISI_PMU=y
  CONFIG_QCOM_L2_PMU=y
@@@ -855,7 -850,6 +857,7 @@@ CONFIG_NLS_ISO8859_1=
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
 +CONFIG_CRYPTO_DEV_HISI_ZIP=m
  CONFIG_DMA_CMA=y
  CONFIG_CMA_SIZE_MBYTES=32
  CONFIG_PRINTK_TIME=y