mb/google/poppy/var/soraka: Configure cameras for Windows/Linux ACPI mode

Update device tree and Kconfig to support Windows/Linux ACPI camera mode
using the ACPI device type selection feature (commit c5fc7ab):

Kconfig:
- Enable DRIVERS_INTEL_MIPI_CAMERA only for non-ChromeOS builds
- Enable VARIANT_HAS_CAMERA_ACPI only for ChromeOS builds

Devicetree:
- Remove legacy static display configuration
- Add GFX generic driver with LCD0 panel and SKC0 for IPU
- Add TPS68470 PMIC device
- Add OV 13858 rear camera
- Add OV 5670 front camera
- Move i2c4 device reference before i2c5

This enables proper camera and IPU enumeration under Windows/Linux
using the standard driver stack.

TEST=build/boot Windows/Linux on google/soraka, verify cameras and IPU
functional under both OSes.

Change-Id: I9e62c5a36c4d1e345f20a7a5341de3c59558f761
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>

Change-Id: I9e62c5a36c4d1e345f20a7a5341de3c59558f761
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>

Author: MrChromebox

src/mainboard/google/poppy/Kconfig

@@ -99,12 +99,13 @@ config BOARD_GOOGLE_RAMMUS
 config BOARD_GOOGLE_SORAKA
 	select BOARD_GOOGLE_BASEBOARD_POPPY
 	select DRIVERS_I2C_MAX98927
+	select DRIVERS_INTEL_MIPI_CAMERA if !CHROMEOS
 	select I2C_TPM
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_HAS_LIBGFXINIT
 	select NO_FADT_8042
 	select SYSTEM_TYPE_DETACHABLE
-	select VARIANT_HAS_CAMERA_ACPI
+	select VARIANT_HAS_CAMERA_ACPI if CHROMEOS
 
 if BOARD_GOOGLE_BASEBOARD_POPPY
 

src/mainboard/google/poppy/variants/soraka/devicetree.cb

@@ -1,8 +1,5 @@
 chip soc/intel/skylake
 
-	# IGD Displays
-	register "gfx" = "GMA_STATIC_DISPLAYS(0)"
-
 	register "panel_cfg" = "{
 		.up_delay_ms		=  100,
 		.down_delay_ms		=  500,
@@ -227,7 +224,19 @@ chip soc/intel/skylake
 	register "sdcard_cd_gpio" = "GPP_E15"
 
 	device domain 0 on
-		device ref igpu			on  end
+		device ref igpu			on
+			chip drivers/gfx/generic
+				register "device_count" = "2"
+				register "device[0].name" = ""LCD0""
+				# Internal panel on the first port of the graphics chip
+				register "device[0].type" = "panel"
+				# SKC0 for IPUs
+				register "device[1].name" = ""SKC0""
+				register "device[1].non_vga_device" = "true"
+				register "device[1].addr" = "0xCA00"
+				device generic 0 on end
+			end
+		end
 		device ref sa_thermal		on  end
 		device ref imgu			on  end
 		device ref south_xhci		on
@@ -272,9 +281,70 @@ chip soc/intel/skylake
 				device i2c 50 on end
 			end
 		end
-		device ref i2c2			on  end
+		device ref i2c2			on
+			chip drivers/intel/mipi_camera/pmic
+				register "acpi_uid" = "0"
+				register "acpi_name" = ""CLP0""
+
+				register "cldb.pmic_type" = "CL_TYPE_TPS68470"
+				register "cldb.pmic_id" = "PMIC_NODE_1"
+				register "cldb.sensor_card_sku.card_type" = "SKU_CRD_G2"
+
+				register "has_power_resource" = "true"
+				register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_C8)" #EN_PP3300_DX_CAM
+				# register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C10)" #EN_CAM_PMIC_RST_L #TODO: Only reset once on boot
+				device i2c 4d on end
+			end
+			chip drivers/intel/mipi_camera
+				register "acpi_hid" = ""OVTID858""
+				register "acpi_uid" = "0"
+				register "acpi_name" = ""CAM0""
+				register "pmic_dep" = ""CLP0""
+				register "chip_name" = ""OV 13858 Camera""
+				register "sensor_name" = ""7BAD06T2""
+
+				register "ssdb.sensor_card_sku.card_type" = "SKU_CRD_G2"
+				register "ssdb.control_logic_id" = "PMIC_NODE_1"
+
+				register "ssdb.lanes_used" = "4"
+				register "ssdb.link_used" = "0"
+				register "ssdb.platform" = "PLAT_SKC"
+				register "ssdb.platform_sub" = "PLAT_SUB_FFD"
+
+				register "ssdb.vcm_type" = "VCM_DW9714"
+				register "vcm_address" = "0x0C"
+
+				register "ssdb.rom_type" = "ROM_EEPROM_CAT24C08"
+				register "rom_address" = "0x50"
+
+				register "pld.panel" = "PLD_PANEL_BACK"
+				register "pld.vertical_position" = "PLD_VERTICAL_POSITION_CENTER"
+				register "pld.horizontal_position" = "PLD_HORIZONTAL_POSITION_CENTER"
+
+				device i2c 10 on end
+			end
+		end
 		device ref heci1		on  end
 		device ref uart2		on  end
+		device ref i2c4			on
+			chip drivers/intel/mipi_camera
+				register "acpi_hid" = ""INT3479""
+				register "acpi_uid" = "0"
+				register "acpi_name" = ""CAM0""
+				register "chip_name" = ""OV 5670 Camera""
+				register "sensor_name" = ""4BF523T2""
+
+				register "ssdb.sensor_card_sku.card_type" = "SKU_CRD_G2"
+				register "ssdb.control_logic_id" = "PMIC_NODE_1"
+
+				register "ssdb.lanes_used" = "2"
+				register "ssdb.link_used" = "1"
+				register "ssdb.platform" = "PLAT_SKC"
+				register "ssdb.platform_sub" = "PLAT_SUB_FFD"
+
+				device i2c 36 on end
+			end
+		end
 		device ref i2c5			on
 			chip drivers/i2c/max98927
 				register "interleave_mode" = "1"
@@ -303,7 +373,6 @@ chip soc/intel/skylake
 				device i2c 13 on end
 			end
 		end
-		device ref i2c4			on  end
 		device ref pcie_rp1		on
 			register "PcieRpClkReqSupport[0]" = "true"
 			register "PcieRpClkReqNumber[0]" = "1"