diff --git a/src/soc/intel/apollolake/chipset_apl.cb b/src/soc/intel/apollolake/chipset_apl.cb index f8bb1b0fd5..fc2ec2822d 100644 --- a/src/soc/intel/apollolake/chipset_apl.cb +++ b/src/soc/intel/apollolake/chipset_apl.cb @@ -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 diff --git a/src/soc/intel/cannonlake/chipset.cb b/src/soc/intel/cannonlake/chipset.cb index fafb02bf50..ff68963c3e 100644 --- a/src/soc/intel/cannonlake/chipset.cb +++ b/src/soc/intel/cannonlake/chipset.cb @@ -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 diff --git a/src/soc/intel/cannonlake/chipset_pch_h.cb b/src/soc/intel/cannonlake/chipset_pch_h.cb index 2ce5269274..de36773c50 100644 --- a/src/soc/intel/cannonlake/chipset_pch_h.cb +++ b/src/soc/intel/cannonlake/chipset_pch_h.cb @@ -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 diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c index eee02009f1..84eac7ef75 100644 --- a/src/soc/intel/common/block/scs/sd.c +++ b/src/soc/intel/common/block/scs/sd.c @@ -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 }; diff --git a/src/soc/intel/jasperlake/chipset.cb b/src/soc/intel/jasperlake/chipset.cb index 278ba50050..cbd5d2efc9 100644 --- a/src/soc/intel/jasperlake/chipset.cb +++ b/src/soc/intel/jasperlake/chipset.cb @@ -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