minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 03:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

MPC85xx: TQM85xx: make standard PCI/PCI-X configurable

Browse Source 
The TQM8548_AG module does not have the standard PCI/PCI-X interface
connected but just the PCI Express interface . So far it was not
possible to disable it without disabling the complete PCI interface
(CONFIG_PCI) including PCI Express.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
This commit is contained in:
Wolfgang Grandegger 2009-02-11 18:38:20 +01:00 committed by Andy Fleming
parent 31ca9119c3
commit a318234878
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
board/tqc/tqm85xx/tqm85xx.c
View File

@ -540,9 +540,9 @@ static int first_free_busno;
extern int fsl_pci_setup_inbound_windows(struct pci_region *r); extern int fsl_pci_setup_inbound_windows(struct pci_region *r);
extern void fsl_pci_init(struct pci_controller *hose); extern void fsl_pci_init(struct pci_controller *hose);
#if defined(CONFIG_PCI) || defined(CONFIG_PCI1) #ifdef CONFIG_PCI1
static struct pci_controller pci1_hose; static struct pci_controller pci1_hose;
#endif /* CONFIG_PCI || CONFIG_PCI1 */ #endif /* CONFIG_PCI1 */
#ifdef CONFIG_PCIE1 #ifdef CONFIG_PCIE1
static struct pci_controller pcie1_hose; static struct pci_controller pcie1_hose;
@ -551,7 +551,7 @@ static struct pci_controller pcie1_hose;
static inline void init_pci1(void) static inline void init_pci1(void)
{ {
volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
#if defined(CONFIG_PCI) || defined(CONFIG_PCI1) #ifdef CONFIG_PCI1
uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >> 16; uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >> 16;
volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *)CONFIG_SYS_PCI1_ADDR; volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *)CONFIG_SYS_PCI1_ADDR;
struct pci_controller *hose = &pci1_hose; struct pci_controller *hose = &pci1_hose;
@ -626,9 +626,9 @@ static inline void init_pci1(void)
} else { } else {
puts ("PCI1: disabled\n"); puts ("PCI1: disabled\n");
} }
#else /* !(CONFIG_PCI || CONFIG_PCI1) */ #else /* !CONFIG_PCI1 */
gur->devdisr |= MPC85xx_DEVDISR_PCI1; /* disable */ gur->devdisr |= MPC85xx_DEVDISR_PCI1; /* disable */
#endif /* CONFIG_PCI || CONFIG_PCI1) */ #endif /* CONFIG_PCI1 */
} }
static inline void init_pcie1(void) static inline void init_pcie1(void)
@ -707,7 +707,7 @@ void ft_board_setup (void *blob, bd_t *bd)
{ {
ft_cpu_setup (blob, bd); ft_cpu_setup (blob, bd);
#if defined(CONFIG_PCI) || defined(CONFIG_PCI1) #ifdef CONFIG_PCI1
ft_fsl_pci_setup(blob, "pci0", &pci1_hose); ft_fsl_pci_setup(blob, "pci0", &pci1_hose);
#endif #endif
#ifdef CONFIG_PCIE1 #ifdef CONFIG_PCIE1

9
include/configs/TQM85xx.h
View File

@ -42,13 +42,14 @@
#define CONFIG_MPC85xx 1 /* MPC8540/60/55/41 */ #define CONFIG_MPC85xx 1 /* MPC8540/60/55/41 */
#define CONFIG_PCI #define CONFIG_PCI
#define CONFIG_PCI1 /* PCI/PCI-X controller */
#ifdef CONFIG_TQM8548
#define CONFIG_PCIE1 /* PCI Express interface */
#endif
#define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */ #define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */
#define CONFIG_PCIX_CHECK /* PCIX olny works at 66 MHz */ #define CONFIG_PCIX_CHECK /* PCIX olny works at 66 MHz */
#ifdef CONFIG_TQM8548
#define CONFIG_PCI1
#define CONFIG_PCIE1
#define CONFIG_FSL_PCIE_RESET 1 /* need PCIe reset errata */ #define CONFIG_FSL_PCIE_RESET 1 /* need PCIe reset errata */
#endif
#define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_TSEC_ENET /* tsec ethernet support */