From b164ce27faf0ed1654573da8ca2f024203adf4ef Mon Sep 17 00:00:00 2001
From: Danesh Petigara <danesh.petigara@broadcom.com>
Date: Mon, 30 Jan 2023 11:41:26 -0800
Subject: [PATCH] ANDROID: gki_defconfig: Enable Broadcom STB SoCs

Enable configs required for Broadcom Set Top Box SoCs.

Also explicitly disable the Broadcom Set Top Box SoC
drivers that we wish to build as loadable modules.

Bug: 343006993
Change-Id: Ia3e542d0eeb519539aba2990fb4eb4eb2970a867
Signed-off-by: Danesh Petigara <danesh.petigara@broadcom.com>
---
 arch/arm64/configs/gki_defconfig | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 7b4e76e57af5..05b3b181215b 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -46,6 +46,8 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PROFILING=y
 CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_BCM=y
+CONFIG_ARCH_BRCMSTB=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_TEGRA=y
@@ -83,6 +85,7 @@ CONFIG_CPU_FREQ_TIMES=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_ARM_SCPI_CPUFREQ=y
+# CONFIG_ARM_BRCMSTB_AVS_CPUFREQ is not set
 CONFIG_ARM_SCMI_CPUFREQ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
@@ -299,12 +302,14 @@ CONFIG_PCIEAER=y
 CONFIG_PCI_IOV=y
 # CONFIG_VGA_ARB is not set
 CONFIG_PCI_HOST_GENERIC=y
+# CONFIG_PCIE_BRCMSTB is not set
 CONFIG_PCIE_DW_PLAT_EP=y
 CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_KIRIN=y
 CONFIG_PCI_ENDPOINT=y
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_CACHE is not set
+# CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_SUN50I_DE2_BUS is not set
 # CONFIG_SUNXI_RSB is not set
 CONFIG_ARM_SCMI_PROTOCOL=y
@@ -396,6 +401,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=0
 CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_BCM7271 is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -414,10 +420,12 @@ CONFIG_HW_RANDOM=y
 # CONFIG_DEVPORT is not set
 # CONFIG_I2C_COMPAT is not set
 # CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_BRCMSTB is not set
 CONFIG_I3C=y
 CONFIG_SPI=y
 CONFIG_SPI_MEM=y
 # CONFIG_SPMI_MSM_PMIC_ARB is not set
+# CONFIG_PINCTRL_BCM2835 is not set
 # CONFIG_PINCTRL_SUN8I_H3_R is not set
 # CONFIG_PINCTRL_SUN50I_A64 is not set
 # CONFIG_PINCTRL_SUN50I_A64_R is not set
@@ -428,7 +436,9 @@ CONFIG_SPI_MEM=y
 # CONFIG_PINCTRL_SUN50I_H6_R is not set
 # CONFIG_PINCTRL_SUN50I_H616 is not set
 # CONFIG_PINCTRL_SUN50I_H616_R is not set
+# CONFIG_GPIO_BRCMSTB is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_POWER_RESET_BRCMSTB is not set
 CONFIG_POWER_RESET_HISI=y
 CONFIG_POWER_RESET_SYSCON=y
 # CONFIG_HWMON is not set
@@ -512,6 +522,7 @@ CONFIG_USB_DWC3=y
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_GADGET=y
+# CONFIG_USB_BDC_UDC is not set
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_CONFIGFS_SERIAL=y
@@ -538,6 +549,7 @@ CONFIG_MMC=y
 CONFIG_MMC_CRYPTO=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
+# CONFIG_MMC_SDHCI_BRCMSTB is not set
 CONFIG_SCSI_UFSHCD=y
 CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_UFS_CRYPTO=y
@@ -551,6 +563,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_TRANSIENT=y
 CONFIG_EDAC=y
 CONFIG_RTC_CLASS=y
+# CONFIG_RTC_DRV_BRCMSTB is not set
 CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_DMABUF_HEAPS=y
@@ -569,6 +582,7 @@ CONFIG_VHOST_VSOCK=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 CONFIG_COMMON_CLK_SCPI=y
+# CONFIG_CLK_BCM2835 is not set
 # CONFIG_SUNXI_CCU is not set
 CONFIG_HWSPINLOCK=y
 # CONFIG_SUN50I_ERRATUM_UNKNOWN1 is not set
@@ -576,6 +590,8 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 CONFIG_REMOTEPROC=y
 CONFIG_REMOTEPROC_CDEV=y
 CONFIG_RPMSG_CHAR=y
+CONFIG_SOC_BRCMSTB=y
+# CONFIG_BRCMSTB_PM is not set
 CONFIG_QCOM_GENI_SE=y
 CONFIG_ARCH_TEGRA_234_SOC=y
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
@@ -588,6 +604,12 @@ CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_TRIGGER=y
 CONFIG_PWM=y
+# CONFIG_BCM7038_L1_IRQ is not set
+# CONFIG_BCM7120_L2_IRQ is not set
+# CONFIG_BRCMSTB_L2_IRQ is not set
+# CONFIG_RESET_BRCMSTB is not set
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
+# CONFIG_PHY_BRCM_USB is not set
 CONFIG_POWERCAP=y
 CONFIG_IDLE_INJECT=y
 CONFIG_ANDROID_BINDER_IPC=y