summaryrefslogtreecommitdiffstats
path: root/src/soc/amd/cezanne
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/amd/cezanne')
-rw-r--r--src/soc/amd/cezanne/Kconfig1
-rw-r--r--src/soc/amd/cezanne/Makefile.inc1
-rw-r--r--src/soc/amd/cezanne/chipset.cb2
-rw-r--r--src/soc/amd/cezanne/emmc.c23
4 files changed, 2 insertions, 25 deletions
diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index 35b9215586dc..b8209f83a9a1 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -46,6 +46,7 @@ config SOC_SPECIFIC_OPTIONS
select SOC_AMD_COMMON_BLOCK_APOB
select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
select SOC_AMD_COMMON_BLOCK_DATA_FABRIC
+ select SOC_AMD_COMMON_BLOCK_EMMC
select SOC_AMD_COMMON_BLOCK_GRAPHICS
select SOC_AMD_COMMON_BLOCK_HAS_ESPI
select SOC_AMD_COMMON_BLOCK_I2C
diff --git a/src/soc/amd/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.inc
index 95ab4edb4bd7..dc97c1ff4d45 100644
--- a/src/soc/amd/cezanne/Makefile.inc
+++ b/src/soc/amd/cezanne/Makefile.inc
@@ -33,7 +33,6 @@ ramstage-y += agesa_acpi.c
ramstage-y += chip.c
ramstage-y += cpu.c
ramstage-y += data_fabric.c
-ramstage-y += emmc.c
ramstage-y += fch.c
ramstage-y += fsp_s_params.c
ramstage-y += gpio.c
diff --git a/src/soc/amd/cezanne/chipset.cb b/src/soc/amd/cezanne/chipset.cb
index a9bc2568a161..e717fd47c52d 100644
--- a/src/soc/amd/cezanne/chipset.cb
+++ b/src/soc/amd/cezanne/chipset.cb
@@ -113,5 +113,5 @@ chip soc/amd/cezanne
device mmio 0xfedc5000 alias i2c_3 off ops soc_amd_i2c_mmio_ops end
device mmio 0xfedc9000 alias uart_0 off ops cezanne_uart_mmio_ops end
device mmio 0xfedca000 alias uart_1 off ops cezanne_uart_mmio_ops end
- device mmio 0xfedd5000 alias emmc off ops cezanne_emmc_mmio_ops end
+ device mmio 0xfedd5000 alias emmc off ops amd_emmc_mmio_ops end
end
diff --git a/src/soc/amd/cezanne/emmc.c b/src/soc/amd/cezanne/emmc.c
deleted file mode 100644
index a699b20f518b..000000000000
--- a/src/soc/amd/cezanne/emmc.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <amdblocks/aoac.h>
-#include <device/device.h>
-#include <soc/aoac_defs.h>
-
-static void emmc_read_resources(struct device *dev)
-{
- mmio_resource_kb(dev, 0, dev->path.mmio.addr / KiB, 4);
-}
-
-static void emmc_enable(struct device *dev)
-{
- if (!dev->enabled)
- power_off_aoac_device(FCH_AOAC_DEV_EMMC);
-}
-
-struct device_operations cezanne_emmc_mmio_ops = {
- .read_resources = emmc_read_resources,
- .set_resources = noop_set_resources,
- .scan_bus = scan_static_bus,
- .enable = emmc_enable,
-};