diff options
| author | David Wu <david_wu@quanta.corp-partner.google.com> | 2022-12-16 20:53:49 +0800 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2022-12-24 19:11:22 +0000 |
| commit | cedd4d14f44d2eceab01fba41e99ef1d8b75c70b (patch) | |
| tree | 8ea6b7766975ec93039a1d55a93881174e03c4ea | |
| parent | 716c8f0711a464ad329d572fdbf4b3041709fa94 (diff) | |
mb/google/brya/var/zydron: Use SSFC for mipi instead of fw_config
Kano didn't use SSFC in mass production, however
Zydron needs SSFC for 2rd source mipi instead of fw_config.
BUG=b:262939431
TEST=Boot to OS and check functional with ov2740/hi556 camera.
Change-Id: Idb2a35d67af0b5a7dedc66b0f7eccd8a3b4612d1
Signed-off-by: David Wu <david_wu@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70881
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Ren Kuo <ren.kuo@quanta.corp-partner.google.com>
| -rw-r--r-- | src/mainboard/google/brya/Kconfig.name | 1 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/kano/overridetree.cb | 15 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/zydron/overridetree.cb | 15 |
3 files changed, 23 insertions, 8 deletions
diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name index a09ff8e71b..094c7ed581 100644 --- a/src/mainboard/google/brya/Kconfig.name +++ b/src/mainboard/google/brya/Kconfig.name @@ -300,6 +300,7 @@ config BOARD_GOOGLE_ZYDRON select DRIVERS_INTEL_MIPI_CAMERA select SOC_INTEL_COMMON_BLOCK_IPU select CHROMEOS_WIFI_SAR if CHROMEOS + select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG config BOARD_GOOGLE_GLADIOS bool "-> Gladios" diff --git a/src/mainboard/google/brya/variants/kano/overridetree.cb b/src/mainboard/google/brya/variants/kano/overridetree.cb index fa779b1a89..e2148a0b25 100644 --- a/src/mainboard/google/brya/variants/kano/overridetree.cb +++ b/src/mainboard/google/brya/variants/kano/overridetree.cb @@ -10,12 +10,16 @@ fw_config field UFC 4 5 option UFC_USB 0 option UFC_MIPI_OVTI2740 1 - option UFC_MIPI_HI556 2 + option UFC_MIPI_ZYDRON 2 end field STYLUS 6 option STYLUS_ABSENT 0 option STYLUS_PRESENT 1 end + field ZYDRON_UFC 36 37 + option UFC_MIPI_HI556 0 + option UFC_MIPI_OVTI2740 1 + end end chip soc/intel/alderlake register "sagv" = "SaGv_Enabled" @@ -198,7 +202,8 @@ chip soc/intel/alderlake register "cio2_prt[0]" = "1" device generic 0 on probe UFC UFC_MIPI_OVTI2740 - probe UFC UFC_MIPI_HI556 + probe ZYDRON_UFC UFC_MIPI_HI556 + probe ZYDRON_UFC UFC_MIPI_OVTI2740 end end end @@ -321,6 +326,7 @@ chip soc/intel/alderlake device i2c 36 on probe UFC UFC_MIPI_OVTI2740 + probe ZYDRON_UFC UFC_MIPI_OVTI2740 end end chip drivers/intel/mipi_camera @@ -359,7 +365,7 @@ chip soc/intel/alderlake register "off_seq.ops[2]" = "SEQ_OPS_GPIO_DISABLE(0, 0)" device i2c 20 on - probe UFC UFC_MIPI_HI556 + probe ZYDRON_UFC UFC_MIPI_HI556 end end chip drivers/intel/mipi_camera @@ -377,7 +383,8 @@ chip soc/intel/alderlake device i2c 50 on probe UFC UFC_MIPI_OVTI2740 - probe UFC UFC_MIPI_HI556 + probe ZYDRON_UFC UFC_MIPI_HI556 + probe ZYDRON_UFC UFC_MIPI_OVTI2740 end end end diff --git a/src/mainboard/google/brya/variants/zydron/overridetree.cb b/src/mainboard/google/brya/variants/zydron/overridetree.cb index ce48c057f7..77002cd211 100644 --- a/src/mainboard/google/brya/variants/zydron/overridetree.cb +++ b/src/mainboard/google/brya/variants/zydron/overridetree.cb @@ -10,12 +10,16 @@ fw_config field UFC 4 5 option UFC_USB 0 option UFC_MIPI_OVTI2740 1 - option UFC_MIPI_HI556 2 + option UFC_MIPI_ZYDRON 2 end field STYLUS 6 option STYLUS_ABSENT 0 option STYLUS_PRESENT 1 end + field ZYDRON_UFC 36 37 + option UFC_MIPI_HI556 0 + option UFC_MIPI_OVTI2740 1 + end end chip soc/intel/alderlake register "domain_vr_config[VR_DOMAIN_IA]" = "{ @@ -202,7 +206,8 @@ chip soc/intel/alderlake register "cio2_prt[0]" = "1" device generic 0 on probe UFC UFC_MIPI_OVTI2740 - probe UFC UFC_MIPI_HI556 + probe ZYDRON_UFC UFC_MIPI_HI556 + probe ZYDRON_UFC UFC_MIPI_OVTI2740 end end end @@ -325,6 +330,7 @@ chip soc/intel/alderlake device i2c 36 on probe UFC UFC_MIPI_OVTI2740 + probe ZYDRON_UFC UFC_MIPI_OVTI2740 end end chip drivers/intel/mipi_camera @@ -363,7 +369,7 @@ chip soc/intel/alderlake register "off_seq.ops[2]" = "SEQ_OPS_GPIO_DISABLE(0, 0)" device i2c 20 on - probe UFC UFC_MIPI_HI556 + probe ZYDRON_UFC UFC_MIPI_HI556 end end chip drivers/intel/mipi_camera @@ -381,7 +387,8 @@ chip soc/intel/alderlake device i2c 50 on probe UFC UFC_MIPI_OVTI2740 - probe UFC UFC_MIPI_HI556 + probe ZYDRON_UFC UFC_MIPI_HI556 + probe ZYDRON_UFC UFC_MIPI_OVTI2740 end end end |