soc/amd/mendocino: drop code for non-existing eMMC controller

Mendocino and Rembrandt don't have an eMMC controller and also don't
have GPIO pins that eMMC signals can be multiplexed on, so drop the eMMC
related code from Mendocino.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ib8ec49a7084bdd62e480baee75a280fde8b13d01
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74660
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
This commit is contained in:
Felix Held 2023-04-21 18:56:28 +02:00
parent d1128878e9
commit faa9fb6f7f
10 changed files with 1 additions and 19 deletions

View File

@ -33,7 +33,6 @@ static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_SCI, ACPI_SCI_IRQ, ACPI_SCI_IRQ }, { PIRQ_SCI, ACPI_SCI_IRQ, ACPI_SCI_IRQ },
{ PIRQ_SD, PIRQ_NC, PIRQ_NC }, { PIRQ_SD, PIRQ_NC, PIRQ_NC },
{ PIRQ_SDIO, PIRQ_NC, PIRQ_NC }, { PIRQ_SDIO, PIRQ_NC, PIRQ_NC },
{ PIRQ_EMMC, PIRQ_NC, PIRQ_NC },
{ PIRQ_GPIO, 11, 11 }, { PIRQ_GPIO, 11, 11 },
{ PIRQ_I2C0, 10, 10 }, { PIRQ_I2C0, 10, 10 },
{ PIRQ_I2C1, 7, 7 }, { PIRQ_I2C1, 7, 7 },

View File

@ -39,7 +39,6 @@ static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_SCI, ACPI_SCI_IRQ, ACPI_SCI_IRQ }, { PIRQ_SCI, ACPI_SCI_IRQ, ACPI_SCI_IRQ },
{ PIRQ_SD, PIRQ_NC, PIRQ_NC }, { PIRQ_SD, PIRQ_NC, PIRQ_NC },
{ PIRQ_SDIO, PIRQ_NC, PIRQ_NC }, { PIRQ_SDIO, PIRQ_NC, PIRQ_NC },
{ PIRQ_EMMC, PIRQ_NC, PIRQ_NC },
{ PIRQ_GPIO, 11, 11 }, { PIRQ_GPIO, 11, 11 },
{ PIRQ_I2C0, 10, 10 }, { PIRQ_I2C0, 10, 10 },
{ PIRQ_I2C1, 7, 7 }, { PIRQ_I2C1, 7, 7 },

View File

@ -45,7 +45,6 @@ config SOC_AMD_REMBRANDT_BASE
select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
select SOC_AMD_COMMON_BLOCK_CPUFREQ_FAM17H_19H select SOC_AMD_COMMON_BLOCK_CPUFREQ_FAM17H_19H
select SOC_AMD_COMMON_BLOCK_DATA_FABRIC select SOC_AMD_COMMON_BLOCK_DATA_FABRIC
select SOC_AMD_COMMON_BLOCK_EMMC
select SOC_AMD_COMMON_BLOCK_ESPI_EXTENDED_DECODE_RANGES select SOC_AMD_COMMON_BLOCK_ESPI_EXTENDED_DECODE_RANGES
select SOC_AMD_COMMON_BLOCK_GRAPHICS select SOC_AMD_COMMON_BLOCK_GRAPHICS
select SOC_AMD_COMMON_BLOCK_HAS_ESPI select SOC_AMD_COMMON_BLOCK_HAS_ESPI

View File

@ -20,9 +20,6 @@ IndexField(PRQI, PRQD, ByteAcc, NoLock, Preserve) {
PIRG, 0x00000008, /* Index 6: INTG */ PIRG, 0x00000008, /* Index 6: INTG */
PIRH, 0x00000008, /* Index 7: INTH */ PIRH, 0x00000008, /* Index 7: INTH */
Offset (0x43),
PMMC, 0x00000008, /* Index 0x43: eMMC */
Offset (0x62), Offset (0x62),
PGPI, 0x00000008, /* Index 0x62: GPIO */ PGPI, 0x00000008, /* Index 0x62: GPIO */
@ -49,9 +46,6 @@ IndexField(PRQI, PRQD, ByteAcc, NoLock, Preserve) {
IORG, 0x00000008, /* Index 0x86: INTG */ IORG, 0x00000008, /* Index 0x86: INTG */
IORH, 0x00000008, /* Index 0x87: INTH */ IORH, 0x00000008, /* Index 0x87: INTH */
Offset (0xC3),
IMMC, 0x00000008, /* Index 0xC3: eMMC */
Offset (0xE2), Offset (0xE2),
IGPI, 0x00000008, /* Index 0xE2: GPIO */ IGPI, 0x00000008, /* Index 0xE2: GPIO */

View File

@ -90,5 +90,4 @@ chip soc/amd/mendocino
device mmio 0xfedce000 alias uart_2 off ops amd_uart_mmio_ops end device mmio 0xfedce000 alias uart_2 off ops amd_uart_mmio_ops end
device mmio 0xfedcf000 alias uart_3 off ops amd_uart_mmio_ops end device mmio 0xfedcf000 alias uart_3 off ops amd_uart_mmio_ops end
device mmio 0xfedd1000 alias uart_4 off ops amd_uart_mmio_ops end device mmio 0xfedd1000 alias uart_4 off ops amd_uart_mmio_ops end
device mmio 0xfedd5000 alias emmc off ops amd_emmc_mmio_ops end
end end

View File

@ -93,5 +93,4 @@ chip soc/amd/mendocino
device mmio 0xfedce000 alias uart_2 off ops amd_uart_mmio_ops end device mmio 0xfedce000 alias uart_2 off ops amd_uart_mmio_ops end
device mmio 0xfedcf000 alias uart_3 off ops amd_uart_mmio_ops end device mmio 0xfedcf000 alias uart_3 off ops amd_uart_mmio_ops end
device mmio 0xfedd1000 alias uart_4 off ops amd_uart_mmio_ops end device mmio 0xfedd1000 alias uart_4 off ops amd_uart_mmio_ops end
device mmio 0xfedd5000 alias emmc off ops amd_emmc_mmio_ops end
end end

View File

@ -52,7 +52,6 @@ static const struct irq_idx_name irq_association[] = {
{ PIRQ_GPIOA, "GPIOa" }, { PIRQ_GPIOA, "GPIOa" },
{ PIRQ_GPIOB, "GPIOb" }, { PIRQ_GPIOB, "GPIOb" },
{ PIRQ_GPIOC, "GPIOc" }, { PIRQ_GPIOC, "GPIOc" },
{ PIRQ_EMMC, "eMMC" },
{ PIRQ_GPP0, "GPP0" }, { PIRQ_GPP0, "GPP0" },
{ PIRQ_GPP1, "GPP1" }, { PIRQ_GPP1, "GPP1" },
{ PIRQ_GPP2, "GPP2" }, { PIRQ_GPP2, "GPP2" },

View File

@ -38,9 +38,7 @@
#define PIRQ_GPIOA 0x21 /* GPIOa from PAD_FANIN0 */ #define PIRQ_GPIOA 0x21 /* GPIOa from PAD_FANIN0 */
#define PIRQ_GPIOB 0x22 /* GPIOb from PAD_FANOUT0 */ #define PIRQ_GPIOB 0x22 /* GPIOb from PAD_FANOUT0 */
#define PIRQ_GPIOC 0x23 /* GPIOc no IRQ connected */ #define PIRQ_GPIOC 0x23 /* GPIOc no IRQ connected */
/* 0x24-0x42 reserved */ /* 0x24-0x4f reserved */
#define PIRQ_EMMC 0x43 /* eMMC */
/* 0x44-0x4f reserved */
#define PIRQ_GPP0 0x50 /* GPPInt0 */ #define PIRQ_GPP0 0x50 /* GPPInt0 */
#define PIRQ_GPP1 0x51 /* GPPInt1 */ #define PIRQ_GPP1 0x51 /* GPPInt1 */
#define PIRQ_GPP2 0x52 /* GPPInt2 */ #define PIRQ_GPP2 0x52 /* GPPInt2 */

View File

@ -18,6 +18,5 @@
#define FCH_AOAC_DEV_UART4 20 #define FCH_AOAC_DEV_UART4 20
#define FCH_AOAC_DEV_UART3 26 #define FCH_AOAC_DEV_UART3 26
#define FCH_AOAC_DEV_ESPI 27 #define FCH_AOAC_DEV_ESPI 27
#define FCH_AOAC_DEV_EMMC 28
#endif /* AMD_MENDOCINO_AOAC_DEFS_H */ #endif /* AMD_MENDOCINO_AOAC_DEFS_H */

View File

@ -34,9 +34,6 @@
#define APU_DMAC4_BASE 0xfedd0000 #define APU_DMAC4_BASE 0xfedd0000
#define APU_UART4_BASE 0xfedd1000 #define APU_UART4_BASE 0xfedd1000
#define APU_EMMC_BASE 0xfedd5000
#define APU_EMMC_CONFIG_BASE 0xfedd5800
#endif /* ENV_X86 */ #endif /* ENV_X86 */
#define FLASH_BASE_ADDR ((0xffffffff - CONFIG_ROM_SIZE) + 1) #define FLASH_BASE_ADDR ((0xffffffff - CONFIG_ROM_SIZE) + 1)