diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2018-02-28 15:36:51 -0800 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2018-02-28 15:36:51 -0800 |
| commit | 437fe668ab5ecdfd312605b0da15cf9138101d3f (patch) | |
| tree | d0ef32538d350c769bdf21dc38fb737543ded05f | |
| parent | 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff) | |
| parent | bb9d91a4e5c87cabfa2c9d35761374aa11150c2d (diff) | |
| download | linux-stable-437fe668ab5ecdfd312605b0da15cf9138101d3f.tar.gz linux-stable-437fe668ab5ecdfd312605b0da15cf9138101d3f.zip | |
Merge tag 'bcm2835-defconfig-next-2018-02-28' into defconfig/next
This pull request enables several recent drivers for the Raspberry Pi
family in the defconfigs (thermal, BT, aux serial).
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
| -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 da7387689b88..a431989cdaf2 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -312,6 +312,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 @@ -462,6 +465,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 |