diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-13 22:39:35 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-13 22:39:35 +0100 |
| commit | 6140e14b0b7ea2dcf60ed7ce2a2ed96880ae1dce (patch) | |
| tree | 63171c0759577a958d3011be6d9a9876c558891c /arch/arm | |
| parent | fdda85f6969cadf4fda8c1eb15c1ac7ec8798bcd (diff) | |
| parent | 437fe668ab5ecdfd312605b0da15cf9138101d3f (diff) | |
| download | linux-6140e14b0b7ea2dcf60ed7ce2a2ed96880ae1dce.tar.gz | |
Merge tag 'arm-soc/for-4.17/defconfig' of https://github.com/Broadcom/stblinux into next/soc
Pull "Broadcom defconfig changes for 4.17" from Florian Fainelli: This pull request contains multi_v7_defconfig changes for Broadcom ARM-based SoC for 4.17, please pull the following: - Tuomas enables the BCM2835 AUX driver which is necessary to provide console on the Raspberry Pi 3 - Stefan turns on support for the BCM43438 Bluetooth adapter connected via UART on the Raspberry Pi Zero Wireless and he also turns on support for the thermal driver on the Pi 2 and 3. * tag 'arm-soc/for-4.17/defconfig' of https://github.com/Broadcom/stblinux: ARM: multi_v7_defconfig: Enable thermal driver for RPi 2/3 ARM: bcm2385_defconfig: Enable BT support for BCM43438 ARM: multi_v7_defconfig: Enable serial console on RPi 3
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 43dab4890ad3..8682b15336b9 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -49,6 +49,9 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y +CONFIG_BT=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_BCM=y CONFIG_CFG80211=y CONFIG_MAC80211=y CONFIG_DEVTMPFS=y @@ -74,6 +77,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_BCM2835AUX=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y CONFIG_TTY_PRINTK=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_BCM2835=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 638587630125..9a26ca7e41b1 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -313,6 +313,9 @@ CONFIG_INPUT_ADXL34X=m CONFIG_SERIO_AMBAKMI=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_BCM2835AUX=y CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EM=y CONFIG_SERIAL_8250_MT6577=y @@ -465,6 +468,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PWM_FAN=m CONFIG_SENSORS_INA2XX=m CONFIG_CPU_THERMAL=y +CONFIG_BCM2835_THERMAL=m CONFIG_BRCMSTB_THERMAL=m CONFIG_ROCKCHIP_THERMAL=y CONFIG_RCAR_THERMAL=y |