projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ti-v2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
[oweals/u-boot.git]
/
board
/
freescale
/
mpc8349emds
/
pci.c
diff --git
a/board/freescale/mpc8349emds/pci.c
b/board/freescale/mpc8349emds/pci.c
index 9f7324feddfe10e30ada3a457f9837e1d266fb93..3ddbe717756e9b11c100905982e7cbb9fedd9b4e 100644
(file)
--- a/
board/freescale/mpc8349emds/pci.c
+++ b/
board/freescale/mpc8349emds/pci.c
@@
-1,9
+1,9
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2006-2009 Freescale Semiconductor, Inc.
/*
* Copyright (C) 2006-2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
*/
+#include <init.h>
#include <asm/mmu.h>
#include <asm/io.h>
#include <common.h>
#include <asm/mmu.h>
#include <asm/io.h>
#include <common.h>
@@
-11,8
+11,7
@@
#include <pci.h>
#include <i2c.h>
#include <asm/fsl_i2c.h>
#include <pci.h>
#include <i2c.h>
#include <asm/fsl_i2c.h>
-
-DECLARE_GLOBAL_DATA_PTR;
+#include <linux/delay.h>
static struct pci_region pci1_regions[] = {
{
static struct pci_region pci1_regions[] = {
{
@@
-80,11
+79,11
@@
void pib_init(void)
i2c_write(0x26, 0x6, 1, &val8, 1);
val8 = 0x34;
i2c_write(0x26, 0x7, 1, &val8, 1);
i2c_write(0x26, 0x6, 1, &val8, 1);
val8 = 0x34;
i2c_write(0x26, 0x7, 1, &val8, 1);
-#if defined(PCI_64BIT)
+#if defined(
CONFIG_
PCI_64BIT)
val8 = 0xf4; /* PMC2:PCI1/64-bit */
val8 = 0xf4; /* PMC2:PCI1/64-bit */
-#elif defined(PCI_ALL_PCI1)
+#elif defined(
CONFIG_
PCI_ALL_PCI1)
val8 = 0xf3; /* PMC1:PCI1 PMC2:PCI1 PMC3:PCI1 */
val8 = 0xf3; /* PMC1:PCI1 PMC2:PCI1 PMC3:PCI1 */
-#elif defined(PCI_ONE_PCI1)
+#elif defined(
CONFIG_
PCI_ONE_PCI1)
val8 = 0xf9; /* PMC1:PCI1 PMC2:PCI2 PMC3:PCI2 */
#else
val8 = 0xf5; /* PMC1:PCI1 PMC2:PCI1 PMC3:PCI2 */
val8 = 0xf9; /* PMC1:PCI1 PMC2:PCI2 PMC3:PCI2 */
#else
val8 = 0xf5; /* PMC1:PCI1 PMC2:PCI1 PMC3:PCI2 */
@@
-101,11
+100,11
@@
void pib_init(void)
i2c_write(0x27, 0x3, 1, &val8, 1);
asm("eieio");
i2c_write(0x27, 0x3, 1, &val8, 1);
asm("eieio");
-#if defined(PCI_64BIT)
+#if defined(
CONFIG_
PCI_64BIT)
printf("PCI1: 64-bit on PMC2\n");
printf("PCI1: 64-bit on PMC2\n");
-#elif defined(PCI_ALL_PCI1)
+#elif defined(
CONFIG_
PCI_ALL_PCI1)
printf("PCI1: 32-bit on PMC1, PMC2, PMC3\n");
printf("PCI1: 32-bit on PMC1, PMC2, PMC3\n");
-#elif defined(PCI_ONE_PCI1)
+#elif defined(
CONFIG_
PCI_ONE_PCI1)
printf("PCI1: 32-bit on PMC1\n");
printf("PCI2: 32-bit on PMC2, PMC3\n");
#else
printf("PCI1: 32-bit on PMC1\n");
printf("PCI2: 32-bit on PMC2, PMC3\n");
#else