Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42522 )
Change subject: [WIP] soc/amd/common/blocks: Drop ACPIMMIO gpio1_ and gpio2_ banks ......................................................................
[WIP] soc/amd/common/blocks: Drop ACPIMMIO gpio1_ and gpio2_ banks
The banks are one after each other in the ACPIMMIO space. Also there is space for more banks and existing ASL takes advantage of this property.
Change-Id: Ib78559a60b5c20d53a60e1726ee2aad1f38f78ce Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/amd/common/block/acpimmio/mmio_util.c M src/soc/amd/common/block/include/amdblocks/acpimmio.h M src/soc/amd/common/block/include/amdblocks/acpimmio_map.h 3 files changed, 0 insertions(+), 66 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/42522/1
diff --git a/src/soc/amd/common/block/acpimmio/mmio_util.c b/src/soc/amd/common/block/acpimmio/mmio_util.c index 60a9efd..c5f82f9 100644 --- a/src/soc/amd/common/block/acpimmio/mmio_util.c +++ b/src/soc/amd/common/block/acpimmio/mmio_util.c @@ -22,8 +22,6 @@ DECLARE_ACPIMMIO(acpimmio_misc, MISC); DECLARE_ACPIMMIO(acpimmio_dpvga, DPVGA); DECLARE_ACPIMMIO(acpimmio_gpio0, GPIO0); -DECLARE_ACPIMMIO(acpimmio_gpio1, GPIO1); -DECLARE_ACPIMMIO(acpimmio_gpio2, GPIO2); DECLARE_ACPIMMIO(acpimmio_xhci_pm, XHCIPM); DECLARE_ACPIMMIO(acpimmio_acdc_tmr, ACDCTMR); DECLARE_ACPIMMIO(acpimmio_aoac, AOAC); diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio.h b/src/soc/amd/common/block/include/amdblocks/acpimmio.h index 3d0a17b..3caed11 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpimmio.h +++ b/src/soc/amd/common/block/include/amdblocks/acpimmio.h @@ -344,68 +344,6 @@ write32(acpimmio_gpio0 + reg, value); }
-/* GPIO bank 1 */ -static inline uint8_t gpio1_read8(uint8_t reg) -{ - return read8(acpimmio_gpio1 + reg); -} - -static inline uint16_t gpio1_read16(uint8_t reg) -{ - return read16(acpimmio_gpio1 + reg); -} - -static inline uint32_t gpio1_read32(uint8_t reg) -{ - return read32(acpimmio_gpio1 + reg); -} - -static inline void gpio1_write8(uint8_t reg, uint8_t value) -{ - write8(acpimmio_gpio1 + reg, value); -} - -static inline void gpio1_write16(uint8_t reg, uint16_t value) -{ - write16(acpimmio_gpio1 + reg, value); -} - -static inline void gpio1_write32(uint8_t reg, uint32_t value) -{ - write32(acpimmio_gpio1 + reg, value); -} - -/* GPIO bank 2 */ -static inline uint8_t gpio2_read8(uint8_t reg) -{ - return read8(acpimmio_gpio2 + reg); -} - -static inline uint16_t gpio2_read16(uint8_t reg) -{ - return read16(acpimmio_gpio2 + reg); -} - -static inline uint32_t gpio2_read32(uint8_t reg) -{ - return read32(acpimmio_gpio2 + reg); -} - -static inline void gpio2_write8(uint8_t reg, uint8_t value) -{ - write8(acpimmio_gpio2 + reg, value); -} - -static inline void gpio2_write16(uint8_t reg, uint16_t value) -{ - write16(acpimmio_gpio2 + reg, value); -} - -static inline void gpio2_write32(uint8_t reg, uint32_t value) -{ - write32(acpimmio_gpio2 + reg, value); -} - static inline uint8_t xhci_pm_read8(uint8_t reg) { return read8(acpimmio_xhci_pm + reg); diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h b/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h index 5d1e881..912e891 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h +++ b/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h @@ -178,8 +178,6 @@ extern uint8_t *MAYBE_CONST acpimmio_misc; extern uint8_t *MAYBE_CONST acpimmio_dpvga; extern uint8_t *MAYBE_CONST acpimmio_gpio0; -extern uint8_t *MAYBE_CONST acpimmio_gpio1; -extern uint8_t *MAYBE_CONST acpimmio_gpio2; extern uint8_t *MAYBE_CONST acpimmio_xhci_pm; extern uint8_t *MAYBE_CONST acpimmio_acdc_tmr; extern uint8_t *MAYBE_CONST acpimmio_aoac;