From 7d9fb0c1876434e45dfd88afa268931654ee97fa Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 25 Jan 2026 18:56:22 -0600 Subject: [PATCH] soc/intel: Use chipset.cb for I2C device ops linking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move I2C device operations linking from PCI Device ID matching to chipset.cb files for all Intel SoCs that have them, matching the approach used by Skylake. Remove corresponding DIDs from i2c.c for these SoCs; keep DID matching only for SoCs without chipset.cb files. This standardizes the approach across Intel SoCs and makes the I2C controller configuration explicit in devicetree, and prevents the endless proliferation of DIDs in the common I2C driver code. Change-Id: Ib68dd19c7c94d4cb6b41a1caf092b77f463c1c74 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/90906 Reviewed-by: Jakub "Kuba" Czapiga Tested-by: build bot (Jenkins) Reviewed-by: Jérémy Compostella --- src/soc/intel/alderlake/chipset.cb | 16 +-- src/soc/intel/alderlake/chipset_pch_s.cb | 12 +-- src/soc/intel/apollolake/chipset_apl.cb | 16 +-- src/soc/intel/apollolake/chipset_glk.cb | 16 +-- src/soc/intel/cannonlake/chipset.cb | 12 +-- src/soc/intel/cannonlake/chipset_pch_h.cb | 12 +-- src/soc/intel/common/block/i2c/i2c.c | 119 ---------------------- src/soc/intel/jasperlake/chipset.cb | 12 +-- src/soc/intel/meteorlake/chipset.cb | 12 +-- src/soc/intel/pantherlake/chipset_ptl.cb | 12 +-- src/soc/intel/pantherlake/chipset_wcl.cb | 12 +-- src/soc/intel/tigerlake/chipset.cb | 12 +-- src/soc/intel/tigerlake/chipset_pch_h.cb | 14 +-- 13 files changed, 79 insertions(+), 198 deletions(-) diff --git a/src/soc/intel/alderlake/chipset.cb b/src/soc/intel/alderlake/chipset.cb index e2b4570a6b..dcd5ebc400 100644 --- a/src/soc/intel/alderlake/chipset.cb +++ b/src/soc/intel/alderlake/chipset.cb @@ -172,8 +172,8 @@ chip soc/intel/alderlake device pci 0d.2 alias tcss_dma0 off end device pci 0d.3 alias tcss_dma1 off end device pci 0e.0 alias vmd off end - device pci 10.0 alias i2c6 off end - device pci 10.1 alias i2c7 off end + device pci 10.0 alias i2c6 off ops i2c_dev_ops end + device pci 10.1 alias i2c7 off ops i2c_dev_ops end device pci 10.6 alias thc0 off end device pci 10.7 alias thc1 off end device pci 12.0 alias ish off end @@ -232,10 +232,10 @@ chip soc/intel/alderlake device pci 14.1 alias usb_otg off end device pci 14.2 alias shared_sram off end device pci 14.3 alias cnvi_wifi off end - device pci 15.0 alias i2c0 off end - device pci 15.1 alias i2c1 off end - device pci 15.2 alias i2c2 off end - device pci 15.3 alias i2c3 off end + device pci 15.0 alias i2c0 off ops i2c_dev_ops end + device pci 15.1 alias i2c1 off ops i2c_dev_ops end + device pci 15.2 alias i2c2 off ops i2c_dev_ops end + device pci 15.3 alias i2c3 off ops i2c_dev_ops end device pci 16.0 alias heci1 on end device pci 16.1 alias heci2 off end device pci 16.2 alias ide_r off end @@ -243,8 +243,8 @@ chip soc/intel/alderlake device pci 16.4 alias heci3 off end device pci 16.5 alias heci4 off end device pci 17.0 alias sata off end - device pci 19.0 alias i2c4 off end - device pci 19.1 alias i2c5 off end + device pci 19.0 alias i2c4 off ops i2c_dev_ops end + device pci 19.1 alias i2c5 off ops i2c_dev_ops end device pci 19.2 alias uart2 off end # eMMC device is applicable only for ADL-N device pci 1a.0 alias emmc off end diff --git a/src/soc/intel/alderlake/chipset_pch_s.cb b/src/soc/intel/alderlake/chipset_pch_s.cb index 06b50f6844..a1a056bcf2 100644 --- a/src/soc/intel/alderlake/chipset_pch_s.cb +++ b/src/soc/intel/alderlake/chipset_pch_s.cb @@ -363,10 +363,10 @@ chip soc/intel/alderlake device pci 14.1 alias xdci off end device pci 14.2 alias shared_sram off end device pci 14.3 alias cnvi_wifi off end - device pci 15.0 alias i2c0 off end - device pci 15.1 alias i2c1 off end - device pci 15.2 alias i2c2 off end - device pci 15.3 alias i2c3 off end + device pci 15.0 alias i2c0 off ops i2c_dev_ops end + device pci 15.1 alias i2c1 off ops i2c_dev_ops end + device pci 15.2 alias i2c2 off ops i2c_dev_ops end + device pci 15.3 alias i2c3 off ops i2c_dev_ops end device pci 16.0 alias heci1 on end device pci 16.1 alias heci2 off end device pci 16.2 alias ide_r off end @@ -374,8 +374,8 @@ chip soc/intel/alderlake device pci 16.4 alias heci3 off end device pci 16.5 alias heci4 off end device pci 17.0 alias sata off end - device pci 19.0 alias i2c4 off end - device pci 19.1 alias i2c5 off end + device pci 19.0 alias i2c4 off ops i2c_dev_ops end + device pci 19.1 alias i2c5 off ops i2c_dev_ops end device pci 19.2 alias uart2 off end device pci 1a.0 alias pcie_rp25 off ops pcie_rp_ops end device pci 1a.1 alias pcie_rp26 off ops pcie_rp_ops end diff --git a/src/soc/intel/apollolake/chipset_apl.cb b/src/soc/intel/apollolake/chipset_apl.cb index a39461d6de..7184a0c401 100644 --- a/src/soc/intel/apollolake/chipset_apl.cb +++ b/src/soc/intel/apollolake/chipset_apl.cb @@ -24,14 +24,14 @@ chip soc/intel/apollolake device pci 14.1 alias pcie_rp06 off ops pcie_rp_ops end # PCIE Express Root Port 6 device pci 15.0 alias xhci off end # XHCI device pci 15.1 alias xdci off end # XDCI - device pci 16.0 alias i2c0 off end # I2C0 - device pci 16.1 alias i2c1 off end # I2C1 - device pci 16.2 alias i2c2 off end # I2C2 - device pci 16.3 alias i2c3 off end # I2C3 - device pci 17.0 alias i2c4 off end # I2C4 - device pci 17.1 alias i2c5 off end # I2C5 - device pci 17.2 alias i2c6 off end # I2C6 - device pci 17.3 alias i2c7 off end # I2C7 + device pci 16.0 alias i2c0 off ops i2c_dev_ops end # I2C0 + device pci 16.1 alias i2c1 off ops i2c_dev_ops end # I2C1 + device pci 16.2 alias i2c2 off ops i2c_dev_ops end # I2C2 + device pci 16.3 alias i2c3 off ops i2c_dev_ops end # I2C3 + device pci 17.0 alias i2c4 off ops i2c_dev_ops end # I2C4 + device pci 17.1 alias i2c5 off ops i2c_dev_ops end # I2C5 + device pci 17.2 alias i2c6 off ops i2c_dev_ops end # I2C6 + device pci 17.3 alias i2c7 off ops i2c_dev_ops end # I2C7 device pci 18.0 alias uart0 off end # UART0 device pci 18.1 alias uart1 off end # UART1 device pci 18.2 alias uart2 off end # UART2 diff --git a/src/soc/intel/apollolake/chipset_glk.cb b/src/soc/intel/apollolake/chipset_glk.cb index 1fcc37e800..963ed40339 100644 --- a/src/soc/intel/apollolake/chipset_glk.cb +++ b/src/soc/intel/apollolake/chipset_glk.cb @@ -25,14 +25,14 @@ chip soc/intel/apollolake device pci 14.1 alias pcie_rp06 off ops pcie_rp_ops end # PCIE Express Root Port 6 device pci 15.0 alias xhci off end # XHCI device pci 15.1 alias xdci off end # XDCI - device pci 16.0 alias i2c0 off end # I2C0 - device pci 16.1 alias i2c1 off end # I2C1 - device pci 16.2 alias i2c2 off end # I2C2 - device pci 16.3 alias i2c3 off end # I2C3 - device pci 17.0 alias i2c4 off end # I2C4 - device pci 17.1 alias i2c5 off end # I2C5 - device pci 17.2 alias i2c6 off end # I2C6 - device pci 17.3 alias i2c7 off end # I2C7 + device pci 16.0 alias i2c0 off ops i2c_dev_ops end # I2C0 + device pci 16.1 alias i2c1 off ops i2c_dev_ops end # I2C1 + device pci 16.2 alias i2c2 off ops i2c_dev_ops end # I2C2 + device pci 16.3 alias i2c3 off ops i2c_dev_ops end # I2C3 + device pci 17.0 alias i2c4 off ops i2c_dev_ops end # I2C4 + device pci 17.1 alias i2c5 off ops i2c_dev_ops end # I2C5 + device pci 17.2 alias i2c6 off ops i2c_dev_ops end # I2C6 + device pci 17.3 alias i2c7 off ops i2c_dev_ops end # I2C7 device pci 18.0 alias uart0 off end # UART0 device pci 18.1 alias uart1 off end # UART1 device pci 18.2 alias uart2 off end # UART2 diff --git a/src/soc/intel/cannonlake/chipset.cb b/src/soc/intel/cannonlake/chipset.cb index eb0a0bcb92..acdac57a77 100644 --- a/src/soc/intel/cannonlake/chipset.cb +++ b/src/soc/intel/cannonlake/chipset.cb @@ -82,10 +82,10 @@ chip soc/intel/cannonlake device pci 14.2 alias shared_sram off end # Shared SRAM device pci 14.3 alias cnvi_wifi off end # CNVi Wifi device pci 14.5 alias sdxc off end # SDCard - device pci 15.0 alias i2c0 off end # I2C #0 - device pci 15.1 alias i2c1 off end # I2C #1 - device pci 15.2 alias i2c2 off end # I2C #2 - device pci 15.3 alias i2c3 off end # I2C #3 + device pci 15.0 alias i2c0 off ops i2c_dev_ops end # I2C #0 + device pci 15.1 alias i2c1 off ops i2c_dev_ops end # I2C #1 + device pci 15.2 alias i2c2 off ops i2c_dev_ops end # I2C #2 + device pci 15.3 alias i2c3 off ops i2c_dev_ops end # I2C #3 device pci 16.0 alias heci1 on end # Management Engine Interface 1 device pci 16.1 alias heci2 off end # Management Engine Interface 2 device pci 16.2 alias csme_ider off end # Management Engine IDE-R @@ -93,8 +93,8 @@ chip soc/intel/cannonlake device pci 16.4 alias heci3 off end # Management Engine Interface 3 device pci 16.5 alias heci4 off end # Management Engine Interface 4 device pci 17.0 alias sata off end # SATA - device pci 19.0 alias i2c4 off end # I2C #4 - device pci 19.1 alias i2c5 off end # I2C #5 + device pci 19.0 alias i2c4 off ops i2c_dev_ops end # I2C #4 + device pci 19.1 alias i2c5 off ops i2c_dev_ops end # I2C #5 device pci 19.2 alias uart2 off end # UART #2 device pci 1a.0 alias emmc off end # eMMC device pci 1c.0 alias pcie_rp1 off ops pcie_rp_ops end # PCI Express Port 1 diff --git a/src/soc/intel/cannonlake/chipset_pch_h.cb b/src/soc/intel/cannonlake/chipset_pch_h.cb index fa7660b5af..eeeab7b7ad 100644 --- a/src/soc/intel/cannonlake/chipset_pch_h.cb +++ b/src/soc/intel/cannonlake/chipset_pch_h.cb @@ -106,10 +106,10 @@ chip soc/intel/cannonlake device pci 14.2 alias shared_sram off end # Shared SRAM device pci 14.3 alias cnvi_wifi off end # CNVi Wifi device pci 14.5 alias sdxc off end # SDCard - device pci 15.0 alias i2c0 off end # I2C #0 - device pci 15.1 alias i2c1 off end # I2C #1 - device pci 15.2 alias i2c2 off end # I2C #2 - device pci 15.3 alias i2c3 off end # I2C #3 + device pci 15.0 alias i2c0 off ops i2c_dev_ops end # I2C #0 + device pci 15.1 alias i2c1 off ops i2c_dev_ops end # I2C #1 + device pci 15.2 alias i2c2 off ops i2c_dev_ops end # I2C #2 + device pci 15.3 alias i2c3 off ops i2c_dev_ops end # I2C #3 device pci 16.0 alias heci1 on end # Management Engine Interface 1 device pci 16.1 alias heci2 off end # Management Engine Interface 2 device pci 16.2 alias csme_ider off end # Management Engine IDE-R @@ -117,8 +117,8 @@ chip soc/intel/cannonlake device pci 16.4 alias heci3 off end # Management Engine Interface 3 device pci 16.5 alias heci4 off end # Management Engine Interface 4 device pci 17.0 alias sata off end # SATA - device pci 19.0 alias i2c4 off end # I2C #4 - device pci 19.1 alias i2c5 off end # I2C #5 + device pci 19.0 alias i2c4 off ops i2c_dev_ops end # I2C #4 + device pci 19.1 alias i2c5 off ops i2c_dev_ops end # I2C #5 device pci 19.2 alias uart2 off # UART #2 ops uart_ops end diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index 7609b217a3..8018ee573d 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -180,99 +180,12 @@ static const unsigned short pci_device_ids[] = { PCI_DID_INTEL_NVL_I2C3, PCI_DID_INTEL_NVL_I2C4, PCI_DID_INTEL_NVL_I2C5, - PCI_DID_INTEL_WCL_I2C0, - PCI_DID_INTEL_WCL_I2C1, - PCI_DID_INTEL_WCL_I2C2, - PCI_DID_INTEL_WCL_I2C3, - PCI_DID_INTEL_WCL_I2C4, - PCI_DID_INTEL_WCL_I2C5, - PCI_DID_INTEL_PTL_H_I2C0, - PCI_DID_INTEL_PTL_H_I2C1, - PCI_DID_INTEL_PTL_H_I2C2, - PCI_DID_INTEL_PTL_H_I2C3, - PCI_DID_INTEL_PTL_H_I2C4, - PCI_DID_INTEL_PTL_H_I2C5, - PCI_DID_INTEL_PTL_U_H_I2C0, - PCI_DID_INTEL_PTL_U_H_I2C1, - PCI_DID_INTEL_PTL_U_H_I2C2, - PCI_DID_INTEL_PTL_U_H_I2C3, - PCI_DID_INTEL_PTL_U_H_I2C4, - PCI_DID_INTEL_PTL_U_H_I2C5, PCI_DID_INTEL_LNL_I2C0, PCI_DID_INTEL_LNL_I2C1, PCI_DID_INTEL_LNL_I2C2, PCI_DID_INTEL_LNL_I2C3, PCI_DID_INTEL_LNL_I2C4, PCI_DID_INTEL_LNL_I2C5, - PCI_DID_INTEL_MTL_I2C0, - PCI_DID_INTEL_MTL_I2C1, - PCI_DID_INTEL_MTL_I2C2, - PCI_DID_INTEL_MTL_I2C3, - PCI_DID_INTEL_MTL_I2C4, - PCI_DID_INTEL_MTL_I2C5, - PCI_DID_INTEL_ARL_I2C0, - PCI_DID_INTEL_ARL_I2C1, - PCI_DID_INTEL_ARL_I2C2, - PCI_DID_INTEL_ARL_I2C3, - PCI_DID_INTEL_ARL_I2C4, - PCI_DID_INTEL_ARL_I2C5, - PCI_DID_INTEL_ARP_S_I2C0, - PCI_DID_INTEL_ARP_S_I2C1, - PCI_DID_INTEL_ARP_S_I2C2, - PCI_DID_INTEL_ARP_S_I2C3, - PCI_DID_INTEL_ARP_S_I2C4, - PCI_DID_INTEL_ARP_S_I2C5, - PCI_DID_INTEL_APL_I2C0, - PCI_DID_INTEL_APL_I2C1, - PCI_DID_INTEL_APL_I2C2, - PCI_DID_INTEL_APL_I2C3, - PCI_DID_INTEL_APL_I2C4, - PCI_DID_INTEL_APL_I2C5, - PCI_DID_INTEL_APL_I2C6, - PCI_DID_INTEL_APL_I2C7, - PCI_DID_INTEL_CNL_I2C0, - PCI_DID_INTEL_CNL_I2C1, - PCI_DID_INTEL_CNL_I2C2, - PCI_DID_INTEL_CNL_I2C3, - PCI_DID_INTEL_CNL_I2C4, - PCI_DID_INTEL_CNL_I2C5, - PCI_DID_INTEL_GLK_I2C0, - PCI_DID_INTEL_GLK_I2C1, - PCI_DID_INTEL_GLK_I2C2, - PCI_DID_INTEL_GLK_I2C3, - PCI_DID_INTEL_GLK_I2C4, - PCI_DID_INTEL_GLK_I2C5, - PCI_DID_INTEL_GLK_I2C6, - PCI_DID_INTEL_GLK_I2C7, - PCI_DID_INTEL_CNP_H_I2C0, - PCI_DID_INTEL_CNP_H_I2C1, - PCI_DID_INTEL_CNP_H_I2C2, - PCI_DID_INTEL_CNP_H_I2C3, - PCI_DID_INTEL_CMP_I2C0, - PCI_DID_INTEL_CMP_I2C1, - PCI_DID_INTEL_CMP_I2C2, - PCI_DID_INTEL_CMP_I2C3, - PCI_DID_INTEL_CMP_I2C4, - PCI_DID_INTEL_CMP_I2C5, - PCI_DID_INTEL_CMP_H_I2C0, - PCI_DID_INTEL_CMP_H_I2C1, - PCI_DID_INTEL_CMP_H_I2C2, - PCI_DID_INTEL_CMP_H_I2C3, - PCI_DID_INTEL_TGP_I2C0, - PCI_DID_INTEL_TGP_I2C1, - PCI_DID_INTEL_TGP_I2C2, - PCI_DID_INTEL_TGP_I2C3, - PCI_DID_INTEL_TGP_I2C4, - PCI_DID_INTEL_TGP_I2C5, - PCI_DID_INTEL_TGP_I2C6, - PCI_DID_INTEL_TGP_I2C7, - PCI_DID_INTEL_TGP_H_I2C0, - PCI_DID_INTEL_TGP_H_I2C1, - PCI_DID_INTEL_TGP_H_I2C2, - PCI_DID_INTEL_TGP_H_I2C3, - PCI_DID_INTEL_TGP_H_I2C4, - PCI_DID_INTEL_TGP_H_I2C5, - PCI_DID_INTEL_TGP_H_I2C6, PCI_DID_INTEL_MCC_I2C0, PCI_DID_INTEL_MCC_I2C1, PCI_DID_INTEL_MCC_I2C2, @@ -281,38 +194,6 @@ static const unsigned short pci_device_ids[] = { PCI_DID_INTEL_MCC_I2C5, PCI_DID_INTEL_MCC_I2C6, PCI_DID_INTEL_MCC_I2C7, - PCI_DID_INTEL_JSP_I2C0, - PCI_DID_INTEL_JSP_I2C1, - PCI_DID_INTEL_JSP_I2C2, - PCI_DID_INTEL_JSP_I2C3, - PCI_DID_INTEL_JSP_I2C4, - PCI_DID_INTEL_JSP_I2C5, - PCI_DID_INTEL_ADP_P_I2C0, - PCI_DID_INTEL_ADP_P_I2C1, - PCI_DID_INTEL_ADP_P_I2C2, - PCI_DID_INTEL_ADP_P_I2C3, - PCI_DID_INTEL_ADP_P_I2C4, - PCI_DID_INTEL_ADP_P_I2C5, - PCI_DID_INTEL_ADP_P_I2C6, - PCI_DID_INTEL_ADP_P_I2C7, - PCI_DID_INTEL_ADP_S_I2C0, - PCI_DID_INTEL_ADP_S_I2C1, - PCI_DID_INTEL_ADP_S_I2C2, - PCI_DID_INTEL_ADP_S_I2C3, - PCI_DID_INTEL_ADP_S_I2C4, - PCI_DID_INTEL_ADP_S_I2C5, - PCI_DID_INTEL_ADP_M_N_I2C0, - PCI_DID_INTEL_ADP_M_N_I2C1, - PCI_DID_INTEL_ADP_M_N_I2C2, - PCI_DID_INTEL_ADP_M_N_I2C3, - PCI_DID_INTEL_ADP_M_N_I2C4, - PCI_DID_INTEL_ADP_M_N_I2C5, - PCI_DID_INTEL_RPP_S_I2C0, - PCI_DID_INTEL_RPP_S_I2C1, - PCI_DID_INTEL_RPP_S_I2C2, - PCI_DID_INTEL_RPP_S_I2C3, - PCI_DID_INTEL_RPP_S_I2C4, - PCI_DID_INTEL_RPP_S_I2C5, 0, }; diff --git a/src/soc/intel/jasperlake/chipset.cb b/src/soc/intel/jasperlake/chipset.cb index aa25ff5e8e..1a85aa8e40 100644 --- a/src/soc/intel/jasperlake/chipset.cb +++ b/src/soc/intel/jasperlake/chipset.cb @@ -65,16 +65,16 @@ chip soc/intel/jasperlake device pci 14.2 alias shared_ram off end device pci 14.3 alias cnvi_wifi off end device pci 14.5 alias sdxc off end - device pci 15.0 alias i2c0 off end - device pci 15.1 alias i2c1 off end - device pci 15.2 alias i2c2 off end - device pci 15.3 alias i2c3 off end + device pci 15.0 alias i2c0 off ops i2c_dev_ops end + device pci 15.1 alias i2c1 off ops i2c_dev_ops end + device pci 15.2 alias i2c2 off ops i2c_dev_ops end + device pci 15.3 alias i2c3 off ops i2c_dev_ops end device pci 16.0 alias heci1 off end device pci 16.1 alias heci2 off end device pci 16.4 alias heci3 off end device pci 17.0 alias sata off end - device pci 19.0 alias i2c4 off end - device pci 19.1 alias i2c5 off end + device pci 19.0 alias i2c4 off ops i2c_dev_ops end + device pci 19.1 alias i2c5 off ops i2c_dev_ops end device pci 19.2 alias uart2 off end device pci 1a.0 alias emmc off end device pci 1c.0 alias pcie_rp1 off ops pcie_rp_ops end diff --git a/src/soc/intel/meteorlake/chipset.cb b/src/soc/intel/meteorlake/chipset.cb index 6851b5769f..57c82b3b61 100644 --- a/src/soc/intel/meteorlake/chipset.cb +++ b/src/soc/intel/meteorlake/chipset.cb @@ -153,10 +153,10 @@ chip soc/intel/meteorlake device pci 14.2 alias pmc_shared_sram off end device pci 14.3 alias cnvi_wifi off end device pci 14.5 alias ieh off end - device pci 15.0 alias i2c0 off end - device pci 15.1 alias i2c1 off end - device pci 15.2 alias i2c2 off end - device pci 15.3 alias i2c3 off end + device pci 15.0 alias i2c0 off ops i2c_dev_ops end + device pci 15.1 alias i2c1 off ops i2c_dev_ops end + device pci 15.2 alias i2c2 off ops i2c_dev_ops end + device pci 15.3 alias i2c3 off ops i2c_dev_ops end device pci 15.4 alias i3c off end device pci 16.0 alias heci1 on end device pci 16.1 alias heci2 off end @@ -166,8 +166,8 @@ chip soc/intel/meteorlake device pci 18.0 alias eheci1 off end device pci 18.1 alias eheci2 off end device pci 18.2 alias eheci3 off end - device pci 19.0 alias i2c4 off end - device pci 19.1 alias i2c5 off end + device pci 19.0 alias i2c4 off ops i2c_dev_ops end + device pci 19.1 alias i2c5 off ops i2c_dev_ops end device pci 19.2 alias uart2 off end device pci 1c.0 alias pcie_rp1 off ops pcie_rp_ops end device pci 1c.1 alias pcie_rp2 off ops pcie_rp_ops end diff --git a/src/soc/intel/pantherlake/chipset_ptl.cb b/src/soc/intel/pantherlake/chipset_ptl.cb index 31a898182f..e45558b4ec 100644 --- a/src/soc/intel/pantherlake/chipset_ptl.cb +++ b/src/soc/intel/pantherlake/chipset_ptl.cb @@ -215,10 +215,10 @@ chip soc/intel/pantherlake device pci 14.3 alias cnvi_wifi off end device pci 14.7 alias cnvi_bluetooth off end device pci 14.5 alias ieh off end - device pci 15.0 alias i2c0 off end - device pci 15.1 alias i2c1 off end - device pci 15.2 alias i2c2 off end - device pci 15.3 alias i2c3 off end + device pci 15.0 alias i2c0 off ops i2c_dev_ops end + device pci 15.1 alias i2c1 off ops i2c_dev_ops end + device pci 15.2 alias i2c2 off ops i2c_dev_ops end + device pci 15.3 alias i2c3 off ops i2c_dev_ops end device pci 16.0 alias heci1 on end device pci 16.1 alias heci2 off end device pci 16.4 alias heci3 off end @@ -226,8 +226,8 @@ chip soc/intel/pantherlake device pci 18.0 alias eheci1 off end device pci 18.1 alias eheci2 off end device pci 18.2 alias eheci3 off end - device pci 19.0 alias i2c4 off end - device pci 19.1 alias i2c5 off end + device pci 19.0 alias i2c4 off ops i2c_dev_ops end + device pci 19.1 alias i2c5 off ops i2c_dev_ops end device pci 19.2 alias uart2 off end device pci 1c.0 alias pcie_rp1 off ops pcie_rp_ops end device pci 1c.1 alias pcie_rp2 off ops pcie_rp_ops end diff --git a/src/soc/intel/pantherlake/chipset_wcl.cb b/src/soc/intel/pantherlake/chipset_wcl.cb index 2236d930e2..3d4f641260 100644 --- a/src/soc/intel/pantherlake/chipset_wcl.cb +++ b/src/soc/intel/pantherlake/chipset_wcl.cb @@ -101,10 +101,10 @@ chip soc/intel/pantherlake device pci 14.3 alias cnvi_wifi off end device pci 14.7 alias cnvi_bluetooth off end device pci 14.5 alias ieh off end - device pci 15.0 alias i2c0 off end - device pci 15.1 alias i2c1 off end - device pci 15.2 alias i2c2 off end - device pci 15.3 alias i2c3 off end + device pci 15.0 alias i2c0 off ops i2c_dev_ops end + device pci 15.1 alias i2c1 off ops i2c_dev_ops end + device pci 15.2 alias i2c2 off ops i2c_dev_ops end + device pci 15.3 alias i2c3 off ops i2c_dev_ops end device pci 16.0 alias heci1 on end device pci 16.1 alias heci2 off end device pci 16.4 alias heci3 off end @@ -113,8 +113,8 @@ chip soc/intel/pantherlake device pci 18.0 alias eheci1 off end device pci 18.1 alias eheci2 off end device pci 18.2 alias eheci3 off end - device pci 19.0 alias i2c4 off end - device pci 19.1 alias i2c5 off end + device pci 19.0 alias i2c4 off ops i2c_dev_ops end + device pci 19.1 alias i2c5 off ops i2c_dev_ops end device pci 19.2 alias uart2 off end device pci 1c.0 alias pcie_rp1 off ops pcie_rp_ops end device pci 1c.1 alias pcie_rp2 off ops pcie_rp_ops end diff --git a/src/soc/intel/tigerlake/chipset.cb b/src/soc/intel/tigerlake/chipset.cb index bdf0138229..38cfc0dca1 100644 --- a/src/soc/intel/tigerlake/chipset.cb +++ b/src/soc/intel/tigerlake/chipset.cb @@ -115,10 +115,10 @@ chip soc/intel/tigerlake device pci 14.1 alias south_xdci off end device pci 14.2 alias shared_ram off end device pci 14.3 alias cnvi_wifi off end - device pci 15.0 alias i2c0 off end - device pci 15.1 alias i2c1 off end - device pci 15.2 alias i2c2 off end - device pci 15.3 alias i2c3 off end + device pci 15.0 alias i2c0 off ops i2c_dev_ops end + device pci 15.1 alias i2c1 off ops i2c_dev_ops end + device pci 15.2 alias i2c2 off ops i2c_dev_ops end + device pci 15.3 alias i2c3 off ops i2c_dev_ops end device pci 16.0 alias heci1 off end device pci 16.1 alias heci2 off end device pci 16.2 alias csme1 off end @@ -126,8 +126,8 @@ chip soc/intel/tigerlake device pci 16.4 alias heci3 off end device pci 16.5 alias heci4 off end device pci 17.0 alias sata off end - device pci 19.0 alias i2c4 off end - device pci 19.1 alias i2c5 off end + device pci 19.0 alias i2c4 off ops i2c_dev_ops end + device pci 19.1 alias i2c5 off ops i2c_dev_ops end device pci 19.2 alias uart2 off end device pci 1c.0 alias pcie_rp1 off ops pcie_rp_ops end device pci 1c.1 alias pcie_rp2 off ops pcie_rp_ops end diff --git a/src/soc/intel/tigerlake/chipset_pch_h.cb b/src/soc/intel/tigerlake/chipset_pch_h.cb index e2c7022546..a43778794c 100644 --- a/src/soc/intel/tigerlake/chipset_pch_h.cb +++ b/src/soc/intel/tigerlake/chipset_pch_h.cb @@ -63,7 +63,7 @@ chip soc/intel/tigerlake device pci 10.6 alias thc0 off end device pci 10.7 alias thc1 off end device pci 11.0 alias uart3 off end - device pci 11.3 alias i2c6 off end + device pci 11.3 alias i2c6 off ops i2c_dev_ops end device pci 12.0 alias ish off end device pci 12.6 alias gspi2 off end device pci 13.0 alias gspi3 off end @@ -137,10 +137,10 @@ chip soc/intel/tigerlake device pci 14.1 alias south_xdci off end device pci 14.2 alias shared_ram off end device pci 14.3 alias cnvi_wifi off end - device pci 15.0 alias i2c0 off end - device pci 15.1 alias i2c1 off end - device pci 15.2 alias i2c2 off end - device pci 15.3 alias i2c3 off end + device pci 15.0 alias i2c0 off ops i2c_dev_ops end + device pci 15.1 alias i2c1 off ops i2c_dev_ops end + device pci 15.2 alias i2c2 off ops i2c_dev_ops end + device pci 15.3 alias i2c3 off ops i2c_dev_ops end device pci 16.0 alias heci1 off end device pci 16.1 alias heci2 off end device pci 16.2 alias csme1 off end @@ -148,8 +148,8 @@ chip soc/intel/tigerlake device pci 16.4 alias heci3 off end device pci 16.5 alias heci4 off end device pci 17.0 alias sata off end - device pci 19.0 alias i2c4 off end - device pci 19.1 alias i2c5 off end + device pci 19.0 alias i2c4 off ops i2c_dev_ops end + device pci 19.1 alias i2c5 off ops i2c_dev_ops end device pci 19.2 alias uart2 off end device pci 1b.0 alias pcie_rp17 off ops pcie_rp_ops end device pci 1b.1 alias pcie_rp18 off ops pcie_rp_ops end