[coreboot-gerrit] [S] Change in coreboot[master]: soc/amd/glinda: drop code for non-existing eMMC controller

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74662 )

Change subject: soc/amd/glinda: drop code for non-existing eMMC controller
......................................................................

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

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

Signed-off-by: Felix Held 
Change-Id: I49ead01075780ea97dae99a36632f7659fd00587
---
M src/soc/amd/glinda/Kconfig
M src/soc/amd/glinda/acpi/pci_int_defs.asl
M src/soc/amd/glinda/chipset.cb
M src/soc/amd/glinda/fch.c
M src/soc/amd/glinda/include/soc/amd_pci_int_defs.h
M src/soc/amd/glinda/include/soc/aoac_defs.h
M src/soc/amd/glinda/include/soc/iomap.h
7 files changed, 15 insertions(+), 16 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/74662/1

diff --git a/src/soc/amd/glinda/Kconfig b/src/soc/amd/glinda/Kconfig
index 77be8af..d80eb3f 100644
--- a/src/soc/amd/glinda/Kconfig
+++ b/src/soc/amd/glinda/Kconfig
@@ -46,7 +46,6 @@
    select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS	# TODO: Check if this is still correct
    select SOC_AMD_COMMON_BLOCK_CPUFREQ_FAM1AH
    select SOC_AMD_COMMON_BLOCK_DATA_FABRIC
-	select SOC_AMD_COMMON_BLOCK_EMMC		# TODO: Check if this is still correct
    select SOC_AMD_COMMON_BLOCK_ESPI_EXTENDED_DECODE_RANGES # TODO: Check if this is still correct
    select SOC_AMD_COMMON_BLOCK_GRAPHICS		# TODO: Check if this is still correct
    select SOC_AMD_COMMON_BLOCK_HAS_ESPI		# TODO: Check if this is still correct
diff --git a/src/soc/amd/glinda/acpi/pci_int_defs.asl b/src/soc/amd/glinda/acpi/pci_int_defs.asl
index 17b7cd7..dfbf5c7 100644
--- a/src/soc/amd/glinda/acpi/pci_int_defs.asl
+++ b/src/soc/amd/glinda/acpi/pci_int_defs.asl
@@ -22,9 +22,6 @@
    PIRG, 0x00000008,	/* Index 6: INTG */
    PIRH, 0x00000008,	/* Index 7: INTH */

-	Offset (0x43),
-	PMMC, 0x00000008,	/* Index 0x43: eMMC */
-
    Offset (0x62),
    PGPI, 0x00000008,	/* Index 0x62: GPIO */

@@ -51,9 +48,6 @@
    IORG, 0x00000008,	/* Index 0x86: INTG */
    IORH, 0x00000008,	/* Index 0x87: INTH */

-	Offset (0xC3),
-	IMMC, 0x00000008,	/* Index 0xC3: eMMC */
-
    Offset (0xE2),
    IGPI, 0x00000008,	/* Index 0xE2: GPIO */

diff --git a/src/soc/amd/glinda/chipset.cb b/src/soc/amd/glinda/chipset.cb
index d54bae0..ad477c7 100644
--- a/src/soc/amd/glinda/chipset.cb
+++ b/src/soc/amd/glinda/chipset.cb
@@ -95,5 +95,4 @@
    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 0xfedd1000 alias uart_4 off ops amd_uart_mmio_ops end
-	device mmio 0xfedd5000 alias emmc off ops amd_emmc_mmio_ops end
 end
diff --git a/src/soc/amd/glinda/fch.c b/src/soc/amd/glinda/fch.c
index 5608e7c..93597c9 100644
--- a/src/soc/amd/glinda/fch.c
+++ b/src/soc/amd/glinda/fch.c
@@ -53,7 +53,6 @@
    { PIRQ_GPIOA,	"GPIOa" },
    { PIRQ_GPIOB,	"GPIOb" },
    { PIRQ_GPIOC,	"GPIOc" },
-	{ PIRQ_EMMC,	"eMMC" },
    { PIRQ_GPP0,	"GPP0" },
    { PIRQ_GPP1,	"GPP1" },
    { PIRQ_GPP2,	"GPP2" },
diff --git a/src/soc/amd/glinda/include/soc/amd_pci_int_defs.h b/src/soc/amd/glinda/include/soc/amd_pci_int_defs.h
index 7f9b1da..c7ff65b 100644
--- a/src/soc/amd/glinda/include/soc/amd_pci_int_defs.h
+++ b/src/soc/amd/glinda/include/soc/amd_pci_int_defs.h
@@ -40,9 +40,7 @@
 #define PIRQ_GPIOA	0x21	/* GPIOa from PAD_FANIN0 */
 #define PIRQ_GPIOB	0x22	/* GPIOb from PAD_FANOUT0 */
 #define PIRQ_GPIOC	0x23	/* GPIOc no IRQ connected */
-/* 0x24-0x42 reserved */
-#define PIRQ_EMMC	0x43	/* eMMC */
-/* 0x44-0x4f reserved */
+/* 0x24-0x4f reserved */
 #define PIRQ_GPP0	0x50	/* GPPInt0 */
 #define PIRQ_GPP1	0x51	/* GPPInt1 */
 #define PIRQ_GPP2	0x52	/* GPPInt2 */
diff --git a/src/soc/amd/glinda/include/soc/aoac_defs.h b/src/soc/amd/glinda/include/soc/aoac_defs.h
index 0edd823..b923ab3 100644
--- a/src/soc/amd/glinda/include/soc/aoac_defs.h
+++ b/src/soc/amd/glinda/include/soc/aoac_defs.h
@@ -20,6 +20,5 @@
 #define FCH_AOAC_DEV_UART4		20
 #define FCH_AOAC_DEV_UART3		26
 #define FCH_AOAC_DEV_ESPI		27
-#define FCH_AOAC_DEV_EMMC		28

#endif /* AMD_GLINDA_AOAC_DEFS_H */
diff --git a/src/soc/amd/glinda/include/soc/iomap.h b/src/soc/amd/glinda/include/soc/iomap.h
index b335b3f..30fff9f 100644
--- a/src/soc/amd/glinda/include/soc/iomap.h
+++ b/src/soc/amd/glinda/include/soc/iomap.h
@@ -36,9 +36,6 @@
 #define APU_DMAC4_BASE			0xfedd0000
 #define APU_UART4_BASE			0xfedd1000

-#define APU_EMMC_BASE			0xfedd5000
-#define APU_EMMC_CONFIG_BASE		0xfedd5800
-
 #endif /* ENV_X86 */

#define FLASH_BASE_ADDR			((0xffffffff - CONFIG_ROM_SIZE) + 1)