Commit 4d3ae0d1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Pull "ARM64: hisilicon: defconfig updates for 4.14" from Wei Xu:

- Enable Kirin PCIe host, hi6421v530 mfd and regulator,
  syscon reboot mode, serdev bus, OP-TEE and K3 DMA support
  for hikey and hikey960

- Enable pcie based sas controller support for hip08 SoC

* tag 'hisi-defconfig-for-4.14' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: enable DMA driver for hi3660
  arm64: defconfig: enable OP-TEE
  arm64: defconfig: enable support for serial port connected device
  arm64: defconfig: enable CONFIG_SYSCON_REBOOT_MODE
  arm64: defconfig: enable support hi6421v530 PMIC
  arm64: defconfig: enable Kirin PCIe
  arm64: defconfig: enable SCSI_HISI_SAS_PCI
parents f736eb38 4bd68d60

arch/arm64/configs/defconfig

+10 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y 
CONFIG_PCI_LAYERSCAPE=y

CONFIG_PCI_HISI=y

CONFIG_PCIE_QCOM=y

CONFIG_PCIE_KIRIN=y

CONFIG_PCIE_ARMADA_8K=y

CONFIG_PCI_AARDVARK=y

CONFIG_PCIE_RCAR=y
@@ -166,6 +167,7 @@ CONFIG_EEPROM_AT25=m 
CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_SAS_ATA=y

CONFIG_SCSI_HISI_SAS=y

CONFIG_SCSI_HISI_SAS_PCI=y

CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_AHCI_PLATFORM=y
@@ -252,6 +254,8 @@ CONFIG_SERIAL_MSM_CONSOLE=y 
CONFIG_SERIAL_XILINX_PS_UART=y

CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y

CONFIG_SERIAL_MVEBU_UART=y

CONFIG_SERIAL_DEV_BUS=y

CONFIG_SERIAL_DEV_CTRL_TTYPORT=y

CONFIG_VIRTIO_CONSOLE=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y
@@ -299,6 +303,7 @@ CONFIG_GPIO_MAX77620=y 
CONFIG_POWER_RESET_MSM=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_SYSCON_REBOOT_MODE=y

CONFIG_BATTERY_BQ27XXX=y

CONFIG_SENSORS_ARM_SCPI=y

CONFIG_SENSORS_LM90=m
@@ -319,6 +324,7 @@ CONFIG_MFD_CROS_EC=y 
CONFIG_MFD_CROS_EC_I2C=y

CONFIG_MFD_CROS_EC_SPI=y

CONFIG_MFD_EXYNOS_LPASS=m

CONFIG_MFD_HI6421_PMIC=y

CONFIG_MFD_HI655X_PMIC=y

CONFIG_MFD_MAX77620=y

CONFIG_MFD_SPMI_PMIC=y
@@ -327,6 +333,7 @@ CONFIG_MFD_SEC_CORE=y 
CONFIG_REGULATOR_FAN53555=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_HI6421V530=y

CONFIG_REGULATOR_HI655X=y

CONFIG_REGULATOR_MAX77620=y

CONFIG_REGULATOR_PWM=y
@@ -455,6 +462,7 @@ CONFIG_RTC_DRV_TEGRA=y 
CONFIG_RTC_DRV_XGENE=y

CONFIG_DMADEVICES=y

CONFIG_DMA_BCM2835=m

CONFIG_K3_DMA=y

CONFIG_MV_XOR_V2=y

CONFIG_PL330_DMA=y

CONFIG_TEGRA20_APB_DMA=y
@@ -519,6 +527,8 @@ CONFIG_PHY_XGENE=y 
CONFIG_PHY_TEGRA_XUSB=y

CONFIG_QCOM_L2_PMU=y

CONFIG_QCOM_L3_PMU=y

CONFIG_TEE=y

CONFIG_OPTEE=y

CONFIG_ARM_SCPI_PROTOCOL=y

CONFIG_RASPBERRYPI_FIRMWARE=y

CONFIG_EFI_CAPSULE_LOADER=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE