From: Olof Johansson Date: Tue, 15 May 2018 20:52:49 +0000 (-0700) Subject: Merge tag 'v4.18-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v4.18-rc1~51^2^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32876811b4635e3a3c1c93e207f17dee9f5e2ec7;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'v4.18-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/defconfig Enablement of Rockchip-specific efuse, io-domain and typec drivers as well as general cros-ec, hid, touchscreen bluetooth and wifi-drivers on 64bit arm platforms. * tag 'v4.18-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: defconfig: enable rockchip efuse arm64: defconfig: Enable bluetooth USB support arm64: defconfig: Enable Marvell WiFi-Ex PCIe driver arm64: defconfig: Enable Atmel Maxtouch driver arm64: defconfig: Enable HID over I2C drivers arm64: defconfig: Enable ChromeOS EC drivers for supported Chromebooks. arm64: defconfig: Enable Rockchip io-domain driver arm64: defconfig: Enable typec-phy and extcon-usbc-cros-ec for rk3399 Signed-off-by: Olof Johansson --- 32876811b4635e3a3c1c93e207f17dee9f5e2ec7 diff --cc arch/arm64/configs/defconfig index d3f2d6e1386ed,74abf140e3328..1c98939e6412d --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -157,9 -157,9 +157,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