Commit a6dbba77 authored by Vitaly Bordug's avatar Vitaly Bordug Committed by Linus Torvalds

[PATCH] ppc32: Support for 82xx PQII on-chip PCI bridge

This patch adds on-chip PCI bridge support for the PQ2 family.  The
incomplete existent code is updated with interrupt handling stuff and
board-specific bits for 8272ADS and PQ2FADS; the related files were renamed
(from m8260_pci to m82xx_pci) to be of more generic fashion.  This is
tested with 8266ADS and 8272ADS, should work on PQ2FADS as well.
Signed-off-by: default avatarVitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ed369596
...@@ -1143,12 +1143,12 @@ config PCI_QSPAN ...@@ -1143,12 +1143,12 @@ config PCI_QSPAN
config PCI_8260 config PCI_8260
bool bool
depends on PCI && 8260 && !8272 depends on PCI && 8260
default y default y
config 8260_PCI9 config 8260_PCI9
bool " Enable workaround for MPC826x erratum PCI 9" bool " Enable workaround for MPC826x erratum PCI 9"
depends on PCI_8260 depends on PCI_8260 && !ADS8272
default y default y
choice choice
......
...@@ -49,10 +49,10 @@ ...@@ -49,10 +49,10 @@
/* PCI interrupt controller */ /* PCI interrupt controller */
#define PCI_INT_STAT_REG 0xF8200000 #define PCI_INT_STAT_REG 0xF8200000
#define PCI_INT_MASK_REG 0xF8200004 #define PCI_INT_MASK_REG 0xF8200004
#define PIRQA (NR_SIU_INTS + 0) #define PIRQA (NR_CPM_INTS + 0)
#define PIRQB (NR_SIU_INTS + 1) #define PIRQB (NR_CPM_INTS + 1)
#define PIRQC (NR_SIU_INTS + 2) #define PIRQC (NR_CPM_INTS + 2)
#define PIRQD (NR_SIU_INTS + 3) #define PIRQD (NR_CPM_INTS + 3)
/* /*
* PCI memory map definitions for MPC8266ADS-PCI. * PCI memory map definitions for MPC8266ADS-PCI.
...@@ -68,28 +68,23 @@ ...@@ -68,28 +68,23 @@
* 0x00000000-0x1FFFFFFF 0x00000000-0x1FFFFFFF MPC8266 local memory * 0x00000000-0x1FFFFFFF 0x00000000-0x1FFFFFFF MPC8266 local memory
*/ */
/* window for a PCI master to access MPC8266 memory */ /* All the other PCI memory map definitions reside at syslib/m82xx_pci.h
#define PCI_SLV_MEM_LOCAL 0x00000000 /* Local base */ Here we should redefine what is unique for this board */
#define PCI_SLV_MEM_BUS 0x00000000 /* PCI base */ #define M82xx_PCI_SLAVE_MEM_LOCAL 0x00000000 /* Local base */
#define M82xx_PCI_SLAVE_MEM_BUS 0x00000000 /* PCI base */
#define M82xx_PCI_SLAVE_MEM_SIZE 0x10000000 /* 256 Mb */
/* window for the processor to access PCI memory with prefetching */ #define M82xx_PCI_SLAVE_SEC_WND_SIZE ~(0x40000000 - 1U) /* 2 x 512Mb */
#define PCI_MSTR_MEM_LOCAL 0x80000000 /* Local base */ #define M82xx_PCI_SLAVE_SEC_WND_BASE 0x80000000 /* PCI Memory base */
#define PCI_MSTR_MEM_BUS 0x80000000 /* PCI base */
#define PCI_MSTR_MEM_SIZE 0x20000000 /* 512MB */
/* window for the processor to access PCI memory without prefetching */ #if defined(CONFIG_ADS8272)
#define PCI_MSTR_MEMIO_LOCAL 0xA0000000 /* Local base */ #define PCI_INT_TO_SIU SIU_INT_IRQ2
#define PCI_MSTR_MEMIO_BUS 0xA0000000 /* PCI base */ #elif defined(CONFIG_PQ2FADS)
#define PCI_MSTR_MEMIO_SIZE 0x20000000 /* 512MB */ #define PCI_INT_TO_SIU SIU_INT_IRQ6
#else
#warning PCI Bridge will be without interrupts support
#endif
/* window for the processor to access PCI I/O */
#define PCI_MSTR_IO_LOCAL 0xF4000000 /* Local base */
#define PCI_MSTR_IO_BUS 0x00000000 /* PCI base */
#define PCI_MSTR_IO_SIZE 0x04000000 /* 64MB */
#define _IO_BASE PCI_MSTR_IO_LOCAL
#define _ISA_MEM_BASE PCI_MSTR_MEMIO_LOCAL
#define PCI_DRAM_OFFSET PCI_SLV_MEM_BUS
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
#endif /* __MACH_ADS8260_DEFS */ #endif /* __MACH_ADS8260_DEFS */
......
...@@ -81,7 +81,7 @@ obj-$(CONFIG_SBC82xx) += todc_time.o ...@@ -81,7 +81,7 @@ obj-$(CONFIG_SBC82xx) += todc_time.o
obj-$(CONFIG_SPRUCE) += cpc700_pic.o indirect_pci.o pci_auto.o \ obj-$(CONFIG_SPRUCE) += cpc700_pic.o indirect_pci.o pci_auto.o \
todc_time.o todc_time.o
obj-$(CONFIG_8260) += m8260_setup.o obj-$(CONFIG_8260) += m8260_setup.o
obj-$(CONFIG_PCI_8260) += m8260_pci.o indirect_pci.o obj-$(CONFIG_PCI_8260) += m82xx_pci.o indirect_pci.o pci_auto.o
obj-$(CONFIG_8260_PCI9) += m8260_pci_erratum9.o obj-$(CONFIG_8260_PCI9) += m8260_pci_erratum9.o
obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o
ifeq ($(CONFIG_PPC_GEN550),y) ifeq ($(CONFIG_PPC_GEN550),y)
......
/*
* (C) Copyright 2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* (C) Copyright 2004 Red Hat, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <asm/byteorder.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/machdep.h>
#include <asm/pci-bridge.h>
#include <asm/immap_cpm2.h>
#include <asm/mpc8260.h>
#include "m8260_pci.h"
/* PCI bus configuration registers.
*/
static void __init m8260_setup_pci(struct pci_controller *hose)
{
volatile cpm2_map_t *immap = cpm2_immr;
unsigned long pocmr;
u16 tempShort;
#ifndef CONFIG_ATC /* already done in U-Boot */
/*
* Setting required to enable IRQ1-IRQ7 (SIUMCR [DPPC]),
* and local bus for PCI (SIUMCR [LBPC]).
*/
immap->im_siu_conf.siu_82xx.sc_siumcr = 0x00640000;
#endif
/* Make PCI lowest priority */
/* Each 4 bits is a device bus request and the MS 4bits
is highest priority */
/* Bus 4bit value
--- ----------
CPM high 0b0000
CPM middle 0b0001
CPM low 0b0010
PCI reguest 0b0011
Reserved 0b0100
Reserved 0b0101
Internal Core 0b0110
External Master 1 0b0111
External Master 2 0b1000
External Master 3 0b1001
The rest are reserved */
immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x61207893;
/* Park bus on core while modifying PCI Bus accesses */
immap->im_siu_conf.siu_82xx.sc_ppc_acr = 0x6;
/*
* Set up master window that allows the CPU to access PCI space. This
* window is set up using the first SIU PCIBR registers.
*/
immap->im_memctl.memc_pcimsk0 = MPC826x_PCI_MASK;
immap->im_memctl.memc_pcibr0 = MPC826x_PCI_BASE | PCIBR_ENABLE;
/* Disable machine check on no response or target abort */
immap->im_pci.pci_emr = cpu_to_le32(0x1fe7);
/* Release PCI RST (by default the PCI RST signal is held low) */
immap->im_pci.pci_gcr = cpu_to_le32(PCIGCR_PCI_BUS_EN);
/* give it some time */
mdelay(1);
/*
* Set up master window that allows the CPU to access PCI Memory (prefetch)
* space. This window is set up using the first set of Outbound ATU registers.
*/
immap->im_pci.pci_potar0 = cpu_to_le32(MPC826x_PCI_LOWER_MEM >> 12);
immap->im_pci.pci_pobar0 = cpu_to_le32((MPC826x_PCI_LOWER_MEM - MPC826x_PCI_MEM_OFFSET) >> 12);
pocmr = ((MPC826x_PCI_UPPER_MEM - MPC826x_PCI_LOWER_MEM) >> 12) ^ 0xfffff;
immap->im_pci.pci_pocmr0 = cpu_to_le32(pocmr | POCMR_ENABLE | POCMR_PREFETCH_EN);
/*
* Set up master window that allows the CPU to access PCI Memory (non-prefetch)
* space. This window is set up using the second set of Outbound ATU registers.
*/
immap->im_pci.pci_potar1 = cpu_to_le32(MPC826x_PCI_LOWER_MMIO >> 12);
immap->im_pci.pci_pobar1 = cpu_to_le32((MPC826x_PCI_LOWER_MMIO - MPC826x_PCI_MMIO_OFFSET) >> 12);
pocmr = ((MPC826x_PCI_UPPER_MMIO - MPC826x_PCI_LOWER_MMIO) >> 12) ^ 0xfffff;
immap->im_pci.pci_pocmr1 = cpu_to_le32(pocmr | POCMR_ENABLE);
/*
* Set up master window that allows the CPU to access PCI IO space. This window
* is set up using the third set of Outbound ATU registers.
*/
immap->im_pci.pci_potar2 = cpu_to_le32(MPC826x_PCI_IO_BASE >> 12);
immap->im_pci.pci_pobar2 = cpu_to_le32(MPC826x_PCI_LOWER_IO >> 12);
pocmr = ((MPC826x_PCI_UPPER_IO - MPC826x_PCI_LOWER_IO) >> 12) ^ 0xfffff;
immap->im_pci.pci_pocmr2 = cpu_to_le32(pocmr | POCMR_ENABLE | POCMR_PCI_IO);
/*
* Set up slave window that allows PCI masters to access MPC826x local memory.
* This window is set up using the first set of Inbound ATU registers
*/
immap->im_pci.pci_pitar0 = cpu_to_le32(MPC826x_PCI_SLAVE_MEM_LOCAL >> 12);
immap->im_pci.pci_pibar0 = cpu_to_le32(MPC826x_PCI_SLAVE_MEM_BUS >> 12);
pocmr = ((MPC826x_PCI_SLAVE_MEM_SIZE-1) >> 12) ^ 0xfffff;
immap->im_pci.pci_picmr0 = cpu_to_le32(pocmr | PICMR_ENABLE | PICMR_PREFETCH_EN);
/* See above for description - puts PCI request as highest priority */
immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x03124567;
/* Park the bus on the PCI */
immap->im_siu_conf.siu_82xx.sc_ppc_acr = PPC_ACR_BUS_PARK_PCI;
/* Host mode - specify the bridge as a host-PCI bridge */
early_write_config_word(hose, 0, 0, PCI_CLASS_DEVICE, PCI_CLASS_BRIDGE_HOST);
/* Enable the host bridge to be a master on the PCI bus, and to act as a PCI memory target */
early_read_config_word(hose, 0, 0, PCI_COMMAND, &tempShort);
early_write_config_word(hose, 0, 0, PCI_COMMAND,
tempShort | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
}
void __init m8260_find_bridges(void)
{
extern int pci_assign_all_busses;
struct pci_controller * hose;
pci_assign_all_busses = 1;
hose = pcibios_alloc_controller();
if (!hose)
return;
ppc_md.pci_swizzle = common_swizzle;
hose->first_busno = 0;
hose->bus_offset = 0;
hose->last_busno = 0xff;
setup_m8260_indirect_pci(hose,
(unsigned long)&cpm2_immr->im_pci.pci_cfg_addr,
(unsigned long)&cpm2_immr->im_pci.pci_cfg_data);
m8260_setup_pci(hose);
hose->pci_mem_offset = MPC826x_PCI_MEM_OFFSET;
hose->io_base_virt = ioremap(MPC826x_PCI_IO_BASE,
MPC826x_PCI_IO_SIZE);
isa_io_base = (unsigned long) hose->io_base_virt;
/* setup resources */
pci_init_resource(&hose->mem_resources[0],
MPC826x_PCI_LOWER_MEM,
MPC826x_PCI_UPPER_MEM,
IORESOURCE_MEM|IORESOURCE_PREFETCH, "PCI prefetchable memory");
pci_init_resource(&hose->mem_resources[1],
MPC826x_PCI_LOWER_MMIO,
MPC826x_PCI_UPPER_MMIO,
IORESOURCE_MEM, "PCI memory");
pci_init_resource(&hose->io_resource,
MPC826x_PCI_LOWER_IO,
MPC826x_PCI_UPPER_IO,
IORESOURCE_IO, "PCI I/O");
}
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <asm/immap_cpm2.h> #include <asm/immap_cpm2.h>
#include <asm/cpm2.h> #include <asm/cpm2.h>
#include "m8260_pci.h" #include "m82xx_pci.h"
#ifdef CONFIG_8260_PCI9 #ifdef CONFIG_8260_PCI9
/*#include <asm/mpc8260_pci9.h>*/ /* included in asm/io.h */ /*#include <asm/mpc8260_pci9.h>*/ /* included in asm/io.h */
...@@ -248,11 +248,11 @@ EXPORT_SYMBOL(idma_pci9_read_le); ...@@ -248,11 +248,11 @@ EXPORT_SYMBOL(idma_pci9_read_le);
static inline int is_pci_mem(unsigned long addr) static inline int is_pci_mem(unsigned long addr)
{ {
if (addr >= MPC826x_PCI_LOWER_MMIO && if (addr >= M82xx_PCI_LOWER_MMIO &&
addr <= MPC826x_PCI_UPPER_MMIO) addr <= M82xx_PCI_UPPER_MMIO)
return 1; return 1;
if (addr >= MPC826x_PCI_LOWER_MEM && if (addr >= M82xx_PCI_LOWER_MEM &&
addr <= MPC826x_PCI_UPPER_MEM) addr <= M82xx_PCI_UPPER_MEM)
return 1; return 1;
return 0; return 0;
} }
......
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
unsigned char __res[sizeof(bd_t)]; unsigned char __res[sizeof(bd_t)];
extern void cpm2_reset(void); extern void cpm2_reset(void);
extern void m8260_find_bridges(void); extern void pq2_find_bridges(void);
extern void pq2pci_init_irq(void);
extern void idma_pci9_init(void); extern void idma_pci9_init(void);
/* Place-holder for board-specific init */ /* Place-holder for board-specific init */
...@@ -56,7 +57,7 @@ m8260_setup_arch(void) ...@@ -56,7 +57,7 @@ m8260_setup_arch(void)
idma_pci9_init(); idma_pci9_init();
#endif #endif
#ifdef CONFIG_PCI_8260 #ifdef CONFIG_PCI_8260
m8260_find_bridges(); pq2_find_bridges();
#endif #endif
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
if (initrd_start) if (initrd_start)
...@@ -173,6 +174,12 @@ m8260_init_IRQ(void) ...@@ -173,6 +174,12 @@ m8260_init_IRQ(void)
* in case the boot rom changed something on us. * in case the boot rom changed something on us.
*/ */
cpm2_immr->im_intctl.ic_siprr = 0x05309770; cpm2_immr->im_intctl.ic_siprr = 0x05309770;
#if defined(CONFIG_PCI) && (defined(CONFIG_ADS8272) || defined(CONFIG_PQ2FADS))
/* Initialize stuff for the 82xx CPLD IC and install demux */
pq2pci_init_irq();
#endif
} }
/* /*
......
This diff is collapsed.
#ifndef _PPC_KERNEL_M8260_PCI_H #ifndef _PPC_KERNEL_M82XX_PCI_H
#define _PPC_KERNEL_M8260_PCI_H #define _PPC_KERNEL_M82XX_PCI_H
#include <asm/m8260_pci.h> #include <asm/m8260_pci.h>
/* /*
* Local->PCI map (from CPU) controlled by * Local->PCI map (from CPU) controlled by
* MPC826x master window * MPC826x master window
* *
* 0x80000000 - 0xBFFFFFFF Total CPU2PCI space PCIBR0 * 0xF6000000 - 0xF7FFFFFF IO space
* * 0x80000000 - 0xBFFFFFFF CPU2PCI memory space PCIBR0
*
* 0x80000000 - 0x9FFFFFFF PCI Mem with prefetch (Outbound ATU #1) * 0x80000000 - 0x9FFFFFFF PCI Mem with prefetch (Outbound ATU #1)
* 0xA0000000 - 0xAFFFFFFF PCI Mem w/o prefetch (Outbound ATU #2) * 0xA0000000 - 0xBFFFFFFF PCI Mem w/o prefetch (Outbound ATU #2)
* 0xB0000000 - 0xB0FFFFFF 32-bit PCI IO (Outbound ATU #3) * 0xF6000000 - 0xF7FFFFFF 32-bit PCI IO (Outbound ATU #3)
* *
* PCI->Local map (from PCI) * PCI->Local map (from PCI)
* MPC826x slave window controlled by * MPC826x slave window controlled by
* *
* 0x00000000 - 0x07FFFFFF MPC826x local memory (Inbound ATU #1) * 0x00000000 - 0x07FFFFFF MPC826x local memory (Inbound ATU #1)
*/ */
/* /*
* Slave window that allows PCI masters to access MPC826x local memory. * Slave window that allows PCI masters to access MPC826x local memory.
* This window is set up using the first set of Inbound ATU registers * This window is set up using the first set of Inbound ATU registers
*/ */
#ifndef MPC826x_PCI_SLAVE_MEM_LOCAL #ifndef M82xx_PCI_SLAVE_MEM_LOCAL
#define MPC826x_PCI_SLAVE_MEM_LOCAL (((struct bd_info *)__res)->bi_memstart) #define M82xx_PCI_SLAVE_MEM_LOCAL (((struct bd_info *)__res)->bi_memstart)
#define MPC826x_PCI_SLAVE_MEM_BUS (((struct bd_info *)__res)->bi_memstart) #define M82xx_PCI_SLAVE_MEM_BUS (((struct bd_info *)__res)->bi_memstart)
#define MPC826x_PCI_SLAVE_MEM_SIZE (((struct bd_info *)__res)->bi_memsize) #define M82xx_PCI_SLAVE_MEM_SIZE (((struct bd_info *)__res)->bi_memsize)
#endif #endif
/* /*
* This is the window that allows the CPU to access PCI address space. * This is the window that allows the CPU to access PCI address space.
* It will be setup with the SIU PCIBR0 register. All three PCI master * It will be setup with the SIU PCIBR0 register. All three PCI master
* windows, which allow the CPU to access PCI prefetch, non prefetch, * windows, which allow the CPU to access PCI prefetch, non prefetch,
* and IO space (see below), must all fit within this window. * and IO space (see below), must all fit within this window.
*/ */
#ifndef MPC826x_PCI_BASE
#define MPC826x_PCI_BASE 0x80000000 #ifndef M82xx_PCI_LOWER_MEM
#define MPC826x_PCI_MASK 0xc0000000 #define M82xx_PCI_LOWER_MEM 0x80000000
#define M82xx_PCI_UPPER_MEM 0x9fffffff
#define M82xx_PCI_MEM_OFFSET 0x00000000
#define M82xx_PCI_MEM_SIZE 0x20000000
#endif
#ifndef M82xx_PCI_LOWER_MMIO
#define M82xx_PCI_LOWER_MMIO 0xa0000000
#define M82xx_PCI_UPPER_MMIO 0xafffffff
#define M82xx_PCI_MMIO_OFFSET 0x00000000
#define M82xx_PCI_MMIO_SIZE 0x20000000
#endif
#ifndef M82xx_PCI_LOWER_IO
#define M82xx_PCI_LOWER_IO 0x00000000
#define M82xx_PCI_UPPER_IO 0x01ffffff
#define M82xx_PCI_IO_BASE 0xf6000000
#define M82xx_PCI_IO_SIZE 0x02000000
#endif
#ifndef M82xx_PCI_PRIM_WND_SIZE
#define M82xx_PCI_PRIM_WND_SIZE ~(M82xx_PCI_IO_SIZE - 1U)
#define M82xx_PCI_PRIM_WND_BASE (M82xx_PCI_IO_BASE)
#endif #endif
#ifndef MPC826x_PCI_LOWER_MEM #ifndef M82xx_PCI_SEC_WND_SIZE
#define MPC826x_PCI_LOWER_MEM 0x80000000 #define M82xx_PCI_SEC_WND_SIZE ~(M82xx_PCI_MEM_SIZE + M82xx_PCI_MMIO_SIZE - 1U)
#define MPC826x_PCI_UPPER_MEM 0x9fffffff #define M82xx_PCI_SEC_WND_BASE (M82xx_PCI_LOWER_MEM)
#define MPC826x_PCI_MEM_OFFSET 0x00000000
#endif #endif
#ifndef MPC826x_PCI_LOWER_MMIO #ifndef POTA_ADDR_SHIFT
#define MPC826x_PCI_LOWER_MMIO 0xa0000000 #define POTA_ADDR_SHIFT 12
#define MPC826x_PCI_UPPER_MMIO 0xafffffff
#define MPC826x_PCI_MMIO_OFFSET 0x00000000
#endif #endif
#ifndef MPC826x_PCI_LOWER_IO #ifndef PITA_ADDR_SHIFT
#define MPC826x_PCI_LOWER_IO 0x00000000 #define PITA_ADDR_SHIFT 12
#define MPC826x_PCI_UPPER_IO 0x00ffffff
#define MPC826x_PCI_IO_BASE 0xb0000000
#define MPC826x_PCI_IO_SIZE 0x01000000
#endif #endif
#ifndef _IO_BASE #ifndef _IO_BASE
...@@ -68,7 +84,7 @@ ...@@ -68,7 +84,7 @@
#ifdef CONFIG_8260_PCI9 #ifdef CONFIG_8260_PCI9
struct pci_controller; struct pci_controller;
extern void setup_m8260_indirect_pci(struct pci_controller* hose, extern void setup_m8260_indirect_pci(struct pci_controller* hose,
u32 cfg_addr, u32 cfg_data); u32 cfg_addr, u32 cfg_data);
#else #else
#define setup_m8260_indirect_pci setup_indirect_pci #define setup_m8260_indirect_pci setup_indirect_pci
#endif #endif
......
...@@ -1039,6 +1039,52 @@ typedef struct im_idma { ...@@ -1039,6 +1039,52 @@ typedef struct im_idma {
#define CMXSCR_TS4CS_CLK7 0x00000006 /* SCC4 Tx Clock Source is CLK7 */ #define CMXSCR_TS4CS_CLK7 0x00000006 /* SCC4 Tx Clock Source is CLK7 */
#define CMXSCR_TS4CS_CLK8 0x00000007 /* SCC4 Tx Clock Source is CLK8 */ #define CMXSCR_TS4CS_CLK8 0x00000007 /* SCC4 Tx Clock Source is CLK8 */
/*-----------------------------------------------------------------------
* SIUMCR - SIU Module Configuration Register 4-31
*/
#define SIUMCR_BBD 0x80000000 /* Bus Busy Disable */
#define SIUMCR_ESE 0x40000000 /* External Snoop Enable */
#define SIUMCR_PBSE 0x20000000 /* Parity Byte Select Enable */
#define SIUMCR_CDIS 0x10000000 /* Core Disable */
#define SIUMCR_DPPC00 0x00000000 /* Data Parity Pins Configuration*/
#define SIUMCR_DPPC01 0x04000000 /* - " - */
#define SIUMCR_DPPC10 0x08000000 /* - " - */
#define SIUMCR_DPPC11 0x0c000000 /* - " - */
#define SIUMCR_L2CPC00 0x00000000 /* L2 Cache Pins Configuration */
#define SIUMCR_L2CPC01 0x01000000 /* - " - */
#define SIUMCR_L2CPC10 0x02000000 /* - " - */
#define SIUMCR_L2CPC11 0x03000000 /* - " - */
#define SIUMCR_LBPC00 0x00000000 /* Local Bus Pins Configuration */
#define SIUMCR_LBPC01 0x00400000 /* - " - */
#define SIUMCR_LBPC10 0x00800000 /* - " - */
#define SIUMCR_LBPC11 0x00c00000 /* - " - */
#define SIUMCR_APPC00 0x00000000 /* Address Parity Pins Configuration*/
#define SIUMCR_APPC01 0x00100000 /* - " - */
#define SIUMCR_APPC10 0x00200000 /* - " - */
#define SIUMCR_APPC11 0x00300000 /* - " - */
#define SIUMCR_CS10PC00 0x00000000 /* CS10 Pin Configuration */
#define SIUMCR_CS10PC01 0x00040000 /* - " - */
#define SIUMCR_CS10PC10 0x00080000 /* - " - */
#define SIUMCR_CS10PC11 0x000c0000 /* - " - */
#define SIUMCR_BCTLC00 0x00000000 /* Buffer Control Configuration */
#define SIUMCR_BCTLC01 0x00010000 /* - " - */
#define SIUMCR_BCTLC10 0x00020000 /* - " - */
#define SIUMCR_BCTLC11 0x00030000 /* - " - */
#define SIUMCR_MMR00 0x00000000 /* Mask Masters Requests */
#define SIUMCR_MMR01 0x00004000 /* - " - */
#define SIUMCR_MMR10 0x00008000 /* - " - */
#define SIUMCR_MMR11 0x0000c000 /* - " - */
#define SIUMCR_LPBSE 0x00002000 /* LocalBus Parity Byte Select Enable*/
/*-----------------------------------------------------------------------
* SCCR - System Clock Control Register 9-8
*/
#define SCCR_PCI_MODE 0x00000100 /* PCI Mode */
#define SCCR_PCI_MODCK 0x00000080 /* Value of PCI_MODCK pin */
#define SCCR_PCIDF_MSK 0x00000078 /* PCI division factor */
#define SCCR_PCIDF_SHIFT 3
#endif /* __CPM2__ */ #endif /* __CPM2__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Define the vendor/device ID for the MPC8265. * Define the vendor/device ID for the MPC8265.
*/ */
#define PCI_DEVICE_ID_MPC8265 ((0x18C0 << 16) | PCI_VENDOR_ID_MOTOROLA) #define PCI_DEVICE_ID_MPC8265 ((0x18C0 << 16) | PCI_VENDOR_ID_MOTOROLA)
#define PCI_DEVICE_ID_MPC8272 ((0x18C1 << 16) | PCI_VENDOR_ID_MOTOROLA)
#define M8265_PCIBR0 0x101ac #define M8265_PCIBR0 0x101ac
#define M8265_PCIBR1 0x101b0 #define M8265_PCIBR1 0x101b0
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#endif #endif
#ifdef CONFIG_PCI_8260 #ifdef CONFIG_PCI_8260
#include <syslib/m8260_pci.h> #include <syslib/m82xx_pci.h>
#endif #endif
/* Make sure the memory translation stuff is there if PCI not used. /* Make sure the memory translation stuff is there if PCI not used.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment