mb/google/brya: move MIPI camera setting into overridetree

In order to support no MIPI camera variant, move related configuration into variant folder.

BUG=b:188272162
BRANCH=none
TEST=build no MIPI camera variant without error

Signed-off-by: Scott Chao <scott_chao@wistron.corp-partner.google.com>
Change-Id: I4e64d078a8e39732ad29443c3b09ca008a7e902f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55134
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>

2 files changed, 83 insertions, 86 deletions

diff --git a/src/mainboard/google/brya/variants/baseboard/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/devicetree.cb
index ddb1ece729..36635fb9aa 100644
--- a/src/mainboard/google/brya/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/brya/variants/baseboard/devicetree.cb
@@ -129,19 +129,6 @@ chip soc/intel/alderlake
 	device domain 0 on
 		device ref igpu on end
 		device ref dtt on end
-		device ref ipu on
-			chip drivers/intel/mipi_camera
-				register "acpi_uid" = "0x50000"
-				register "acpi_name" = ""IPU0""
-				register "device_type" = "INTEL_ACPI_CAMERA_CIO2"
-
-				register "cio2_num_ports" = "1"
-				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 end
-			end
-		end
 		device ref tbt_pcie_rp0 on end
 		device ref tbt_pcie_rp1 on end
 		device ref tbt_pcie_rp2 on end
@@ -156,78 +143,6 @@ chip soc/intel/alderlake
 				device generic 0 on end
 			end
 		end
-
-		device ref i2c0 on
-			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 10 on 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 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" = "0x0E"
-
-				device i2c 58 on end
-			end
-		end #I2C0
 		device ref i2c3 on
 			chip drivers/i2c/tpm
 				register "hid" = ""GOOG0005""
diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb
index 452e1d8789..78fc472e70 100644
--- a/src/mainboard/google/brya/variants/brya0/overridetree.cb
+++ b/src/mainboard/google/brya/variants/brya0/overridetree.cb
@@ -116,6 +116,19 @@ chip soc/intel/alderlake
 				device generic 0 on end
 			end
 		end
+		device ref ipu on
+			chip drivers/intel/mipi_camera
+				register "acpi_uid" = "0x50000"
+				register "acpi_name" = ""IPU0""
+				register "device_type" = "INTEL_ACPI_CAMERA_CIO2"
+
+				register "cio2_num_ports" = "1"
+				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 end
+			end
+		end
 		device ref cnvi_wifi on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
@@ -146,7 +159,76 @@ chip soc/intel/alderlake
 				register "property_list[0].integer" = "1"
 				device i2c 1a on end
 			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 10 on 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 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" = "0x0E"
+
+				device i2c 58 on end
+			end
+		end #I2C0
 		device ref i2c1 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""ELAN9050""