Commit a458ae73 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- Enable hisilicon SAS and XGE for hip05 and hip06
- Enable drm, powerkey, bluetooth and adv7511/adv7533 for hikey
- Add PINCTRL to HISI platform

* tag 'hisi-defconfig-for-4.9' of git://github.com/hisilicon/linux-hisi:
  Kconfig: ARCH_HISI: Add PINCTRL to HISI platform
  arm64: defconfig: enable bluetooth supports as modules
  arm64: defconfig: enable CONFIG_INPUT_HISI_POWERKEY for HiKey
  arm64: defconfig: Enable HiSilicon kirin drm, adv7533 for HiKey
  arm64: defconfig: Enable Hisi SAS and HNS
parents 3eab887a 21adc4d7

arch/arm64/Kconfig.platforms

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ config ARCH_HISI 
	bool "Hisilicon SoC Family"

	select ARM_TIMER_SP804

	select HISILICON_IRQ_MBIGEN if PCI

	select PINCTRL

	help

	  This enables support for Hisilicon ARMv8 SoC family

arch/arm64/configs/defconfig

+15 −1
Original line number Diff line number Diff line
@@ -120,6 +120,14 @@ CONFIG_VLAN_8021Q=m 
CONFIG_VLAN_8021Q_GVRP=y

CONFIG_VLAN_8021Q_MVRP=y

CONFIG_BPF_JIT=y

CONFIG_BT=m

CONFIG_BT_HIDP=m

# CONFIG_BT_HS is not set

# CONFIG_BT_LE is not set

CONFIG_BT_LEDS=y

# CONFIG_BT_DEBUGFS is not set

CONFIG_BT_HCIUART=m

CONFIG_BT_HCIUART_LL=y

CONFIG_CFG80211=m

CONFIG_MAC80211=m

CONFIG_MAC80211_LEDS=y
@@ -139,7 +147,8 @@ CONFIG_VIRTIO_BLK=y 
CONFIG_SRAM=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_SCSI_SAS_ATA=y

CONFIG_SCSI_HISI_SAS=y

CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_AHCI_PLATFORM=y
@@ -160,6 +169,8 @@ CONFIG_VIRTIO_NET=y 
CONFIG_AMD_XGBE=y

CONFIG_NET_XGENE=y

CONFIG_MACB=y

CONFIG_HNS_DSAF=y

CONFIG_HNS_ENET=y

CONFIG_E1000E=y

CONFIG_IGB=y

CONFIG_IGBVF=y
@@ -186,6 +197,7 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_KEYBOARD_GPIO=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_PM8941_PWRKEY=y

CONFIG_INPUT_HISI_POWERKEY=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIO_AMBAKMI=y

CONFIG_LEGACY_PTY_COUNT=16
@@ -274,6 +286,8 @@ CONFIG_DRM=m 
CONFIG_DRM_NOUVEAU=m

CONFIG_DRM_TEGRA=m

CONFIG_DRM_PANEL_SIMPLE=m

CONFIG_DRM_I2C_ADV7511=m

CONFIG_DRM_HISI_KIRIN=m

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

CONFIG_BACKLIGHT_GENERIC=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE