From 4e4bfd0293e32da8b3ca67b4645b80023cdf7928 Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Wed, 15 Apr 2020 14:46:14 -0700 Subject: [PATCH 1/2] arm64: defconfig: Enable Haven ctrl on genericarmv8 Enable Haven ctrl on genericarmv8 defconfig. Change-Id: I4d8a2365fa595611f8f726a9f3ed45b07f86cb40 Signed-off-by: Elliot Berman --- arch/arm64/configs/vendor/genericarmv8-64_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig index afe70a813ffa..bb69e6438af0 100644 --- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig +++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig @@ -332,6 +332,8 @@ CONFIG_VFIO=y CONFIG_VFIO_PCI=y CONFIG_VIRT_DRIVERS=y CONFIG_HAVEN_DRIVERS=y +CONFIG_HH_CTRL=y +# CONFIG_HH_DISABLE_UART is not set CONFIG_HH_MSGQ=y CONFIG_HH_RM_DRV=y CONFIG_HH_DBL=y From ab63cdb084c043a96886524e04dfc12e62606618 Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Wed, 15 Apr 2020 15:36:54 -0700 Subject: [PATCH 2/2] arm64: defconfig: Enable Haven ctrl for Lahaina Enable Haven ctrl nodes for Lahaina. Keep Haven's UART enabled on debug defconfig. Change-Id: I288a5458a17edd583169bd29bd39376475617e6b Signed-off-by: Elliot Berman --- arch/arm64/configs/vendor/lahaina_GKI.config | 1 + arch/arm64/configs/vendor/lahaina_debug.config | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config index c86162704be6..6e7b63cda0b0 100644 --- a/arch/arm64/configs/vendor/lahaina_GKI.config +++ b/arch/arm64/configs/vendor/lahaina_GKI.config @@ -144,6 +144,7 @@ CONFIG_QCOM_PROXY_OF_CONSUMER=m CONFIG_BTFM_SLIM=m CONFIG_VIRT_DRIVERS=y CONFIG_HAVEN_DRIVERS=y +CONFIG_HH_CTRL=m CONFIG_HH_MSGQ=m CONFIG_HH_RM_DRV=m CONFIG_HH_DBL=m diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config index 96e0a96afeeb..3f202aceb681 100644 --- a/arch/arm64/configs/vendor/lahaina_debug.config +++ b/arch/arm64/configs/vendor/lahaina_debug.config @@ -69,3 +69,4 @@ CONFIG_DYNAMIC_DEBUG=y CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG=y CONFIG_SPI_SPIDEV=y CONFIG_I2C_CHARDEV=y +# CONFIG_HH_DISABLE_UART is not set