soc/intel: Use chipset.cb for SDXC device ops linking
Move SDXC 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 sd.c for these SoCs; keep DID matching only for SoCs without chipset.cb files. This standardizes the approach across Intel SoCs and makes the SDXC controller configuration explicit in devicetree, and prevents the endless proliferation of DIDs in the common driver code. Change-Id: Ifee16988d0e5625a7b3c2be51ab70d2c8471747a Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/90923 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Jakub "Kuba" Czapiga <czapiga@google.com>
This commit is contained in:
parent
0d947e59cb
commit
b4b4d6c730
5 changed files with 4 additions and 10 deletions
|
|
@ -40,7 +40,7 @@ chip soc/intel/apollolake
|
|||
device pci 19.1 alias spi1 off ops spi_dev_ops end # SPI1
|
||||
device pci 19.2 alias spi2 off ops spi_dev_ops end # SPI3
|
||||
device pci 1a.0 alias pwm off end # PWM
|
||||
device pci 1b.0 alias sdcard off end # SD Card
|
||||
device pci 1b.0 alias sdcard off ops sd_ops end # SD Card
|
||||
device pci 1c.0 alias emmc off end # eMMC
|
||||
device pci 1e.0 alias sdio off end # SDIO
|
||||
device pci 1f.0 alias lpc_espi on end # LPC
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ chip soc/intel/cannonlake
|
|||
device pci 14.1 alias xdci off ops usb_xdci_ops end # USB xDCI (OTG)
|
||||
device pci 14.2 alias shared_sram off end # Shared SRAM
|
||||
device pci 14.3 alias cnvi_wifi off ops cnvi_wifi_ops end # CNVi Wifi
|
||||
device pci 14.5 alias sdxc off end # SDCard
|
||||
device pci 14.5 alias sdxc off ops sd_ops end # SDCard
|
||||
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
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ chip soc/intel/cannonlake
|
|||
device pci 14.1 alias xdci off ops usb_xdci_ops end # USB xDCI (OTG)
|
||||
device pci 14.2 alias shared_sram off end # Shared SRAM
|
||||
device pci 14.3 alias cnvi_wifi off ops cnvi_wifi_ops end # CNVi Wifi
|
||||
device pci 14.5 alias sdxc off end # SDCard
|
||||
device pci 14.5 alias sdxc off ops sd_ops end # SDCard
|
||||
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
|
||||
|
|
|
|||
|
|
@ -49,14 +49,8 @@ struct device_operations sd_ops = {
|
|||
};
|
||||
|
||||
static const unsigned short pci_device_ids[] = {
|
||||
PCI_DID_INTEL_APL_SD,
|
||||
PCI_DID_INTEL_CNL_SD,
|
||||
PCI_DID_INTEL_GLK_SD,
|
||||
PCI_DID_INTEL_CNP_H_SD,
|
||||
PCI_DID_INTEL_CMP_SD,
|
||||
PCI_DID_INTEL_CMP_H_SD,
|
||||
PCI_DID_INTEL_MCC_SD,
|
||||
PCI_DID_INTEL_JSP_SD,
|
||||
0
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ chip soc/intel/jasperlake
|
|||
device pci 14.1 alias south_xdci off ops usb_xdci_ops end
|
||||
device pci 14.2 alias shared_ram off end
|
||||
device pci 14.3 alias cnvi_wifi off ops cnvi_wifi_ops end
|
||||
device pci 14.5 alias sdxc off end
|
||||
device pci 14.5 alias sdxc off ops sd_ops 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue