From 1e0ed73b2ee069946d6dce3073bc3d16095559d8 Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <pcc@google.com>
Date: Tue, 1 Feb 2022 16:18:49 -0800
Subject: [PATCH] ANDROID: Enable SM8450 drivers and DTB in the db845c config

Bug: 217455793
Change-Id: I710c1e40161bb49ad68ae7ef8804fa25c7b8a232
Signed-off-by: Peter Collingbourne <pcc@google.com>
---
 BUILD.bazel                            | 4 ++++
 arch/arm64/configs/db845c_gki.fragment | 4 ++++
 build.config.db845c                    | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/BUILD.bazel b/BUILD.bazel
index 9d1aa6147a6f..52d361f3e9ca 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -41,6 +41,7 @@ define_db845c(
     outs = aarch64_gz_outs + [
         "arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb",
         "arch/arm64/boot/dts/qcom/sdm845-db845c.dtb",
+        "arch/arm64/boot/dts/qcom/sm8450-qrd.dtb",
     ],
     module_outs = [
         # keep sorted
@@ -58,6 +59,7 @@ define_db845c(
         "drivers/clk/qcom/dispcc-sm8250.ko",
         "drivers/clk/qcom/gcc-sdm845.ko",
         "drivers/clk/qcom/gcc-sm8250.ko",
+        "drivers/clk/qcom/gcc-sm8450.ko",
         "drivers/clk/qcom/gpucc-sdm845.ko",
         "drivers/clk/qcom/gpucc-sm8250.ko",
         "drivers/clk/qcom/lpass-gfm-sm8250.ko",
@@ -93,6 +95,7 @@ define_db845c(
         "drivers/interconnect/qcom/icc-rpmh.ko",
         "drivers/interconnect/qcom/qnoc-sdm845.ko",
         "drivers/interconnect/qcom/qnoc-sm8250.ko",
+        "drivers/interconnect/qcom/qnoc-sm8450.ko",
         "drivers/iommu/arm/arm-smmu/arm_smmu.ko",
         "drivers/irqchip/qcom-pdc.ko",
         "drivers/mailbox/qcom-apcs-ipc-mailbox.ko",
@@ -122,6 +125,7 @@ define_db845c(
         "drivers/pinctrl/qcom/pinctrl-msm.ko",
         "drivers/pinctrl/qcom/pinctrl-sdm845.ko",
         "drivers/pinctrl/qcom/pinctrl-sm8250.ko",
+        "drivers/pinctrl/qcom/pinctrl-sm8450.ko",
         "drivers/pinctrl/qcom/pinctrl-spmi-gpio.ko",
         "drivers/pinctrl/qcom/pinctrl-spmi-mpp.ko",
         "drivers/power/reset/qcom-pon.ko",
diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment
index 10dfaf53b551..f95f18a13bdc 100644
--- a/arch/arm64/configs/db845c_gki.fragment
+++ b/arch/arm64/configs/db845c_gki.fragment
@@ -301,3 +301,7 @@ CONFIG_INTERCONNECT_QCOM_SM8250=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_QCOM_CPR=m
 CONFIG_QCOM_SPM=m
+# XXX SM8450 bits start here
+CONFIG_PINCTRL_SM8450=m
+CONFIG_SM_GCC_8450=m
+CONFIG_INTERCONNECT_QCOM_SM8450=m
diff --git a/build.config.db845c b/build.config.db845c
index 08789463ccf9..762afdb7419e 100644
--- a/build.config.db845c
+++ b/build.config.db845c
@@ -10,6 +10,7 @@ POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG
 MAKE_GOALS="${MAKE_GOALS}
 qcom/sdm845-db845c.dtb
 qcom/qrb5165-rb5.dtb
+qcom/sm8450-qrd.dtb
 Image.gz
 "
 
@@ -17,4 +18,5 @@ FILES="${FILES}
 arch/arm64/boot/Image.gz
 arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
 arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb
+arch/arm64/boot/dts/qcom/sm8450-qrd.dtb
 "