mb/google/nissa/var/quandiso: Disable WCAM support
Quandiso doesn't support mipi WCAM.
BUG=b:296506936
BRANCH=firmware-nissa-15217.B
TEST=emerge-nissa coreboot chromeos-bootimage
Change-Id: I8a166d0bb1c034f2e3a5af7456500abd078e93f9
Signed-off-by: Robert Chen <robert.chen@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/77389
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name
index 97cfc9a0..ee3987b 100644
--- a/src/mainboard/google/brya/Kconfig.name
+++ b/src/mainboard/google/brya/Kconfig.name
@@ -293,7 +293,6 @@
select BOARD_GOOGLE_BASEBOARD_NISSA
select CHROMEOS_WIFI_SAR if CHROMEOS
select DRIVERS_GENERIC_GPIO_KEYS
- select DRIVERS_INTEL_MIPI_CAMERA
select HAVE_WWAN_POWER_SEQUENCE
config BOARD_GOOGLE_REDRIX
diff --git a/src/mainboard/google/brya/variants/quandiso/fw_config.c b/src/mainboard/google/brya/variants/quandiso/fw_config.c
index 0f08a43..5efde12 100644
--- a/src/mainboard/google/brya/variants/quandiso/fw_config.c
+++ b/src/mainboard/google/brya/variants/quandiso/fw_config.c
@@ -17,21 +17,6 @@
PAD_NC(GPP_H23, NONE),
};
-static const struct pad_config wfc_disable_pads[] = {
- /* D3 : WCAM_RST_L */
- PAD_NC_LOCK(GPP_D3, NONE, LOCK_CONFIG),
- /* D15 : EN_PP2800_WCAM_X */
- PAD_NC_LOCK(GPP_D15, NONE, LOCK_CONFIG),
- /* D16 : EN_PP1800_PP1200_WCAM_X */
- PAD_NC_LOCK(GPP_D16, NONE, LOCK_CONFIG),
- /* H22 : WCAM_MCLK_R */
- PAD_NC(GPP_H22, NONE),
- /* R6 : DMIC_WCAM_CLK_R */
- PAD_NC(GPP_R6, NONE),
- /* R7 : DMIC_WCAM_DATA */
- PAD_NC(GPP_R7, NONE),
-};
-
static const struct pad_config emmc_disable_pads[] = {
/* I7 : EMMC_CMD */
PAD_NC(GPP_I7, NONE),
@@ -78,11 +63,6 @@
gpio_padbased_override(padbased_table, lte_disable_pads,
ARRAY_SIZE(lte_disable_pads));
}
- if (fw_config_probe(FW_CONFIG(WFC, WFC_ABSENT))) {
- printk(BIOS_INFO, "Disable MIPI WFC GPIO pins.\n");
- gpio_padbased_override(padbased_table, wfc_disable_pads,
- ARRAY_SIZE(wfc_disable_pads));
- }
if (fw_config_is_provisioned() && !fw_config_probe(FW_CONFIG(STORAGE, STORAGE_EMMC))) {
printk(BIOS_INFO, "Disable eMMC GPIO pins.\n");
gpio_padbased_override(padbased_table, emmc_disable_pads,
diff --git a/src/mainboard/google/brya/variants/quandiso/gpio.c b/src/mainboard/google/brya/variants/quandiso/gpio.c
index e2f2aca..ab0a876 100644
--- a/src/mainboard/google/brya/variants/quandiso/gpio.c
+++ b/src/mainboard/google/brya/variants/quandiso/gpio.c
@@ -16,10 +16,16 @@
/* A22 : GPP_A22 ==> USB_C1_AUX_DC_N */
PAD_CFG_GPO(GPP_A22, 1, DEEP),
+ /* D3 : WCAM_RST_L ==> NC */
+ PAD_NC_LOCK(GPP_D3, NONE, LOCK_CONFIG),
/* D6 : WWAN_EN */
PAD_CFG_GPO(GPP_D6, 1, DEEP),
/* D8 : SD_CLKREQ_ODL ==> NC */
PAD_NC(GPP_D8, NONE),
+ /* D15 : EN_PP2800_WCAM_X ==> NC */
+ PAD_NC_LOCK(GPP_D15, NONE, LOCK_CONFIG),
+ /* D16 : EN_PP1800_PP1200_WCAM_X ==> NC */
+ PAD_NC_LOCK(GPP_D16, NONE, LOCK_CONFIG),
/* F6 : CNV_PA_BLANKING ==> NC */
PAD_NC(GPP_F6, NONE),
diff --git a/src/mainboard/google/brya/variants/quandiso/overridetree.cb b/src/mainboard/google/brya/variants/quandiso/overridetree.cb
index 6d2b47f..2ff69fb 100644
--- a/src/mainboard/google/brya/variants/quandiso/overridetree.cb
+++ b/src/mainboard/google/brya/variants/quandiso/overridetree.cb
@@ -222,20 +222,6 @@
device generic 0 on end
end
end
- device ref ipu on
- chip drivers/intel/mipi_camera
- register "acpi_uid" = "0x50000"
- register "acpi_name" = ""IPU0""
- register "device_type" = "INTEL_ACPI_CAMERA_CIO2"
-
- register "cio2_num_ports" = "1"
- register "cio2_lanes_used" = "{4}" # 4 CSI Camera lanes are used
- register "cio2_lane_endpoint[0]" = ""^I2C2.CAM0""
- register "cio2_prt[0]" = "1"
- device generic 0 on end
- end
- probe WFC WFC_MIPI_OVTI8856
- end
device ref cnvi_wifi on
chip drivers/wifi/generic
register "enable_cnvi_ddr_rfim" = "true"
@@ -304,82 +290,6 @@
end
end
end
- device ref i2c2 on
- chip drivers/intel/mipi_camera
- register "acpi_hid" = ""OVTI8856""
- register "acpi_uid" = "0"
- register "acpi_name" = ""CAM0""
- register "chip_name" = ""Ov 8856 Camera""
- register "device_type" = "INTEL_ACPI_CAMERA_SENSOR"
- register "has_power_resource" = "1"
- register "max_dstate_for_probe" = "ACPI_DEVICE_SLEEP_D3_COLD"
-
- register "ssdb.lanes_used" = "4"
- register "ssdb.link_used" = "1"
- register "ssdb.vcm_type" = "0x0C"
- register "vcm_name" = ""VCM0""
- register "num_freq_entries" = "2"
- register "link_freq[0]" = "360000000"
- register "link_freq[1]" = "180000000"
- register "remote_name" = ""IPU0""
-
- #Controls
- register "clk_panel.clks[0].clknum" = "IMGCLKOUT_3"
- register "clk_panel.clks[0].freq" = "FREQ_19_2_MHZ"
-
- register "gpio_panel.gpio[0].gpio_num" = "GPP_D15" # EN_PP2800_WCAM_X
- register "gpio_panel.gpio[1].gpio_num" = "GPP_D16" # EN_PP1800_PP1200_WCAM_X
- register "gpio_panel.gpio[2].gpio_num" = "GPP_D3" # WCAM_RST_L
-
- #_ON
- register "on_seq.ops_cnt" = "5"
- register "on_seq.ops[0]" = "SEQ_OPS_CLK_ENABLE(0, 0)"
- register "on_seq.ops[1]" = "SEQ_OPS_GPIO_ENABLE(0, 5)"
- register "on_seq.ops[2]" = "SEQ_OPS_GPIO_ENABLE(1, 5)"
- register "on_seq.ops[3]" = "SEQ_OPS_GPIO_DISABLE(2, 5)"
- register "on_seq.ops[4]" = "SEQ_OPS_GPIO_ENABLE(2, 5)"
-
- #_OFF
- register "off_seq.ops_cnt" = "4"
- register "off_seq.ops[0]" = "SEQ_OPS_CLK_DISABLE(0, 0)"
- register "off_seq.ops[1]" = "SEQ_OPS_GPIO_DISABLE(2, 0)"
- register "off_seq.ops[2]" = "SEQ_OPS_GPIO_DISABLE(1, 0)"
- register "off_seq.ops[3]" = "SEQ_OPS_GPIO_DISABLE(0, 0)"
-
- device i2c 36 on
- probe WFC WFC_MIPI_OVTI8856
- end
- end
- chip drivers/intel/mipi_camera
- register "acpi_uid" = "3"
- register "acpi_name" = ""VCM0""
- register "chip_name" = ""DW AF DAC""
- register "device_type" = "INTEL_ACPI_CAMERA_VCM"
-
- register "vcm_compat" = ""dongwoon,dw9714""
-
- device i2c 0C on
- probe WFC WFC_MIPI_OVTI8856
- end
- end
- chip drivers/intel/mipi_camera
- register "acpi_hid" = "ACPI_DT_NAMESPACE_HID"
- register "acpi_uid" = "1"
- register "acpi_name" = ""NVM0""
- register "chip_name" = ""GT24C08""
- register "device_type" = "INTEL_ACPI_CAMERA_NVM"
-
- register "nvm_size" = "0x400"
- register "nvm_pagesize" = "1"
- register "nvm_readonly" = "1"
- register "nvm_width" = "0x08"
- register "nvm_compat" = ""atmel,24c08""
-
- device i2c 50 on
- probe WFC WFC_MIPI_OVTI8856
- end
- end
- end
device ref i2c3 on
chip drivers/i2c/generic
register "hid" = ""RTL5682""