GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/brya/var/skolas: sync brya0 and skolas FW_CONFIG 

1) Make the skolas FW_CONFIG field defintions compatible with the
brya0 FW_CONFIG field definitions to support skolas being a SKU of
brya0, and in sync with the config.star definitions for the FW_CONFIG
field for brya0 and skolas.

 - brya0 specific changes:
    1) remove WFC_MIPI_OVTI5675 definition (was 1)
    2) redefine WFC_MIPI_OVTI8856 from 2 to 1
    3) define new WFC_MIPI_KBAE350 camera type as 2

 - skolas specific changes:
    1) remove WFC_MIPI_OVTI5675 definition (was 1)
    2) redefine WFC_MIPI_OVTI8856 from 2 to 1
    3) define new WFC_MIPI_KBAE350 camera type as 2

2) Add support back in for UFC_MIPI_OVTI5675 in brya0 now that FW_CONFIG
defines are fixed.

BUG=b:248126749
TEST="emerge-brya coreboot chromeos-bootimage", flash brya0 and
verify it boots successfully to kernel and that WFC, UFC, and audio
works on skolas and brya0.

Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Change-Id: I3be26e0a05f4dc08e5dc3f6ef7b71bdd8fd4f859
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67929
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: YH Lin <yueherngl@google.com>
This commit is contained in:
Nick Vaccaro 2022-09-30 16:17:28 -07:00
parent f0d5188cf5
commit 01ab9b11d8
2 changed files with 172 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/mainboard/google/brya/variants/brya0/overridetree.cb
View File

@ -30,8 +30,8 @@ fw_config
end end
field WFC 15 16 field WFC 15 16
option WFC_ABSENT 0 option WFC_ABSENT 0
option WFC_MIPI_OVTI5675 1 option WFC_MIPI_OVTI8856 1
option WFC_MIPI_OVTI8856 2 option WFC_MIPI_KBAE350 2
end end
field HPS 17 17 field HPS 17 17
option HPS_ABSENT 0 option HPS_ABSENT 0
@ -379,7 +379,9 @@ chip soc/intel/alderlake
register "off_seq.ops[2]" = "SEQ_OPS_GPIO_DISABLE(1, 0)" register "off_seq.ops[2]" = "SEQ_OPS_GPIO_DISABLE(1, 0)"
register "off_seq.ops[3]" = "SEQ_OPS_GPIO_DISABLE(0, 0)" register "off_seq.ops[3]" = "SEQ_OPS_GPIO_DISABLE(0, 0)"
device i2c 10 on end device i2c 10 on
probe WFC WFC_MIPI_OVTI8856
end
end end
chip drivers/intel/mipi_camera chip drivers/intel/mipi_camera
register "acpi_uid" = "2" register "acpi_uid" = "2"
@ -390,7 +392,9 @@ chip soc/intel/alderlake
register "pr0" = ""\\_SB.PCI0.I2C0.CAM0.PRIC"" register "pr0" = ""\\_SB.PCI0.I2C0.CAM0.PRIC""
register "vcm_compat" = ""dongwoon,dw9768"" register "vcm_compat" = ""dongwoon,dw9768""
device i2c 0C on end device i2c 0C on
probe WFC WFC_MIPI_OVTI8856
end
end end
chip drivers/intel/mipi_camera chip drivers/intel/mipi_camera
register "acpi_uid" = "1" register "acpi_uid" = "1"
@ -406,7 +410,84 @@ chip soc/intel/alderlake
register "nvm_readonly" = "0x01" register "nvm_readonly" = "0x01"
register "nvm_width" = "0x10" register "nvm_width" = "0x10"
device i2c 58 on end device i2c 58 on
probe WFC WFC_MIPI_OVTI8856
end
end
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 "ssdb.lanes_used" = "4"
register "ssdb.link_used" = "0"
register "ssdb.vcm_type" = "0x0C"
register "vcm_name" = ""VCM0""
register "num_freq_entries" = "2"
register "link_freq[0]" = "360 * MHz" # 360 MHz
register "link_freq[1]" = "180 * MHz" # 180 MHz
register "remote_name" = ""IPU0""
register "has_power_resource" = "1"
#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" #power_enable_2p8
register "gpio_panel.gpio[1].gpio_num" = "GPP_D16" #power_enable_1p2
register "gpio_panel.gpio[2].gpio_num" = "GPP_D3" #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 WFC WFC_MIPI_KBAE350
end
end
chip drivers/intel/mipi_camera
register "acpi_uid" = "2"
register "acpi_name" = ""VCM0""
register "chip_name" = ""DW AF DAC""
register "device_type" = "INTEL_ACPI_CAMERA_VCM"
register "pr0" = ""\\_SB.PCI0.I2C0.CAM0.PRIC""
register "vcm_compat" = ""dongwoon,dw9714""
device i2c 0C on
probe WFC WFC_MIPI_KBAE350
end
end
chip drivers/intel/mipi_camera
register "acpi_uid" = "1"
register "acpi_name" = ""NVM0""
register "chip_name" = ""GT24C08""
register "device_type" = "INTEL_ACPI_CAMERA_NVM"
register "pr0" = ""\\_SB.PCI0.I2C0.CAM0.PRIC""
register "nvm_compat" = ""atmel,24c08""
register "nvm_size" = "0x2000"
register "nvm_pagesize" = "0x01"
register "nvm_readonly" = "0x01"
register "nvm_width" = "0x10"
device i2c 50 on
probe WFC WFC_MIPI_KBAE350
end
end end
end #I2C0 end #I2C0
device ref i2c1 on device ref i2c1 on

91
src/mainboard/google/brya/variants/skolas/overridetree.cb
View File

@ -30,8 +30,8 @@ fw_config
end end
field WFC 15 16 field WFC 15 16
option WFC_ABSENT 0 option WFC_ABSENT 0
option WFC_MIPI_OVTI5675 1 option WFC_MIPI_OVTI8856 1
option WFC_MIPI_OVTI8856 2 option WFC_MIPI_KBAE350 2
end end
field HPS 17 17 field HPS 17 17
option HPS_ABSENT 0 option HPS_ABSENT 0
@ -379,7 +379,84 @@ chip soc/intel/alderlake
register "off_seq.ops[2]" = "SEQ_OPS_GPIO_DISABLE(1, 0)" register "off_seq.ops[2]" = "SEQ_OPS_GPIO_DISABLE(1, 0)"
register "off_seq.ops[3]" = "SEQ_OPS_GPIO_DISABLE(0, 0)" register "off_seq.ops[3]" = "SEQ_OPS_GPIO_DISABLE(0, 0)"
device i2c 36 on end device i2c 10 on
probe WFC WFC_MIPI_OVTI8856
end
end
chip drivers/intel/mipi_camera
register "acpi_uid" = "2"
register "acpi_name" = ""VCM0""
register "chip_name" = ""DW9768 VCM""
register "device_type" = "INTEL_ACPI_CAMERA_VCM"
register "pr0" = ""\\_SB.PCI0.I2C0.CAM0.PRIC""
register "vcm_compat" = ""dongwoon,dw9768""
device i2c 0C on
probe WFC WFC_MIPI_OVTI8856
end
end
chip drivers/intel/mipi_camera
register "acpi_uid" = "1"
register "acpi_name" = ""NVM0""
register "chip_name" = ""AT24 EEPROM""
register "device_type" = "INTEL_ACPI_CAMERA_NVM"
register "pr0" = ""\\_SB.PCI0.I2C0.CAM0.PRIC""
register "nvm_compat" = ""atmel,24c1024""
register "nvm_size" = "0x2800"
register "nvm_pagesize" = "0x01"
register "nvm_readonly" = "0x01"
register "nvm_width" = "0x10"
device i2c 58 on
probe WFC WFC_MIPI_OVTI8856
end
end
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 "ssdb.lanes_used" = "4"
register "ssdb.link_used" = "0"
register "ssdb.vcm_type" = "0x0C"
register "vcm_name" = ""VCM0""
register "num_freq_entries" = "2"
register "link_freq[0]" = "360 * MHz" # 360 MHz
register "link_freq[1]" = "180 * MHz" # 180 MHz
register "remote_name" = ""IPU0""
register "has_power_resource" = "1"
#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" #power_enable_2p8
register "gpio_panel.gpio[1].gpio_num" = "GPP_D16" #power_enable_1p2
register "gpio_panel.gpio[2].gpio_num" = "GPP_D3" #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 WFC WFC_MIPI_KBAE350
end
end end
chip drivers/intel/mipi_camera chip drivers/intel/mipi_camera
register "acpi_uid" = "2" register "acpi_uid" = "2"
@ -390,7 +467,9 @@ chip soc/intel/alderlake
register "pr0" = ""\\_SB.PCI0.I2C0.CAM0.PRIC"" register "pr0" = ""\\_SB.PCI0.I2C0.CAM0.PRIC""
register "vcm_compat" = ""dongwoon,dw9714"" register "vcm_compat" = ""dongwoon,dw9714""
device i2c 0C on end device i2c 0C on
probe WFC WFC_MIPI_KBAE350
end
end end
chip drivers/intel/mipi_camera chip drivers/intel/mipi_camera
register "acpi_uid" = "1" register "acpi_uid" = "1"
@ -406,7 +485,9 @@ chip soc/intel/alderlake
register "nvm_readonly" = "0x01" register "nvm_readonly" = "0x01"
register "nvm_width" = "0x10" register "nvm_width" = "0x10"
device i2c 50 on end device i2c 50 on
probe WFC WFC_MIPI_KBAE350
end
end end
end #I2C0 end #I2C0
device ref i2c1 on device ref i2c1 on