Lean Sheng Tan has uploaded this change for review.
mb/intel/ehlcrb: Remove IPU & MIPI related support from EHL CRB
THis patch removes IPU & MIPI related support from EHL CRB as they
are not supported in EHL.
Signed-off-by: Tan, Lean Sheng <lean.sheng.tan@intel.com>
Change-Id: I3eb038009daaabd048f40c7953cb2c111cd4fe63
---
M src/mainboard/intel/elkhartlake_crb/Kconfig
M src/mainboard/intel/elkhartlake_crb/mainboard.c
M src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb
3 files changed, 3 insertions(+), 117 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/48122/1
diff --git a/src/mainboard/intel/elkhartlake_crb/Kconfig b/src/mainboard/intel/elkhartlake_crb/Kconfig
index 07dc311..7cf727c 100644
--- a/src/mainboard/intel/elkhartlake_crb/Kconfig
+++ b/src/mainboard/intel/elkhartlake_crb/Kconfig
@@ -9,14 +9,12 @@
select DRIVERS_INTEL_DPTF
select DRIVERS_I2C_GENERIC
select DRIVERS_I2C_MAX98373
- select DRIVERS_INTEL_MIPI_CAMERA
select DRIVERS_SPI_ACPI
select DRIVERS_USB_ACPI
select EC_ACPI
select HAVE_SPD_IN_CBFS
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
- select SOC_INTEL_COMMON_BLOCK_IPU
select SOC_INTEL_ELKHARTLAKE
select SOC_INTEL_COMMON_BLOCK_DTT
diff --git a/src/mainboard/intel/elkhartlake_crb/mainboard.c b/src/mainboard/intel/elkhartlake_crb/mainboard.c
index a8a1cc2..54a6f6f 100644
--- a/src/mainboard/intel/elkhartlake_crb/mainboard.c
+++ b/src/mainboard/intel/elkhartlake_crb/mainboard.c
@@ -2,13 +2,10 @@
#include <baseboard/variants.h>
#include <device/device.h>
-#include <intelblocks/pcr.h>
#include <soc/gpio.h>
#include <soc/pcr_ids.h>
#include <smbios.h>
-#define SERIAL_IO_PCR_GPPRVRW4 0x60C
-
static void mainboard_init(void *chip_info)
{
const struct pad_config *pads;
@@ -16,9 +13,6 @@
pads = variant_gpio_table(&num);
gpio_configure_pads(pads, num);
-
- if (CONFIG(DRIVERS_INTEL_MIPI_CAMERA))
- pcr_write32(PID_SERIALIO, SERIAL_IO_PCR_GPPRVRW4, BIT8);
}
const char *smbios_system_sku(void)
diff --git a/src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb b/src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb
index af0c753..de4dcbe 100644
--- a/src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb
+++ b/src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb
@@ -28,21 +28,7 @@
end
end # SA Thermal device
- device pci 05.0 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" = "2"
- register "cio2_lanes_used" = "{2,2}"
- register "cio2_lane_endpoint[0]" = ""^I2C4.CAM0""
- register "cio2_lane_endpoint[1]" = ""^I2C5.CAM1""
- register "cio2_prt[0]" = "0"
- register "cio2_prt[1]" = "2"
- device generic 0 on end
- end
- end
+ device pci 05.0 on end
device pci 12.0 off end # Thermal Subsystem
device pci 12.5 off end # UFS SCS
device pci 12.6 off end # GSPI #2
@@ -178,100 +164,8 @@
device pci 16.4 off end # Management Engine Interface 3
device pci 16.5 off end # Management Engine Interface 4
device pci 17.0 off end # SATA
- device pci 19.0 on # I2C #4 Cam 0
- chip drivers/intel/mipi_camera
- register "acpi_hid" = ""OVTI2740""
- register "acpi_uid" = "0"
- register "acpi_name" = ""CAM0""
- register "chip_name" = ""Ov 2740 Camera""
- register "device_type" = "INTEL_ACPI_CAMERA_SENSOR"
- register "has_power_resource" = "1"
-
- register "ssdb.lanes_used" = "2"
- register "num_freq_entries" = "1"
- register "link_freq[0]" = "360000000"
- register "remote_name" = ""IPU0""
-
- #Controls
- register "clk_panel.clks[0].clknum" = "0" #IMGCLKOUT_3
- register "clk_panel.clks[0].freq" = "1" #19.2 Mhz
-
- register "gpio_panel.gpio[0].gpio_num" = "GPP_D5" #reset
- register "gpio_panel.gpio[1].gpio_num" = "GPP_B14" #power
-
- #_ON
- register "on_seq.ops_cnt" = "4"
- 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_DISABLE(1, 5)"
- register "on_seq.ops[3]" = "SEQ_OPS_GPIO_ENABLE(1, 5)"
-
- #_OFF
- register "off_seq.ops_cnt" = "3"
- register "off_seq.ops[0]" = "SEQ_OPS_GPIO_DISABLE(1, 0)"
- register "off_seq.ops[1]" = "SEQ_OPS_GPIO_DISABLE(0, 0)"
- register "off_seq.ops[2]" = "SEQ_OPS_CLK_DISABLE(0, 0)"
-
- device i2c 10 on end
- end
- end
- device pci 19.1 on # I2C #5 Cam 1 and VCM
- chip drivers/intel/mipi_camera
- register "acpi_hid" = ""OVTI5675""
- register "acpi_uid" = "0"
- register "acpi_name" = ""CAM1""
- register "chip_name" = ""Ov 5675 Camera""
- register "device_type" = "INTEL_ACPI_CAMERA_SENSOR"
-
- register "ssdb.lanes_used" = "2"
- register "ssdb.link_used" = "1"
- register "ssdb.vcm_type" = "0x0C"
- register "vcm_name" = ""VCM0""
- register "num_freq_entries" = "1"
- register "link_freq[0]" = "DEFAULT_LINK_FREQ"
- register "remote_name" = ""IPU0""
-
- register "has_power_resource" = "1"
- #Controls
- register "clk_panel.clks[0].clknum" = "1" #IMGCLKOUT_3
- register "clk_panel.clks[0].freq" = "1" #19.2 Mhz
-
- register "gpio_panel.gpio[0].gpio_num" = "GPP_D4" #power_enable
- register "gpio_panel.gpio[1].gpio_num" = "GPP_C19" #reset
-
- #_ON
- register "on_seq.ops_cnt" = "4"
- 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_DISABLE(1, 5)"
- register "on_seq.ops[3]" = "SEQ_OPS_GPIO_ENABLE(1, 5)"
-
- #_OFF
- register "off_seq.ops_cnt" = "3"
- register "off_seq.ops[0]" = "SEQ_OPS_GPIO_DISABLE(1, 0)"
- register "off_seq.ops[1]" = "SEQ_OPS_GPIO_DISABLE(0, 0)"
- register "off_seq.ops[2]" = "SEQ_OPS_CLK_DISABLE(0, 0)"
-
- device i2c 36 on end
- end
- chip drivers/intel/mipi_camera
- register "acpi_hid" = "ACPI_DT_NAMESPACE_HID"
- register "acpi_uid" = "3"
- register "acpi_name" = ""VCM0""
- register "chip_name" = ""DW AF DAC""
- register "device_type" = "INTEL_ACPI_CAMERA_VCM"
-
- register "pr0" = ""\\_SB.PCI0.I2C5.CAM1.PRIC""
- register "vcm_compat" = ""dongwoon,dw9714""
-
- register "ssdb.lanes_used" = "2"
- register "num_freq_entries" = "1"
- register "link_freq[0]" = "DEFAULT_LINK_FREQ"
- register "remote_name" = ""IPU0""
- device i2c 0C on end
- end
- end
-
+ device pci 19.0 on end # I2C
+ device pci 19.1 on end # I2C
device pci 19.2 on end # UART #2
device pci 1a.0 on end # eMMC
device pci 1c.0 off end # PCI Express Port 1
To view, visit change 48122. To unsubscribe, or for help writing mail filters, visit settings.