From 651e6d3c6b2c753d5ca3bbb48df8c60affe20f3d Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 23 Jun 2017 22:27:23 +0200 Subject: [PATCH 1/4] ARM: bcm2835_defconfig: Enable Mini UART console support Since pl011 is connected to the BT chip, we need to enable the Mini UART for serial console. Signed-off-by: Stefan Wahren Reviewed-by: Eric Anholt Signed-off-by: Eric Anholt --- arch/arm/configs/bcm2835_defconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 3ee9d78c412a..14bb27246b94 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -65,6 +65,11 @@ CONFIG_USB_NET_SMSC95XX=y CONFIG_ZD1211RW=y CONFIG_INPUT_EVDEV=y # CONFIG_LEGACY_PTYS is not set +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_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_TTY_PRINTK=y From 01bd2f0f1196ad3a7e6fb2f66551140923452d96 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 23 Jun 2017 22:27:25 +0200 Subject: [PATCH 2/4] ARM: bcm2835_defconfig: Increase CMA for VC4 The VC4 needs more memory than the default setting: cma: cma_alloc: alloc failed, req-size: 4096 pages, ret: -12 vc4-drm soc:gpu: failed to allocate buffer with size 16777216 So increase the value to 32 MB and fix this issue. Signed-off-by: Stefan Wahren Reviewed-by: Eric Anholt Signed-off-by: Eric Anholt --- arch/arm/configs/bcm2835_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 14bb27246b94..fe0603824650 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -55,6 +55,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=32 CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_CONSTANTS=y From 6235a80a5475d10ebef646c06cf7cf0f4aba688c Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 23 Jun 2017 22:27:26 +0200 Subject: [PATCH 3/4] ARM: bcm2835_defconfig: Enable wifi driver for RPi Zero W This enables the wifi driver for Raspberry Pi Zero W. We need to build this as a module otherwise the drivers tries to load the firmware before the root partition is mounted. Signed-off-by: Stefan Wahren Reviewed-by: Eric Anholt Signed-off-by: Eric Anholt --- arch/arm/configs/bcm2835_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index fe0603824650..43dab4890ad3 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -63,6 +63,7 @@ CONFIG_SCSI_SCAN_ASYNC=y CONFIG_NETDEVICES=y CONFIG_USB_USBNET=y CONFIG_USB_NET_SMSC95XX=y +CONFIG_BRCMFMAC=m CONFIG_ZD1211RW=y CONFIG_INPUT_EVDEV=y # CONFIG_LEGACY_PTYS is not set From 8f457cb291342d9ac04dbb8dc565619d220841f8 Mon Sep 17 00:00:00 2001 From: Markus Mayer Date: Wed, 9 Aug 2017 15:02:56 -0700 Subject: [PATCH 4/4] ARM: multi_v7_defconfig: add CONFIG_BRCMSTB_THERMAL Turn on CONFIG_BRCMSTB_THERMAL as module. Signed-off-by: Markus Mayer Signed-off-by: Florian Fainelli --- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 4d19c1b4b8e7..230f7fab2ff3 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -455,6 +455,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PWM_FAN=m CONFIG_SENSORS_INA2XX=m CONFIG_CPU_THERMAL=y +CONFIG_BRCMSTB_THERMAL=m CONFIG_ROCKCHIP_THERMAL=y CONFIG_RCAR_THERMAL=y CONFIG_ARMADA_THERMAL=y