Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits) [POWERPC] Create add_rtc() function to enable the RTC CMOS driver [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration [POWERPC] Oprofile support for Power 5++ [POWERPC] Enable arbitary speed tty ioctls and split input/output speed [POWERPC] Make drivers/char/hvc_console.c:khvcd() static [POWERPC] Remove dead code for preventing pread() and pwrite() calls [POWERPC] Remove unnecessary #undef printk from prom.c [POWERPC] Fix typo in Ebony default DTS [POWERPC] Check for NULL ppc_md.init_IRQ() before calling [POWERPC] Remove extra return statement [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED [POWERPC] pasemi: Rename platform [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports [POWERPC] Add __read_mostly support for powerpc [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane [POWERPC] Create a dummy zImage if no valid platform has been selected [POWERPC] PS3: Bootwrapper support. [POWERPC] powermac i2c: Use mutex [POWERPC] Schedule removal of arch/ppc ... Fixed up conflicts manually in: Documentation/feature-removal-schedule.txt arch/powerpc/kernel/pci_32.c arch/powerpc/kernel/pci_64.c include/asm-powerpc/pci.h and asked the powerpc people to double-check the result..
This commit is contained in:
Linus Torvalds
@@ -7,6 +7,7 @@ CFLAGS_btext.o += -fPIC
|
||||
|
||||
wdt-mpc8xx-$(CONFIG_8xx_WDT) += m8xx_wdt.o
|
||||
|
||||
obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o
|
||||
obj-$(CONFIG_PPCBUG_NVRAM) += prep_nvram.o
|
||||
obj-$(CONFIG_PPC_OCP) += ocp.o
|
||||
obj-$(CONFIG_IBM_OCP) += ibm_ocp.o
|
||||
|
||||
@@ -0,0 +1,134 @@
|
||||
/*
|
||||
* Support for indirect PCI bridges.
|
||||
*
|
||||
* Copyright (C) 1998 Gabriel Paubert.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/init.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/machdep.h>
|
||||
|
||||
#ifdef CONFIG_PPC_INDIRECT_PCI_BE
|
||||
#define PCI_CFG_OUT out_be32
|
||||
#else
|
||||
#define PCI_CFG_OUT out_le32
|
||||
#endif
|
||||
|
||||
static int
|
||||
indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
|
||||
int len, u32 *val)
|
||||
{
|
||||
struct pci_controller *hose = bus->sysdata;
|
||||
volatile void __iomem *cfg_data;
|
||||
u8 cfg_type = 0;
|
||||
|
||||
if (ppc_md.pci_exclude_device)
|
||||
if (ppc_md.pci_exclude_device(bus->number, devfn))
|
||||
return PCIBIOS_DEVICE_NOT_FOUND;
|
||||
|
||||
if (hose->set_cfg_type)
|
||||
if (bus->number != hose->first_busno)
|
||||
cfg_type = 1;
|
||||
|
||||
PCI_CFG_OUT(hose->cfg_addr,
|
||||
(0x80000000 | ((bus->number - hose->bus_offset) << 16)
|
||||
| (devfn << 8) | ((offset & 0xfc) | cfg_type)));
|
||||
|
||||
/*
|
||||
* Note: the caller has already checked that offset is
|
||||
* suitably aligned and that len is 1, 2 or 4.
|
||||
*/
|
||||
cfg_data = hose->cfg_data + (offset & 3);
|
||||
switch (len) {
|
||||
case 1:
|
||||
*val = in_8(cfg_data);
|
||||
break;
|
||||
case 2:
|
||||
*val = in_le16(cfg_data);
|
||||
break;
|
||||
default:
|
||||
*val = in_le32(cfg_data);
|
||||
break;
|
||||
}
|
||||
return PCIBIOS_SUCCESSFUL;
|
||||
}
|
||||
|
||||
static int
|
||||
indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
|
||||
int len, u32 val)
|
||||
{
|
||||
struct pci_controller *hose = bus->sysdata;
|
||||
volatile void __iomem *cfg_data;
|
||||
u8 cfg_type = 0;
|
||||
|
||||
if (ppc_md.pci_exclude_device)
|
||||
if (ppc_md.pci_exclude_device(bus->number, devfn))
|
||||
return PCIBIOS_DEVICE_NOT_FOUND;
|
||||
|
||||
if (hose->set_cfg_type)
|
||||
if (bus->number != hose->first_busno)
|
||||
cfg_type = 1;
|
||||
|
||||
PCI_CFG_OUT(hose->cfg_addr,
|
||||
(0x80000000 | ((bus->number - hose->bus_offset) << 16)
|
||||
| (devfn << 8) | ((offset & 0xfc) | cfg_type)));
|
||||
|
||||
/*
|
||||
* Note: the caller has already checked that offset is
|
||||
* suitably aligned and that len is 1, 2 or 4.
|
||||
*/
|
||||
cfg_data = hose->cfg_data + (offset & 3);
|
||||
switch (len) {
|
||||
case 1:
|
||||
out_8(cfg_data, val);
|
||||
break;
|
||||
case 2:
|
||||
out_le16(cfg_data, val);
|
||||
break;
|
||||
default:
|
||||
out_le32(cfg_data, val);
|
||||
break;
|
||||
}
|
||||
return PCIBIOS_SUCCESSFUL;
|
||||
}
|
||||
|
||||
static struct pci_ops indirect_pci_ops =
|
||||
{
|
||||
indirect_read_config,
|
||||
indirect_write_config
|
||||
};
|
||||
|
||||
void __init
|
||||
setup_indirect_pci_nomap(struct pci_controller* hose, void __iomem * cfg_addr,
|
||||
void __iomem * cfg_data)
|
||||
{
|
||||
hose->cfg_addr = cfg_addr;
|
||||
hose->cfg_data = cfg_data;
|
||||
hose->ops = &indirect_pci_ops;
|
||||
}
|
||||
|
||||
void __init
|
||||
setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)
|
||||
{
|
||||
unsigned long base = cfg_addr & PAGE_MASK;
|
||||
void __iomem *mbase, *addr, *data;
|
||||
|
||||
mbase = ioremap(base, PAGE_SIZE);
|
||||
addr = mbase + (cfg_addr & ~PAGE_MASK);
|
||||
if ((cfg_data & PAGE_MASK) != base)
|
||||
mbase = ioremap(cfg_data & PAGE_MASK, PAGE_SIZE);
|
||||
data = mbase + (cfg_data & ~PAGE_MASK);
|
||||
setup_indirect_pci_nomap(hose, addr, data);
|
||||
}
|
||||
@@ -71,6 +71,21 @@
|
||||
}, \
|
||||
}
|
||||
|
||||
/*
|
||||
* ML300/ML403 Video Device: shortcut macro for single instance
|
||||
*/
|
||||
#define XPAR_TFT(num) { \
|
||||
.name = "xilinxfb", \
|
||||
.id = num, \
|
||||
.num_resources = 1, \
|
||||
.resource = (struct resource[]) { \
|
||||
{ \
|
||||
.start = XPAR_TFT_##num##_BASEADDR, \
|
||||
.end = XPAR_TFT_##num##_BASEADDR+7, \
|
||||
.flags = IORESOURCE_IO, \
|
||||
}, \
|
||||
}, \
|
||||
}
|
||||
|
||||
/* UART 8250 driver platform data table */
|
||||
struct plat_serial8250_port virtex_serial_platform_data[] = {
|
||||
@@ -146,20 +161,17 @@ struct platform_device virtex_platform_devices[] = {
|
||||
XPAR_SYSACE(1),
|
||||
#endif
|
||||
|
||||
/* ML300/403 reference design framebuffer */
|
||||
#if defined(XPAR_TFT_0_BASEADDR)
|
||||
{
|
||||
.name = "xilinxfb",
|
||||
.id = 0,
|
||||
.num_resources = 1,
|
||||
.resource = (struct resource[]) {
|
||||
{
|
||||
.start = XPAR_TFT_0_BASEADDR,
|
||||
.end = XPAR_TFT_0_BASEADDR+7,
|
||||
.flags = IORESOURCE_IO,
|
||||
},
|
||||
},
|
||||
},
|
||||
XPAR_TFT(0),
|
||||
#endif
|
||||
#if defined(XPAR_TFT_1_BASEADDR)
|
||||
XPAR_TFT(1),
|
||||
#endif
|
||||
#if defined(XPAR_TFT_2_BASEADDR)
|
||||
XPAR_TFT(2),
|
||||
#endif
|
||||
#if defined(XPAR_TFT_3_BASEADDR)
|
||||
XPAR_TFT(3),
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user