diff --git a/src/mainboard/google/rex/variants/karis/gpio.c b/src/mainboard/google/rex/variants/karis/gpio.c index 0579bf8ba0..cc3aeb000e 100644 --- a/src/mainboard/google/rex/variants/karis/gpio.c +++ b/src/mainboard/google/rex/variants/karis/gpio.c @@ -101,10 +101,10 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPO(GPP_C01, 0, DEEP), /* GPP_C02 : SOC_TCHSCR_SPI_INT_STRAP ==> Component NC */ PAD_NC(GPP_C02, NONE), - /* GPP_C03 : [] ==> EN_WCAM_SENR_PWR */ - PAD_CFG_GPO_LOCK(GPP_C03, 0, LOCK_CONFIG), - /* GPP_C04 : [] ==> EN_WCAM_PWR */ - PAD_CFG_GPO_LOCK(GPP_C04, 0, LOCK_CONFIG), + /* GPP_C03 : [] ==> Test pad. */ + PAD_NC(GPP_C03, NONE), + /* GPP_C04 : net NC. */ + PAD_NC(GPP_C04, NONE), /* GPP_C05 : [] ==> WWAN_PERST_L_STRAP */ PAD_CFG_GPO(GPP_C05, 1, PLTRST), /* GPP_C06 : [] ==> SOC_TCHSCR_RPT_EN */ @@ -140,8 +140,8 @@ static const struct pad_config gpio_table[] = { /* GPP_C23 : [] ==> FP_RST_ODL */ PAD_CFG_GPO_LOCK(GPP_C23, 1, LOCK_CONFIG), - /* GPP_D00 : WCAM_MCLK_R */ - PAD_CFG_NF(GPP_D00, NONE, DEEP, NF1), + /* GPP_D00 : Not connected. */ + PAD_NC(GPP_D00, NONE), /* GPP_D01 : Not Connected */ PAD_NC(GPP_D01, NONE), /* GPP_D04 : [] ==> EN_SPKR */ @@ -357,8 +357,8 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NF(GPP_V12, NONE, DEEP, NF1), /* GPP_V14 : [] ==> SOC_WAKE_L */ PAD_CFG_NF(GPP_V14, NONE, DEEP, NF1), - /* GPP_V22 : [] ==> WCAM_RST_L */ - PAD_CFG_GPO(GPP_V22, 0, DEEP), + /* GPP_V22 : NC net. */ + PAD_NC(GPP_V22, NONE), /* GPP_V23 : [] ==> UCAM_RST_L */ PAD_CFG_GPO(GPP_V23, 0, DEEP), }; diff --git a/src/mainboard/google/rex/variants/karis/overridetree.cb b/src/mainboard/google/rex/variants/karis/overridetree.cb index aa69d6f9f3..ae30b6aa41 100644 --- a/src/mainboard/google/rex/variants/karis/overridetree.cb +++ b/src/mainboard/google/rex/variants/karis/overridetree.cb @@ -13,10 +13,6 @@ fw_config option UFC_USB 0 option UFC_MIPI 1 end - field WFC 8 9 - option WFC_USB 0 - option WFC_MIPI 1 - end field DB_USB 12 14 option USB_UNKNOWN 0 option USB3_PS8815 1 @@ -406,7 +402,6 @@ chip soc/intel/meteorlake device generic 0 on probe UFC UFC_MIPI - probe WFC WFC_MIPI end end end @@ -425,109 +420,6 @@ chip soc/intel/meteorlake probe AUDIO MAX98360_ALC5682I_I2S end end - chip drivers/intel/mipi_camera - register "acpi_hid" = ""OVTIDB10"" - register "acpi_uid" = "0" - register "acpi_name" = ""CAM0"" - register "chip_name" = ""Ov 13b10 Camera"" - register "device_type" = "INTEL_ACPI_CAMERA_SENSOR" - - register "ssdb.lanes_used" = "4" - register "ssdb.link_used" = "0" - register "ssdb.vcm_type" = "0x0C" - register "vcm_name" = ""VCM0"" - register "num_freq_entries" = "1" - register "link_freq[0]" = "560 * MHz" # 560 MHz - register "remote_name" = ""IPU0"" - register "max_dstate_for_probe" = "ACPI_DEVICE_SLEEP_D3_COLD" - - register "has_power_resource" = "1" - #Controls - register "clk_panel.clks[0].clknum" = "1" # IMGCLKOUT_1 - register "clk_panel.clks[0].freq" = "1" # FREQ_19_2_MHZ - - register "gpio_panel.gpio[0].gpio_num" = "GPP_C03" #EN_WCAM_SENR_PWR - register "gpio_panel.gpio[1].gpio_num" = "GPP_C04" #EN_WCAM_PWR - register "gpio_panel.gpio[2].gpio_num" = "GPP_V22" #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, 0)" - register "on_seq.ops[2]" = "SEQ_OPS_GPIO_ENABLE(1, 0)" - register "on_seq.ops[3]" = "SEQ_OPS_GPIO_DISABLE(2, 0)" - register "on_seq.ops[4]" = "SEQ_OPS_GPIO_ENABLE(2, 10)" - - #_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 - end - end - chip drivers/intel/mipi_camera - register "acpi_uid" = "2" - register "acpi_name" = ""VCM0"" - register "chip_name" = ""DW9714 VCM"" - register "device_type" = "INTEL_ACPI_CAMERA_VCM" - - register "vcm_compat" = ""dongwoon,dw9714"" - - register "max_dstate_for_probe" = "ACPI_DEVICE_SLEEP_D0" - - register "has_power_resource" = "1" - - #Controls - register "gpio_panel.gpio[0].gpio_num" = "GPP_C04" #EN_WCAM_PWR - - #_ON - register "on_seq.ops_cnt" = "1" - register "on_seq.ops[0]" = "SEQ_OPS_GPIO_ENABLE(0, 0)" - - #_OFF - register "off_seq.ops_cnt" = "1" - register "off_seq.ops[0]" = "SEQ_OPS_GPIO_DISABLE(0, 0)" - - device i2c 0C on - probe WFC WFC_MIPI - end - end - chip drivers/intel/mipi_camera - register "acpi_uid" = "1" - register "acpi_name" = ""NVM0"" - register "chip_name" = ""ST M24C64X"" - register "device_type" = "INTEL_ACPI_CAMERA_NVM" - - register "nvm_compat" = ""atmel,24c64"" - - register "nvm_size" = "0x2000" - register "nvm_pagesize" = "0x01" - register "nvm_readonly" = "0x01" - register "nvm_width" = "0x10" - - register "max_dstate_for_probe" = "ACPI_DEVICE_SLEEP_D0" - - register "has_power_resource" = "1" - - #Controls - register "gpio_panel.gpio[0].gpio_num" = "GPP_C04" #EN_WCAM_PWR - - #_ON - register "on_seq.ops_cnt" = "1" - register "on_seq.ops[0]" = "SEQ_OPS_GPIO_ENABLE(0, 0)" - - #_OFF - register "off_seq.ops_cnt" = "1" - register "off_seq.ops[0]" = "SEQ_OPS_GPIO_DISABLE(0, 0)" - - device i2c 50 on - probe WFC WFC_MIPI - end - end end #I2C0 device ref i2c1 on chip drivers/i2c/hid