From d22c90aa502731a0f5c70e4668784db8d479c388 Mon Sep 17 00:00:00 2001 From: Kefeng Wang Date: Mon, 15 Aug 2016 15:03:45 +0800 Subject: arm64: defconfig: Enable Hisi SAS and HNS Enable Hisi SAS and HNS config for D02/D03 board. Signed-off-by: Kefeng Wang Signed-off-by: Wei Xu diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 0555b7c..4512a0c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -107,7 +107,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 @@ -125,6 +126,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 -- cgit v0.10.2 From d15f21a3c7e41e4e69b169f897873b4d4f5b0ed6 Mon Sep 17 00:00:00 2001 From: Guodong Xu Date: Wed, 24 Aug 2016 10:42:05 +0800 Subject: arm64: defconfig: Enable HiSilicon kirin drm, adv7533 for HiKey Enable HiSilicon kirin drm driver for HiKey: CONFIG_DRM_HISI_KIRIN Enable adv7511/adv7533 for HiKey: CONFIG_DRM_I2C_ADV7511 Build these components as modules. Signed-off-by: Xinliang Liu Signed-off-by: Guodong Xu Signed-off-by: Wei Xu diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 4512a0c..6258fb4 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -242,6 +242,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 -- cgit v0.10.2 From acdf2a16720d3c93b5c80b415f937121b4e654f7 Mon Sep 17 00:00:00 2001 From: Guodong Xu Date: Wed, 24 Aug 2016 10:42:06 +0800 Subject: arm64: defconfig: enable CONFIG_INPUT_HISI_POWERKEY for HiKey Signed-off-by: Guodong Xu Signed-off-by: Wei Xu diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 6258fb4..103082a 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -154,6 +154,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 -- cgit v0.10.2 From 29002b8e2e86f35f93f31373a2e7c32e2028aeee Mon Sep 17 00:00:00 2001 From: Guodong Xu Date: Wed, 24 Aug 2016 10:42:07 +0800 Subject: arm64: defconfig: enable bluetooth supports as modules Enable the following items for bluetooth mouse and speaker which base on HCIUART. a) CONFIG_BT_HCIUART b) CONFIG_BT_HCIUART_LL c) CONFIG_BT_HIDP Enable bluetooth LED support. d) CONFIG_BT_LEDS Signed-off-by: Guodong Xu Signed-off-by: Wei Xu diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 103082a..034f4c8 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -89,6 +89,14 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y # CONFIG_IPV6 is not set 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 -- cgit v0.10.2 From 21adc4d7bb0260effe0a4395a8751d88a4aedf9a Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 22 Aug 2016 15:45:30 -0700 Subject: Kconfig: ARCH_HISI: Add PINCTRL to HISI platform Things won't work if PINCTRL isn't enabled, so make sure to explicitly set it rather then betting that we have some other platform configed in which selects it. Cc: Arnd Bergmann Cc: Wei Xu Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: John Stultz Signed-off-by: Wei Xu diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index bb2616b..8390653 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -67,6 +67,7 @@ config ARCH_HISI bool "Hisilicon SoC Family" select ARM_TIMER_SP804 select HISILICON_IRQ_MBIGEN + select PINCTRL help This enables support for Hisilicon ARMv8 SoC family -- cgit v0.10.2