Merge tag 'hisi-arm64-defconfig-for-5.7' of git://github.com/hisilicon/linux-hisi...

ARM64: hisilicon: defconfig updates for 5.7

- Enable MEGARAID_SAS to be able to boot from
  disk for the D06CS development board

* tag 'hisi-arm64-defconfig-for-5.7' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: Enable MEGARAID_SAS

Link: https://lore.kernel.org/r/5E61F3C1.1080909@hisilicon.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm64/configs/defconfig
index f824de247f9d78aaaf9949eddd684c37c01a01b1,3c2dd127d813286bcc23284b7af4e5cdcf299455..742e7269abfc63aa67146baa1e6500d0e81cff43
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -161,9 -161,6 +161,9 @@@ CONFIG_QRTR=
  CONFIG_QRTR_SMD=m
  CONFIG_QRTR_TUN=m
  CONFIG_BPF_JIT=y
 +CONFIG_CAN=m
 +CONFIG_CAN_RCAR=m
 +CONFIG_CAN_RCAR_CANFD=m
  CONFIG_BT=m
  CONFIG_BT_HIDP=m
  # CONFIG_BT_HS is not set
@@@ -229,6 -226,7 +229,7 @@@ CONFIG_BLK_DEV_SD=
  CONFIG_SCSI_SAS_ATA=y
  CONFIG_SCSI_HISI_SAS=y
  CONFIG_SCSI_HISI_SAS_PCI=y
+ CONFIG_MEGARAID_SAS=y
  CONFIG_SCSI_MPT3SAS=m
  CONFIG_SCSI_UFSHCD=y
  CONFIG_SCSI_UFSHCD_PLATFORM=y
@@@ -402,7 -400,6 +403,7 @@@ CONFIG_SPI_QCOM_QSPI=
  CONFIG_SPI_QUP=y
  CONFIG_SPI_QCOM_GENI=m
  CONFIG_SPI_S3C64XX=y
 +CONFIG_SPI_SH_MSIOF=m
  CONFIG_SPI_SUN6I=y
  CONFIG_SPI_SPIDEV=m
  CONFIG_SPMI=y
@@@ -436,7 -433,6 +437,7 @@@ CONFIG_GPIO_XGENE_SB=
  CONFIG_GPIO_MAX732X=y
  CONFIG_GPIO_PCA953X=y
  CONFIG_GPIO_PCA953X_IRQ=y
 +CONFIG_GPIO_BD9571MWV=m
  CONFIG_GPIO_MAX77620=y
  CONFIG_POWER_AVS=y
  CONFIG_QCOM_CPR=y
@@@ -457,7 -453,6 +458,7 @@@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=
  CONFIG_CPU_THERMAL=y
  CONFIG_THERMAL_EMULATION=y
  CONFIG_QORIQ_THERMAL=m
 +CONFIG_SUN8I_THERMAL=y
  CONFIG_ROCKCHIP_THERMAL=m
  CONFIG_RCAR_THERMAL=y
  CONFIG_RCAR_GEN3_THERMAL=y
@@@ -522,25 -517,19 +523,25 @@@ CONFIG_MEDIA_SUPPORT=
  CONFIG_MEDIA_CAMERA_SUPPORT=y
  CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
  CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 +CONFIG_MEDIA_SDR_SUPPORT=y
  CONFIG_MEDIA_CONTROLLER=y
  CONFIG_VIDEO_V4L2_SUBDEV_API=y
  # CONFIG_DVB_NET is not set
  CONFIG_MEDIA_USB_SUPPORT=y
  CONFIG_USB_VIDEO_CLASS=m
  CONFIG_V4L_PLATFORM_DRIVERS=y
 +CONFIG_VIDEO_RCAR_CSI2=m
 +CONFIG_VIDEO_RCAR_VIN=m
  CONFIG_VIDEO_SUN6I_CSI=m
  CONFIG_V4L_MEM2MEM_DRIVERS=y
  CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
  CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
  CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 +CONFIG_VIDEO_RENESAS_FDP1=m
  CONFIG_VIDEO_RENESAS_FCP=m
  CONFIG_VIDEO_RENESAS_VSP1=m
 +CONFIG_SDR_PLATFORM_DRIVERS=y
 +CONFIG_VIDEO_RCAR_DRIF=m
  CONFIG_DRM=m
  CONFIG_DRM_I2C_NXP_TDA998X=m
  CONFIG_DRM_NOUVEAU=m
@@@ -558,22 -547,15 +559,22 @@@ CONFIG_ROCKCHIP_DW_HDMI=
  CONFIG_ROCKCHIP_DW_MIPI_DSI=y
  CONFIG_ROCKCHIP_INNO_HDMI=y
  CONFIG_DRM_RCAR_DU=m
 +CONFIG_DRM_RCAR_DW_HDMI=m
  CONFIG_DRM_SUN4I=m
 +CONFIG_DRM_SUN6I_DSI=m
  CONFIG_DRM_SUN8I_DW_HDMI=m
  CONFIG_DRM_SUN8I_MIXER=m
  CONFIG_DRM_MSM=m
  CONFIG_DRM_TEGRA=m
 +CONFIG_DRM_PANEL_LVDS=m
  CONFIG_DRM_PANEL_SIMPLE=m
 +CONFIG_DRM_DUMB_VGA_DAC=m
  CONFIG_DRM_SII902X=m
 +CONFIG_DRM_THINE_THC63LVD1024=m
  CONFIG_DRM_TI_SN65DSI86=m
  CONFIG_DRM_I2C_ADV7511=m
 +CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 +CONFIG_DRM_DW_HDMI_CEC=m
  CONFIG_DRM_VC4=m
  CONFIG_DRM_ETNAVIV=m
  CONFIG_DRM_HISI_HIBMC=m
@@@ -624,7 -606,6 +625,7 @@@ CONFIG_USB_EHCI_HCD_PLATFORM=
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_EXYNOS=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y
 +CONFIG_USB_RENESAS_USBHS_HCD=m
  CONFIG_USB_RENESAS_USBHS=m
  CONFIG_USB_STORAGE=y
  CONFIG_USB_MUSB_HDRC=y
@@@ -701,7 -682,7 +702,7 @@@ CONFIG_RTC_DRV_SNVS=
  CONFIG_RTC_DRV_IMX_SC=m
  CONFIG_RTC_DRV_XGENE=y
  CONFIG_DMADEVICES=y
 -CONFIG_DMA_BCM2835=m
 +CONFIG_DMA_BCM2835=y
  CONFIG_DMA_SUN6I=m
  CONFIG_FSL_EDMA=y
  CONFIG_IMX_SDMA=y
@@@ -732,7 -713,6 +733,7 @@@ CONFIG_COMMON_CLK_CS2000_CP=
  CONFIG_COMMON_CLK_S2MPS11=y
  CONFIG_CLK_QORIQ=y
  CONFIG_COMMON_CLK_PWM=y
 +CONFIG_COMMON_CLK_VC5=y
  CONFIG_CLK_RASPBERRYPI=m
  CONFIG_CLK_IMX8MM=y
  CONFIG_CLK_IMX8MN=y
@@@ -792,7 -772,7 +793,7 @@@ CONFIG_ARCH_R8A774A1=
  CONFIG_ARCH_R8A774B1=y
  CONFIG_ARCH_R8A774C0=y
  CONFIG_ARCH_R8A7795=y
 -CONFIG_ARCH_R8A7796=y
 +CONFIG_ARCH_R8A77960=y
  CONFIG_ARCH_R8A77961=y
  CONFIG_ARCH_R8A77965=y
  CONFIG_ARCH_R8A77970=y
@@@ -813,7 -793,6 +814,7 @@@ CONFIG_EXTCON_USBC_CROS_EC=
  CONFIG_MEMORY=y
  CONFIG_IIO=y
  CONFIG_EXYNOS_ADC=y
 +CONFIG_MAX9611=m
  CONFIG_QCOM_SPMI_ADC5=m
  CONFIG_ROCKCHIP_SARADC=m
  CONFIG_IIO_CROS_EC_SENSORS_CORE=m
@@@ -907,7 -886,6 +908,7 @@@ CONFIG_CRYPTO_DEV_FSL_CAAM=
  CONFIG_CRYPTO_DEV_HISI_ZIP=m
  CONFIG_CRYPTO_USER_API_RNG=m
  CONFIG_CRYPTO_DEV_QCOM_RNG=m
 +CONFIG_CRYPTO_DEV_CCREE=m
  CONFIG_CMA_SIZE_MBYTES=32
  CONFIG_PRINTK_TIME=y
  CONFIG_DEBUG_INFO=y