summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/brya/Kconfig.name1
-rw-r--r--src/mainboard/google/brya/variants/kano/overridetree.cb15
-rw-r--r--src/mainboard/google/brya/variants/zydron/overridetree.cb15
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