From 0a923739ee43bf2c84b8afce88f469f8c4f624eb Mon Sep 17 00:00:00 2001 From: Scott Mansell Date: Tue, 9 Jul 2019 03:08:42 +1200 Subject: [PATCH] configs: arm64/bcm2711: Enable V3D This allows for 3d acceleration with a 64bit kernel on the Pi 4. ARCH_BCM wasn't defined at all for arm64, so I copied it over from arm. The PM driver is now default for BCM2835 --- arch/arm64/Kconfig.platforms | 23 ++++++++++++++++------- arch/arm64/configs/bcm2711_defconfig | 2 ++ drivers/soc/bcm/Kconfig | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index e9bdec0ead72fa..3c04f4b9136da9 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -16,6 +16,13 @@ config ARCH_ALPINE This enables support for the Annapurna Labs Alpine Soc family. +menuconfig ARCH_BCM + bool "Broadcom SoC Support" + help + This enables support for Broadcom ARM based SoC chips + +if ARCH_BCM + config ARCH_BCM2835 bool "Broadcom BCM2835 family" select TIMER_OF @@ -37,6 +44,15 @@ config ARCH_BCM_IPROC help This enables support for Broadcom iProc based SoCs +config ARCH_BRCMSTB + bool "Broadcom Set-Top-Box SoCs" + select BRCMSTB_L2_IRQ + select GENERIC_IRQ_CHIP + help + This enables support for Broadcom's ARMv8 Set Top Box SoCs + +endif + config ARCH_BERLIN bool "Marvell Berlin SoC Family" select DW_APB_ICTL @@ -45,13 +61,6 @@ config ARCH_BERLIN help This enables support for Marvell Berlin SoC Family -config ARCH_BRCMSTB - bool "Broadcom Set-Top-Box SoCs" - select BRCMSTB_L2_IRQ - select GENERIC_IRQ_CHIP - help - This enables support for Broadcom's ARMv8 Set Top Box SoCs - config ARCH_EXYNOS bool "ARMv8 based Samsung Exynos SoC family" select COMMON_CLK_SAMSUNG diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index 3bcce6daa9efd4..4dd49d1614d5cc 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -27,6 +27,7 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_EMBEDDED=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y +CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM2835=y CONFIG_PCI=y CONFIG_PCIE_BRCMSTB=y @@ -790,6 +791,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_UDL=m CONFIG_DRM_PANEL_SIMPLE=m CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m +CONFIG_DRM_V3D=m CONFIG_DRM_VC4=m CONFIG_DRM_TINYDRM=m CONFIG_TINYDRM_MI0283QT=m diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig index c24f505ecd6575..902b496d31375a 100644 --- a/drivers/soc/bcm/Kconfig +++ b/drivers/soc/bcm/Kconfig @@ -3,6 +3,7 @@ menu "Broadcom SoC drivers" config BCM2835_POWER bool "BCM2835 power domain driver" depends on ARCH_BCM2835 || (COMPILE_TEST && OF) + default y if ARCH_BCM2835 select PM_GENERIC_DOMAINS if PM select RESET_CONTROLLER help