Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] ppc trivial iomem annotations: chrp

Browse source 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2005-04-24 14:58:08 -07:00 committed by Linus Torvalds
parent 28a6815979
commit e2178f199b
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/ppc/platforms/chrp_pci.c
View file

@ -129,7 +129,7 @@ static struct pci_ops rtas_pci_ops =
rtas_write_config rtas_write_config
}; };
volatile struct Hydra *Hydra = NULL; volatile struct Hydra __iomem *Hydra = NULL;
int __init int __init
hydra_init(void) hydra_init(void)
@ -175,13 +175,14 @@ chrp_pcibios_fixup(void)
static void __init static void __init
setup_python(struct pci_controller *hose, struct device_node *dev) setup_python(struct pci_controller *hose, struct device_node *dev)
{ {
u32 *reg, val; u32 __iomem *reg;
u32 val;
unsigned long addr = dev->addrs[0].address; unsigned long addr = dev->addrs[0].address;
setup_indirect_pci(hose, addr + 0xf8000, addr + 0xf8010); setup_indirect_pci(hose, addr + 0xf8000, addr + 0xf8010);
/* Clear the magic go-slow bit */ /* Clear the magic go-slow bit */
reg = (u32 *) ioremap(dev->addrs[0].address + 0xf6000, 0x40); reg = ioremap(dev->addrs[0].address + 0xf6000, 0x40);
val = in_be32(&reg[12]); val = in_be32(&reg[12]);
if (val & PRG_CL_RESET_VALID) { if (val & PRG_CL_RESET_VALID) {
out_be32(&reg[12], val & ~PRG_CL_RESET_VALID); out_be32(&reg[12], val & ~PRG_CL_RESET_VALID);

2
arch/ppc/platforms/chrp_setup.c
View file

@ -356,7 +356,7 @@ static void __init chrp_find_openpic(void)
struct device_node *np; struct device_node *np;
int len, i; int len, i;
unsigned int *iranges; unsigned int *iranges;
void *isu; void __iomem *isu;
np = find_type_devices("open-pic"); np = find_type_devices("open-pic");
if (np == NULL || np->n_addrs == 0) if (np == NULL || np->n_addrs == 0)

2
include/asm-ppc/hydra.h
View file

@ -51,7 +51,7 @@ struct Hydra {
char OpenPIC[0x40000]; char OpenPIC[0x40000];
}; };
extern volatile struct Hydra *Hydra; extern volatile struct Hydra __iomem *Hydra;
/* /*