summaryrefslogtreecommitdiff
path: root/src/southbridge
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-23 11:13:56 +0000
committerPatrick Georgi <pgeorgi@google.com>2020-06-30 06:00:57 +0000
commitc5646e426be24bff03acd4e90f5e343a64a6a211 (patch)
treec4504fd4db23d84ddfb9b7c5a7632b8a38b2350f /src/southbridge
parentf8668e98902d0ac6589ca9652206468ab370e2f2 (diff)
downloadcoreboot-c5646e426be24bff03acd4e90f5e343a64a6a211.tar.xz
Revert "amd/pi/hudson: Add GPIO get function"
This reverts commit dae95f0dfe9ad94922c940d3c0522d53284b4deb. There is filename conflict with top-level <gpio.h> and incompatibility with it. Only use was AMD_PI_KERN and we have no such platform in the tree anymore. Change-Id: I120b0bfda1501e9941c71315852d87d251f76a5b Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/42743 Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/amd/pi/hudson/Makefile.inc1
-rw-r--r--src/southbridge/amd/pi/hudson/gpio.c13
-rw-r--r--src/southbridge/amd/pi/hudson/gpio.h120
3 files changed, 0 insertions, 134 deletions
diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index 0ddba480dc..da861ee2e1 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -40,7 +40,6 @@ verstage-$(CONFIG_HUDSON_UART) += uart.c
ramstage-y += enable_usbdebug.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c
-ramstage-$(CONFIG_SOUTHBRIDGE_AMD_PI_KERN) += gpio.c
ramstage-y += hda.c
ramstage-y += hudson.c
ramstage-y += ide.c
diff --git a/src/southbridge/amd/pi/hudson/gpio.c b/src/southbridge/amd/pi/hudson/gpio.c
deleted file mode 100644
index 18e9c2180a..0000000000
--- a/src/southbridge/amd/pi/hudson/gpio.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <device/mmio.h>
-#include "gpio.h"
-
-int gpio_get(gpio_t gpio_num)
-{
- uint32_t reg;
-
- reg = read32((void *)(uintptr_t)gpio_num);
-
- return !!(reg & GPIO_PIN_STS);
-}
diff --git a/src/southbridge/amd/pi/hudson/gpio.h b/src/southbridge/amd/pi/hudson/gpio.h
deleted file mode 100644
index 1c2e3699f3..0000000000
--- a/src/southbridge/amd/pi/hudson/gpio.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _HUDSON_GPIO_H_
-#define _HUDSON_GPIO_H_
-
-#include <southbridge/amd/common/amd_defs.h>
-#include <types.h>
-
-#define CROS_GPIO_DEVICE_NAME "AmdKern"
-
-#define GPIO_PIN_STS (1 << 16)
-#define GPIO_OUTPUT_VALUE (1 << 22)
-#define GPIO_OUTPUT_ENABLE (1 << 23)
-
-#if CONFIG(SOUTHBRIDGE_AMD_PI_KERN)
-/* GPIO_0 - GPIO_62 */
-#define GPIO_BANK0_CONTROL (AMD_SB_ACPI_MMIO_ADDR + 0x1500)
-#define GPIO_0 (GPIO_BANK0_CONTROL + 0x00)
-#define GPIO_1 (GPIO_BANK0_CONTROL + 0x04)
-#define GPIO_2 (GPIO_BANK0_CONTROL + 0x08)
-#define GPIO_3 (GPIO_BANK0_CONTROL + 0x0C)
-#define GPIO_4 (GPIO_BANK0_CONTROL + 0x10)
-#define GPIO_5 (GPIO_BANK0_CONTROL + 0x14)
-#define GPIO_6 (GPIO_BANK0_CONTROL + 0x18)
-#define GPIO_7 (GPIO_BANK0_CONTROL + 0x1C)
-#define GPIO_8 (GPIO_BANK0_CONTROL + 0x20)
-#define GPIO_9 (GPIO_BANK0_CONTROL + 0x24)
-#define GPIO_10 (GPIO_BANK0_CONTROL + 0x28)
-#define GPIO_11 (GPIO_BANK0_CONTROL + 0x2C)
-#define GPIO_12 (GPIO_BANK0_CONTROL + 0x30)
-#define GPIO_13 (GPIO_BANK0_CONTROL + 0x34)
-#define GPIO_14 (GPIO_BANK0_CONTROL + 0x38)
-#define GPIO_15 (GPIO_BANK0_CONTROL + 0x3C)
-#define GPIO_16 (GPIO_BANK0_CONTROL + 0x40)
-#define GPIO_17 (GPIO_BANK0_CONTROL + 0x44)
-#define GPIO_18 (GPIO_BANK0_CONTROL + 0x48)
-#define GPIO_19 (GPIO_BANK0_CONTROL + 0x4C)
-#define GPIO_20 (GPIO_BANK0_CONTROL + 0x50)
-#define GPIO_21 (GPIO_BANK0_CONTROL + 0x54)
-#define GPIO_22 (GPIO_BANK0_CONTROL + 0x58)
-#define GPIO_23 (GPIO_BANK0_CONTROL + 0x5C)
-#define GPIO_24 (GPIO_BANK0_CONTROL + 0x60)
-#define GPIO_25 (GPIO_BANK0_CONTROL + 0x64)
-#define GPIO_26 (GPIO_BANK0_CONTROL + 0x68)
-#define GPIO_39 (GPIO_BANK0_CONTROL + 0x9C)
-#define GPIO_42 (GPIO_BANK0_CONTROL + 0xA8)
-
-/* GPIO_64 - GPIO_127 */
-#define GPIO_BANK1_CONTROL (AMD_SB_ACPI_MMIO_ADDR + 0x1600)
-#define GPIO_64 (GPIO_BANK1_CONTROL + 0x00)
-#define GPIO_65 (GPIO_BANK1_CONTROL + 0x04)
-#define GPIO_66 (GPIO_BANK1_CONTROL + 0x08)
-#define GPIO_67 (GPIO_BANK1_CONTROL + 0x0C)
-#define GPIO_68 (GPIO_BANK1_CONTROL + 0x10)
-#define GPIO_69 (GPIO_BANK1_CONTROL + 0x14)
-#define GPIO_70 (GPIO_BANK1_CONTROL + 0x18)
-#define GPIO_71 (GPIO_BANK1_CONTROL + 0x1C)
-#define GPIO_72 (GPIO_BANK1_CONTROL + 0x20)
-#define GPIO_74 (GPIO_BANK1_CONTROL + 0x28)
-#define GPIO_75 (GPIO_BANK1_CONTROL + 0x2C)
-#define GPIO_76 (GPIO_BANK1_CONTROL + 0x30)
-#define GPIO_84 (GPIO_BANK1_CONTROL + 0x50)
-#define GPIO_85 (GPIO_BANK1_CONTROL + 0x54)
-#define GPIO_86 (GPIO_BANK1_CONTROL + 0x58)
-#define GPIO_87 (GPIO_BANK1_CONTROL + 0x5C)
-#define GPIO_88 (GPIO_BANK1_CONTROL + 0x60)
-#define GPIO_89 (GPIO_BANK1_CONTROL + 0x64)
-#define GPIO_90 (GPIO_BANK1_CONTROL + 0x68)
-#define GPIO_91 (GPIO_BANK1_CONTROL + 0x6C)
-#define GPIO_92 (GPIO_BANK1_CONTROL + 0x70)
-#define GPIO_93 (GPIO_BANK1_CONTROL + 0x74)
-#define GPIO_95 (GPIO_BANK1_CONTROL + 0x7C)
-#define GPIO_96 (GPIO_BANK1_CONTROL + 0x80)
-#define GPIO_97 (GPIO_BANK1_CONTROL + 0x84)
-#define GPIO_98 (GPIO_BANK1_CONTROL + 0x88)
-#define GPIO_99 (GPIO_BANK1_CONTROL + 0x8C)
-#define GPIO_100 (GPIO_BANK1_CONTROL + 0x90)
-#define GPIO_101 (GPIO_BANK1_CONTROL + 0x94)
-#define GPIO_102 (GPIO_BANK1_CONTROL + 0x98)
-#define GPIO_113 (GPIO_BANK1_CONTROL + 0xC4)
-#define GPIO_114 (GPIO_BANK1_CONTROL + 0xC8)
-#define GPIO_115 (GPIO_BANK1_CONTROL + 0xCC)
-#define GPIO_116 (GPIO_BANK1_CONTROL + 0xD0)
-#define GPIO_117 (GPIO_BANK1_CONTROL + 0xD4)
-#define GPIO_118 (GPIO_BANK1_CONTROL + 0xD8)
-#define GPIO_119 (GPIO_BANK1_CONTROL + 0xDC)
-#define GPIO_120 (GPIO_BANK1_CONTROL + 0xE0)
-#define GPIO_121 (GPIO_BANK1_CONTROL + 0xE4)
-#define GPIO_122 (GPIO_BANK1_CONTROL + 0xE8)
-#define GPIO_126 (GPIO_BANK1_CONTROL + 0xF8)
-
-/* GPIO_128 - GPIO_183 */
-#define GPIO_BANK2_CONTROL (AMD_SB_ACPI_MMIO_ADDR + 0x1700)
-#define GPIO_129 (GPIO_BANK2_CONTROL + 0x04)
-#define GPIO_130 (GPIO_BANK2_CONTROL + 0x08)
-#define GPIO_131 (GPIO_BANK2_CONTROL + 0x0C)
-#define GPIO_132 (GPIO_BANK2_CONTROL + 0x10)
-#define GPIO_133 (GPIO_BANK2_CONTROL + 0x14)
-#define GPIO_134 (GPIO_BANK2_CONTROL + 0x18)
-#define GPIO_135 (GPIO_BANK2_CONTROL + 0x1C)
-#define GPIO_136 (GPIO_BANK2_CONTROL + 0x20)
-#define GPIO_137 (GPIO_BANK2_CONTROL + 0x24)
-#define GPIO_138 (GPIO_BANK2_CONTROL + 0x28)
-#define GPIO_139 (GPIO_BANK2_CONTROL + 0x2C)
-#define GPIO_140 (GPIO_BANK2_CONTROL + 0x30)
-#define GPIO_141 (GPIO_BANK2_CONTROL + 0x34)
-#define GPIO_142 (GPIO_BANK2_CONTROL + 0x38)
-#define GPIO_143 (GPIO_BANK2_CONTROL + 0x3C)
-#define GPIO_144 (GPIO_BANK2_CONTROL + 0x40)
-#define GPIO_145 (GPIO_BANK2_CONTROL + 0x44)
-#define GPIO_146 (GPIO_BANK2_CONTROL + 0x48)
-#define GPIO_147 (GPIO_BANK2_CONTROL + 0x4C)
-#define GPIO_148 (GPIO_BANK2_CONTROL + 0x50)
-#endif /* CONFIG(SOUTHBRIDGE_AMD_PI_KERN) */
-
-typedef uint32_t gpio_t;
-
-int gpio_get(gpio_t gpio_num);
-
-#endif /* _HUDSON_GPIO_H_ */