diff options
| author | Arnd Bergmann | 2020-03-25 16:50:58 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2020-03-25 16:50:58 +0100 |
| commit | 82cb08f0c9bfa68a09437bb14cfaef2876ad05cd (patch) | |
| tree | e68f30afa48c3e796c2188f57ec99cb91d11f646 /arch/arm | |
| parent | c824d107e0c6340cb98b31e824dbe5d4f7e2a357 (diff) | |
| parent | 8068b7b63583764b46416a62856e42fb1f954ab6 (diff) | |
Merge tag 'arm-soc/for-5.7/defconfig' of https://github.com/Broadcom/stblinux into arm/config
This pull request contains Broadcom ARM-based SoCs defconfig changes for
v5.7, please pull the following:
- Marek enables the Raspberry Pi 4 specific drivers: GENET, thermal, and
GPIO regulator support in bcm2835_defconfig
* tag 'arm-soc/for-5.7/defconfig' of https://github.com/Broadcom/stblinux:
ARM: bcm2835_defconfig: add support for Raspberry Pi4
Link: https://lore.kernel.org/r/20200311212012.9418-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 519ff58e67b3..38437541ea76 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -72,6 +72,7 @@ CONFIG_BLK_DEV_SD=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_NETDEVICES=y +CONFIG_BCMGENET=y CONFIG_USB_LAN78XX=y CONFIG_USB_USBNET=y CONFIG_USB_NET_SMSC95XX=y @@ -96,9 +97,13 @@ CONFIG_SPI_BCM2835AUX=y CONFIG_GPIO_SYSFS=y CONFIG_SENSORS_RASPBERRYPI_HWMON=m CONFIG_THERMAL=y +CONFIG_BCM2711_THERMAL=y CONFIG_BCM2835_THERMAL=y CONFIG_WATCHDOG=y CONFIG_BCM2835_WDT=y +CONFIG_MFD_SYSCON=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_GPIO=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_DRM=y |