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

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

diff --cc arch/arm64/Kconfig.platforms
index be5d824,8390653..f848946
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -66,7 -66,8 +66,8 @@@ config ARCH_LG1
  config ARCH_HISI
        bool "Hisilicon SoC Family"
        select ARM_TIMER_SP804
 -      select HISILICON_IRQ_MBIGEN
 +      select HISILICON_IRQ_MBIGEN if PCI
+       select PINCTRL
        help
          This enables support for Hisilicon ARMv8 SoC family
  

diff --cc arch/arm64/configs/defconfig
index eadf485,034f4c8..0c3d541
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -92,34 -87,16 +92,42 @@@ CONFIG_IP_MULTICAST=
  CONFIG_IP_PNP=y
  CONFIG_IP_PNP_DHCP=y
  CONFIG_IP_PNP_BOOTP=y
 -# CONFIG_IPV6 is not set
 +CONFIG_IPV6=m
 +CONFIG_NETFILTER=y
 +CONFIG_NF_CONNTRACK=m
 +CONFIG_NF_CONNTRACK_EVENTS=y
 +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 +CONFIG_NETFILTER_XT_TARGET_LOG=m
 +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 +CONFIG_NF_CONNTRACK_IPV4=m
 +CONFIG_IP_NF_IPTABLES=m
 +CONFIG_IP_NF_FILTER=m
 +CONFIG_IP_NF_TARGET_REJECT=m
 +CONFIG_IP_NF_NAT=m
 +CONFIG_IP_NF_TARGET_MASQUERADE=m
 +CONFIG_IP_NF_MANGLE=m
 +CONFIG_NF_CONNTRACK_IPV6=m
 +CONFIG_IP6_NF_IPTABLES=m
 +CONFIG_IP6_NF_FILTER=m
 +CONFIG_IP6_NF_TARGET_REJECT=m
 +CONFIG_IP6_NF_MANGLE=m
 +CONFIG_IP6_NF_NAT=m
 +CONFIG_IP6_NF_TARGET_MASQUERADE=m
 +CONFIG_BRIDGE=m
 +CONFIG_BRIDGE_VLAN_FILTERING=y
 +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