summaryrefslogtreecommitdiff
path: root/src/southbridge/nvidia/ck804
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2016-12-05 06:33:32 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2016-12-06 20:44:12 +0100
commit8db31a8f4eb247df86c658acb4cb7c5f97456e68 (patch)
treeb0d58cacb3174a50919cf11e8f751cec61261069 /src/southbridge/nvidia/ck804
parentb4a45dcf9d442b311dec7396a55be917713a0d15 (diff)
PCI ops: Remove conflicting duplicate declarations
The code originates from times before __SIMPLE_DEVICE__ was introduced. To keep behaviour unchanged, use explicit PCI IO operations here. Change-Id: I44851633115f9aee4c308fd3711571a4b14c5f2f Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/17720 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/southbridge/nvidia/ck804')
-rw-r--r--src/southbridge/nvidia/ck804/reset.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/src/southbridge/nvidia/ck804/reset.c b/src/southbridge/nvidia/ck804/reset.c
index 004ad585b4..ad994dedc4 100644
--- a/src/southbridge/nvidia/ck804/reset.c
+++ b/src/southbridge/nvidia/ck804/reset.c
@@ -14,30 +14,11 @@
* GNU General Public License for more details.
*/
+#define __SIMPLE_DEVICE__
+
#include <arch/io.h>
#include <reset.h>
-#define PCI_DEV(BUS, DEV, FN) ( \
- (((BUS) & 0xFFF) << 20) | \
- (((DEV) & 0x1F) << 15) | \
- (((FN) & 0x7) << 12))
-
-static void pci_write_config32(pci_devfn_t dev, unsigned where, unsigned value)
-{
- unsigned addr;
- addr = (dev >> 4) | where;
- outl(0x80000000 | (addr & ~3), 0xCF8);
- outl(value, 0xCFC);
-}
-
-static unsigned pci_read_config32(pci_devfn_t dev, unsigned where)
-{
- unsigned addr;
- addr = (dev >> 4) | where;
- outl(0x80000000 | (addr & ~3), 0xCF8);
- return inl(0xCFC);
-}
-
#include "../../../northbridge/amd/amdk8/reset_test.c"
void hard_reset(void)