Matt Delco has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31167
Change subject: soraka: switch to mipi_camera driver ......................................................................
soraka: switch to mipi_camera driver
Replaced asl files with use of devicetree configuration that utilizes the mipi_camera driver.
BUG=None BRANCH=None TEST=Verified still compiles.
Change-Id: I15111972aa153c64fd96c213481eb79e3fda1ed9 Signed-off-by: Matt Delco delco@chromium.org --- M src/mainboard/google/poppy/Kconfig M src/mainboard/google/poppy/variants/soraka/devicetree.cb M src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl 3 files changed, 67 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/31167/1
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 162f049..d57fa38 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -210,6 +210,7 @@ select DRIVERS_I2C_MAX98927 select NO_FADT_8042 select VARIANT_HAS_CAMERA_ACPI + select DRIVERS_INTEL_MIPI_CAMERA select MAINBOARD_HAS_I2C_TPM_CR50
config VBOOT diff --git a/src/mainboard/google/poppy/variants/soraka/devicetree.cb b/src/mainboard/google/poppy/variants/soraka/devicetree.cb index ddf74a1..db37066 100644 --- a/src/mainboard/google/poppy/variants/soraka/devicetree.cb +++ b/src/mainboard/google/poppy/variants/soraka/devicetree.cb @@ -283,9 +283,22 @@ device domain 0 on device pci 00.0 on end # Host Bridge device pci 02.0 on end # Integrated Graphics Device + chip drivers/intel/mipi_camera + register "device_type" = "INTEL_ACPI_CAMERA_IMGU" + device pci 05.0 on end + end device pci 14.0 on end # USB xHCI device pci 14.1 on end # USB xDCI (OTG) device pci 14.2 on end # Thermal Subsystem + chip drivers/intel/mipi_camera + register "device_type" = "INTEL_ACPI_CAMERA_CIO2" + register "cio2_num_ports" = "2" + register "cio2_lanes_used[0]" = "4" + register "cio2_lane_endpoint[0]" = ""\_SB.PCI0.I2C2.CAM0"" + register "cio2_lanes_used[1]" = "2" + register "cio2_lane_endpoint[1]" = ""\_SB.PCI0.I2C4.CAM1"" + device pci 14.3 on end + end device pci 15.0 on chip drivers/i2c/hid register "generic.hid" = ""WCOMCOHO"" @@ -310,7 +323,43 @@ device i2c 50 on end end end # I2C #1 - device pci 15.2 on end # I2C #2 + device pci 15.2 on + chip drivers/intel/mipi_camera + register "device_type" = "INTEL_ACPI_CAMERA_SENSOR" + register "acpi_hid" = ""OVTID858"" + register "chip_name" = ""OV 13858 Camera"" + register "dep" = ""\_SB.PCI0.I2C2.PMIC"" + register "pr0" = ""\_SB.PCI0.I2C2.PMIC.OVTH"" + register "pr3" = ""\_SB.PCI0.I2C2.PMIC.OVTH"" + register "vcm_address" = "0x0C" + register "rom_address" = "0x50" # original doesn't specify + register "ssdb.sensor_card_sku" = "0x50" # original doesn't specify + register "ssdb.rom_type" = "11" # 24c16, original uses 8 + register "ssdb.vcm_type" = "2" # dw9714, original uses 3 + register "num_freq_entries" = "2" + register "link_freq[0]" = "540000000" + register "link_freq[1]" = "270000000" + device i2c 0x10 on end + end + chip drivers/intel/mipi_camera + register "device_type" = "INTEL_ACPI_CAMERA_NVM" + register "chip_name" = ""GT24C16S/CAT24C16"" + register "dep" = ""\_SB.PCI0.I2C2.PMIC"" # use CAM0? + register "pr0" = ""\_SB.PCI0.I2C2.PMIC.NVMP"" + register "pr3" = ""\_SB.PCI0.I2C2.PMIC.NVMP"" + register "nvm_size" = "2048" + device i2c 0x50 on end + end + chip drivers/intel/mipi_camera + register "device_type" = "INTEL_ACPI_CAMERA_VCM" + register "chip_name" = ""Dongwoon AF DAC"" + register "dep" = ""\_SB.PCI0.I2C2.PMIC"" # use CAM0? + register "pr0" = ""\_SB.PCI0.I2C2.PMIC.VCMP"" + register "pr3" = ""\_SB.PCI0.I2C2.PMIC.VCMP"" + register "vcm_compat" = ""dongwoon,dw9714"" + device i2c 0xc on end + end + end # I2C #2 device pci 15.3 off end # I2C #3 device pci 16.0 on end # Management Engine Interface 1 device pci 16.1 off end # Management Engine Interface 2 @@ -347,7 +396,21 @@ device i2c 13 on end end end # I2C #5 - device pci 19.2 on end # I2C #4 + device pci 19.2 on + chip drivers/intel/mipi_camera + register "device_type" = "INTEL_ACPI_CAMERA_SENSOR" + register "acpi_hid" = ""INT3479"" + register "chip_name" = ""OV 5670 Camera"" + register "dep" = ""\_SB.PCI0.I2C2.PMIC"" + register "pr0" = ""\_SB.PCI0.I2C2.PMIC.OVFI"" + register "pr3" = ""\_SB.PCI0.I2C2.PMIC.OVFI"" + register "ssdb.sensor_card_sku" = "0x50" + register "ssdb.link_used" = "1" + register "num_freq_entries" = "1" + register "link_freq[0]" = "422400000" + device i2c 0x36 on end + end + end # I2C #4 device pci 1c.0 on chip drivers/intel/wifi register "wake" = "GPE0_PCI_EXP" diff --git a/src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl b/src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl index 45522f9..9ddb22d 100644 --- a/src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl +++ b/src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl @@ -13,4 +13,4 @@ * GNU General Public License for more details. */
-#include <baseboard/acpi/camera.asl> +#include <baseboard/acpi/camera_pmic.asl>