From c7a0ea28424dd826612be8e1534a6fcad9a9e1ea Mon Sep 17 00:00:00 2001 From: Tyler Wang Date: Mon, 28 Aug 2023 13:37:01 +0800 Subject: [PATCH] mb/google/rex/var/karis: Remove USB camera Karis use MIPI camera only, remove related settings. BUG=b:294155897 TEST=emerge-rex coreboot Change-Id: I96316d63c068c48b5bec75d3b4c5444d15fd985f Signed-off-by: Tyler Wang Reviewed-on: https://review.coreboot.org/c/coreboot/+/77510 Reviewed-by: Subrata Banik Tested-by: build bot (Jenkins) Reviewed-by: Jakub Czapiga Reviewed-by: Kapil Porwal --- .../google/rex/variants/karis/overridetree.cb | 26 +++---------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/mainboard/google/rex/variants/karis/overridetree.cb b/src/mainboard/google/rex/variants/karis/overridetree.cb index ebc0f37c37..04e21babb7 100644 --- a/src/mainboard/google/rex/variants/karis/overridetree.cb +++ b/src/mainboard/google/rex/variants/karis/overridetree.cb @@ -4,10 +4,6 @@ fw_config option MAX98360_ALC5682I_I2S 1 option MAX98363_CS42L42_SNDW 2 end - field UFC 6 7 - option UFC_USB 0 - option UFC_MIPI 1 - end field DB_USB 12 14 option USB_UNKNOWN 0 option USB3_PS8815 1 @@ -34,7 +30,6 @@ chip soc/intel/meteorlake register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC_SKIP)" # USB2_C1 register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC_SKIP)" # USB2_C0 - register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)" # USB Camera register "usb2_ports[8]" = "USB2_PORT_MID(OC3)" # Type-A Port A0 register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # M.2 Bluetooth @@ -316,15 +311,6 @@ chip soc/intel/meteorlake register "custom_pld" = "ACPI_PLD_TYPE_C(LEFT, LEFT, ACPI_PLD_GROUP(1, 1))" device ref usb2_port2 on end end - chip drivers/usb/acpi - register "desc" = ""USB2 Camera"" - register "type" = "UPC_TYPE_INTERNAL" - register "has_power_resource" = "1" - register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B09)" - device ref usb2_port6 on - probe UFC UFC_USB - end - end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port A0 (DB)"" register "type" = "UPC_TYPE_A" @@ -371,9 +357,7 @@ chip soc/intel/meteorlake register "cio2_prt[0]" = "4" register "cio2_prt[1]" = "0" - device generic 0 on - probe UFC UFC_MIPI - end + device generic 0 on end end end device ref i2c0 on @@ -475,9 +459,7 @@ chip soc/intel/meteorlake 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 20 on - probe UFC UFC_MIPI - end + device i2c 20 on end end chip drivers/intel/mipi_camera register "acpi_hid" = "ACPI_DT_NAMESPACE_HID" @@ -507,9 +489,7 @@ chip soc/intel/meteorlake register "off_seq.ops_cnt" = "1" register "off_seq.ops[0]" = "SEQ_OPS_GPIO_DISABLE(0, 0)" - device i2c 50 on - probe UFC UFC_MIPI - end + device i2c 50 on end end end #I2C5 device ref pcie_rp5 on