Merge tag 'hisi-defconfig-for-4.18v3' of git://github.com/hisilicon/linux-hisi into...

ARM64: hisilicon: defconfig updates for 4.18

- Enable the support of ethernet, eMMC, Combo/INNO phy
  and PCIe for Hi3798CV200
- Enable the LPC for hip06 and hip07

* tag 'hisi-defconfig-for-4.18v3' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: Enable HISILICON_LPC
  arm64: defconfig: enable drivers for Poplar support

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm64/configs/defconfig
index 0565ae5c1b6ae22c633a0e5ca3cba27008ba5e98,d9472e12ab14e1486c86324cce2240235ede1768..b3cfbdfa135a9e4e90bd148c2b3602dd67e60252
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -53,7 -53,6 +53,7 @@@ CONFIG_ARCH_R8A7796=
  CONFIG_ARCH_R8A77965=y
  CONFIG_ARCH_R8A77970=y
  CONFIG_ARCH_R8A77980=y
 +CONFIG_ARCH_R8A77990=y
  CONFIG_ARCH_R8A77995=y
  CONFIG_ARCH_STRATIX10=y
  CONFIG_ARCH_TEGRA=y
@@@ -76,6 -75,7 +76,7 @@@ CONFIG_PCI_HISI=
  CONFIG_PCIE_QCOM=y
  CONFIG_PCIE_KIRIN=y
  CONFIG_PCIE_ARMADA_8K=y
+ CONFIG_PCIE_HISI_STB=y
  CONFIG_PCI_AARDVARK=y
  CONFIG_PCI_TEGRA=y
  CONFIG_PCIE_RCAR=y
@@@ -158,10 -158,8 +159,10 @@@ CONFIG_BT_HIDP=
  # CONFIG_BT_LE is not set
  CONFIG_BT_LEDS=y
  # CONFIG_BT_DEBUGFS is not set
 +CONFIG_BT_HCIBTUSB=m
  CONFIG_BT_HCIUART=m
  CONFIG_BT_HCIUART_LL=y
 +CONFIG_BT_HCIUART_BCM=y
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
  CONFIG_MAC80211_LEDS=y
@@@ -172,7 -170,7 +173,8 @@@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplu
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_DMA_CMA=y
 +CONFIG_CMA_SIZE_MBYTES=32
+ CONFIG_HISILICON_LPC=y
  CONFIG_MTD=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_M25P80=y
@@@ -212,6 -210,7 +214,7 @@@ CONFIG_AMD_XGBE=
  CONFIG_NET_XGENE=y
  CONFIG_MACB=y
  CONFIG_THUNDER_NIC_PF=y
+ CONFIG_HIX5HD2_GMAC=y
  CONFIG_HNS_DSAF=y
  CONFIG_HNS_ENET=y
  CONFIG_E1000E=y
@@@ -243,7 -242,6 +246,7 @@@ CONFIG_ROCKCHIP_PHY=
  CONFIG_USB_PEGASUS=m
  CONFIG_USB_RTL8150=m
  CONFIG_USB_RTL8152=m
 +CONFIG_USB_LAN78XX=m
  CONFIG_USB_USBNET=m
  CONFIG_USB_NET_DM9601=m
  CONFIG_USB_NET_SR9800=m
@@@ -252,16 -250,12 +255,16 @@@ CONFIG_USB_NET_SMSC95XX=
  CONFIG_USB_NET_PLUSB=m
  CONFIG_USB_NET_MCS7830=m
  CONFIG_BRCMFMAC=m
 +CONFIG_MWIFIEX=m
 +CONFIG_MWIFIEX_PCIE=m
  CONFIG_WL18XX=m
  CONFIG_WLCORE_SDIO=m
  CONFIG_INPUT_EVDEV=y
  CONFIG_KEYBOARD_ADC=m
  CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_KEYBOARD_GPIO=y
 +CONFIG_INPUT_TOUCHSCREEN=y
 +CONFIG_TOUCHSCREEN_ATMEL_MXT=m
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_PM8941_PWRKEY=y
  CONFIG_INPUT_HISI_POWERKEY=y
@@@ -295,7 -289,6 +298,7 @@@ CONFIG_SERIAL_MVEBU_UART=
  CONFIG_SERIAL_DEV_BUS=y
  CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
  CONFIG_VIRTIO_CONSOLE=y
 +CONFIG_I2C_HID=m
  CONFIG_I2C_CHARDEV=y
  CONFIG_I2C_MUX=y
  CONFIG_I2C_MUX_PCA954x=y
@@@ -313,7 -306,6 +316,7 @@@ CONFIG_I2C_UNIPHIER_F=
  CONFIG_I2C_RCAR=y
  CONFIG_I2C_CROS_EC_TUNNEL=y
  CONFIG_SPI=y
 +CONFIG_SPI_ARMADA_3700=y
  CONFIG_SPI_MESON_SPICC=m
  CONFIG_SPI_MESON_SPIFC=m
  CONFIG_SPI_BCM2835=m
@@@ -331,7 -323,6 +334,7 @@@ CONFIG_PINCTRL_MAX77620=
  CONFIG_PINCTRL_MSM8916=y
  CONFIG_PINCTRL_MSM8994=y
  CONFIG_PINCTRL_MSM8996=y
 +CONFIG_PINCTRL_MT7622=y
  CONFIG_PINCTRL_QDF2XXX=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_GPIO_DWAPB=y
@@@ -344,8 -335,6 +347,8 @@@ CONFIG_GPIO_XGENE_SB=
  CONFIG_GPIO_PCA953X=y
  CONFIG_GPIO_PCA953X_IRQ=y
  CONFIG_GPIO_MAX77620=y
 +CONFIG_POWER_AVS=y
 +CONFIG_ROCKCHIP_IODOMAIN=y
  CONFIG_POWER_RESET_MSM=y
  CONFIG_POWER_RESET_XGENE=y
  CONFIG_POWER_RESET_SYSCON=y
@@@ -357,7 -346,6 +360,7 @@@ CONFIG_SENSORS_INA2XX=
  CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
  CONFIG_CPU_THERMAL=y
  CONFIG_THERMAL_EMULATION=y
 +CONFIG_ARMADA_THERMAL=y
  CONFIG_BRCMSTB_THERMAL=m
  CONFIG_EXYNOS_THERMAL=y
  CONFIG_RCAR_GEN3_THERMAL=y
@@@ -376,7 -364,6 +379,7 @@@ CONFIG_MFD_AXP20X_RSB=
  CONFIG_MFD_CROS_EC=y
  CONFIG_MFD_CROS_EC_I2C=y
  CONFIG_MFD_CROS_EC_SPI=y
 +CONFIG_MFD_CROS_EC_CHARDEV=m
  CONFIG_MFD_EXYNOS_LPASS=m
  CONFIG_MFD_HI6421_PMIC=y
  CONFIG_MFD_HI655X_PMIC=y
@@@ -455,8 -442,7 +458,8 @@@ CONFIG_SND_BCM2835_SOC_I2S=
  CONFIG_SND_SOC_SAMSUNG=y
  CONFIG_SND_SOC_RCAR=m
  CONFIG_SND_SOC_AK4613=m
 -CONFIG_SND_SIMPLE_CARD=y
 +CONFIG_SND_SIMPLE_CARD=m
 +CONFIG_SND_AUDIO_GRAPH_CARD=m
  CONFIG_USB=y
  CONFIG_USB_OTG=y
  CONFIG_USB_XHCI_HCD=y
@@@ -502,6 -488,7 +505,7 @@@ CONFIG_MMC_SPI=
  CONFIG_MMC_SDHI=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_EXYNOS=y
+ CONFIG_MMC_DW_HI3798CV200=y
  CONFIG_MMC_DW_K3=y
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_MMC_SUNXI=y
@@@ -531,7 -518,6 +535,7 @@@ CONFIG_RTC_DRV_SUN6I=
  CONFIG_RTC_DRV_ARMADA38X=y
  CONFIG_RTC_DRV_TEGRA=y
  CONFIG_RTC_DRV_XGENE=y
 +CONFIG_RTC_DRV_CROS_EC=y
  CONFIG_DMADEVICES=y
  CONFIG_DMA_BCM2835=m
  CONFIG_K3_DMA=y
@@@ -586,16 -572,11 +590,16 @@@ CONFIG_ARCH_TEGRA_210_SOC=
  CONFIG_ARCH_TEGRA_186_SOC=y
  CONFIG_ARCH_TEGRA_194_SOC=y
  CONFIG_EXTCON_USB_GPIO=y
 +CONFIG_EXTCON_USBC_CROS_EC=y
  CONFIG_MEMORY=y
  CONFIG_TEGRA_MC=y
  CONFIG_IIO=y
  CONFIG_EXYNOS_ADC=y
  CONFIG_ROCKCHIP_SARADC=m
 +CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 +CONFIG_IIO_CROS_EC_SENSORS=m
 +CONFIG_IIO_CROS_EC_LIGHT_PROX=m
 +CONFIG_IIO_CROS_EC_BARO=m
  CONFIG_PWM=y
  CONFIG_PWM_BCM2835=m
  CONFIG_PWM_CROS_EC=m
@@@ -604,6 -585,8 +608,8 @@@ CONFIG_PWM_RCAR=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_PWM_SAMSUNG=y
  CONFIG_PWM_TEGRA=m
+ CONFIG_PHY_HISTB_COMBPHY=y
+ CONFIG_PHY_HISI_INNO_USB2=y
  CONFIG_PHY_RCAR_GEN3_USB2=y
  CONFIG_PHY_RCAR_GEN3_USB3=m
  CONFIG_PHY_HI6220_USB=y
@@@ -613,14 -596,12 +619,14 @@@ CONFIG_PHY_MVEBU_CP110_COMPHY=
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
  CONFIG_PHY_ROCKCHIP_EMMC=y
  CONFIG_PHY_ROCKCHIP_PCIE=m
 +CONFIG_PHY_ROCKCHIP_TYPEC=y
  CONFIG_PHY_XGENE=y
  CONFIG_PHY_TEGRA_XUSB=y
  CONFIG_QCOM_L2_PMU=y
  CONFIG_QCOM_L3_PMU=y
  CONFIG_MESON_EFUSE=m
  CONFIG_QCOM_QFPROM=y
 +CONFIG_ROCKCHIP_EFUSE=y
  CONFIG_UNIPHIER_EFUSE=y
  CONFIG_TEE=y
  CONFIG_OPTEE=y