Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 16:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

This pull request contains multi_v7_defconfig changes for Broadcom

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJaqCoCAAoJEIfQlpxEBwcEE20QAKu+LiIm0Ap8mSGPPN0LHq0u
 M+2evW1WHE8daQGNguJq/9sGz2KDs9rO9hPveuqehKnRujjXtzKcbTqD4xUZwxzh
 EBwjHU+SFFTwafyTDTjVp8aMSH6eZRC7FkH3aEY68+ci2iQ5a618V/cHfngo0bHk
 0oelWrMBINOvWog1dP5mAUShq+zXUigMtN9hUCoTAGSznGgGo4QlHfOMTZHV6N12
 EOrNpvqYzomN5iTqYIAAmqnosh6n0dlo03TVCrPaV8T1Yd27uxmIaaegU2rRjWoh
 yzC2fx6WcaT6VqzRbCEPYMsAxbE12pPKumrw2l7fHl4+d0LEefZbs7Oz6hBgPNTJ
 v7nZqDIGRfCTSUtBLDNQc9fDXCMDtWr0330RercKHsdr5vxdoA2+cIadzndApxNX
 4Sdwz3SCFGhD/9G2csicDIj7JLxt0SNBuOeziiqk+X4h1Bf7WQ7qFPhw2RfttMam
 ObmsYHaFNnJ4CQpoyU56a5ph9yyT5PcjKF5c+XL6syAQoatFbOJy0a5Nz2JEFBk2
 T+WxaGOHg5YOrOZk+9sHTaka+WeV8NRUHgbDTkeDmh7ZtjChxaNDstGU14Wet3Hi
 3yA5wmHoSBWKsjp3IBBZ0ICP7eVHdefdSRJ3bzdP4DKSJU6+WuhLrSXDG1mJvlnJ
 ImfSktkOSyhlJaH+ORis
 =3aYj
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2018-03-13 22:39:35 +01:00
commit 6140e14b0b
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/configs/bcm2835_defconfig
View File

@ -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

4
arch/arm/configs/multi_v7_defconfig
View File

@ -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