Attention is currently required from: YH Lin, Maulik V Vaghela, Rizwan Qureshi, Tim Wawrzynczak, EricR Lai. Hello build bot (Jenkins), YH Lin, Maulik V Vaghela, Tim Wawrzynczak, Rizwan Qureshi, EricR Lai,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/56129
to review the following change.
Change subject: Revert "mb/google/brya0: Enable MIPI UFC" ......................................................................
Revert "mb/google/brya0: Enable MIPI UFC"
This reverts commit bee9d6028edd939acacb48f254ea81ea5077a54d.
Reason for revert: Test, Donot merge
Change-Id: I369cca6998295e26b585b3448214e4739a896e9f --- M src/mainboard/google/brya/variants/brya0/overridetree.cb 1 file changed, 2 insertions(+), 66 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/56129/1
diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb index 5bb93e5..0fc782a 100644 --- a/src/mainboard/google/brya/variants/brya0/overridetree.cb +++ b/src/mainboard/google/brya/variants/brya0/overridetree.cb @@ -126,26 +126,7 @@ register "cio2_lanes_used" = "{4}" # 4 CSI Camera lanes are used register "cio2_lane_endpoint[0]" = ""^I2C0.CAM0"" register "cio2_prt[0]" = "2" - device generic 0 on - # MIPI lanes are split between UFC and WFC depending on - # whether the UFC is USB or MIPI hence probing UFC_USB - probe UFC UFC_USB - end - end - chip drivers/intel/mipi_camera - register "acpi_uid" = "0x50000" - register "acpi_name" = ""IPU0"" - register "device_type" = "INTEL_ACPI_CAMERA_CIO2" - - register "cio2_num_ports" = "2" - register "cio2_lanes_used" = "{4,2}" # 4 and 2 CSI Camera lanes are used - register "cio2_lane_endpoint[0]" = ""^I2C0.CAM0"" - register "cio2_lane_endpoint[1]" = ""^I2C2.CAM1"" - register "cio2_prt[0]" = "2" - register "cio2_prt[1]" = "1" - device generic 0 on - probe UFC UFC_MIPI_5675 - end + device generic 0 on end end end device ref cnvi_wifi on @@ -420,49 +401,6 @@ register "reg_adv_ctrl20" = "0xf0" device i2c 2C on end end - chip drivers/intel/mipi_camera - register "acpi_hid" = ""OVTI5675"" - register "acpi_uid" = "0" - register "acpi_name" = ""CAM1"" - register "chip_name" = ""Ov 5675 Camera"" - register "device_type" = "INTEL_ACPI_CAMERA_SENSOR" - - register "ssdb.lanes_used" = "2" - register "ssdb.link_used" = "1" - register "ssdb.vcm_type" = "0x0C" - register "vcm_name" = ""VCM0"" - register "num_freq_entries" = "1" - register "link_freq[0]" = "DEFAULT_LINK_FREQ" - register "remote_name" = ""IPU0"" - - register "has_power_resource" = "1" - #Controls - register "clk_panel.clks[0].clknum" = "IMGCLKOUT_2" - register "clk_panel.clks[0].freq" = "FREQ_19_2_MHZ" - - register "gpio_panel.gpio[0].gpio_num" = "GPP_C3" #PP3300_FCAM_X - register "gpio_panel.gpio[1].gpio_num" = "GPP_A17" #EN_UCAM_PWR - register "gpio_panel.gpio[2].gpio_num" = "GPP_F20" #reset - - #_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 UFC UFC_MIPI_5675 - end - end end device ref i2c3 on end device ref i2c5 on @@ -600,9 +538,7 @@ chip drivers/usb/acpi register "desc" = ""USB2 Camera"" register "type" = "UPC_TYPE_INTERNAL" - device ref usb2_port6 on - probe UFC UFC_USB - end + device ref usb2_port6 on end end chip drivers/usb/acpi register "desc" = ""USB2 Type-A Port (MLB)""