diff options
| author | Magnus Damm <magnus.damm@gmail.com> | 2008-02-14 13:52:43 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-02-14 14:25:32 +0900 |
| commit | e036eaa681a17f71b64f6d9040fe605555623919 (patch) | |
| tree | 6fe462fe6106e830f39abd25f0e1a4f8aff3cb5c /arch/sh/drivers/pci/pci-sh4.h | |
| parent | f99cb7a43c5cca1813a97312487acf7a0f88ee2a (diff) | |
| download | op-kernel-dev-e036eaa681a17f71b64f6d9040fe605555623919.zip op-kernel-dev-e036eaa681a17f71b64f6d9040fe605555623919.tar.gz | |
sh: use ctrl_in/out for on chip pci access
This patch makes sure ctrl_inN/outN are used instead of inN/outN for on chip
pci registers. Without this patch addresses may be adjusted using the value
in generic_io_base. This patch makes it possible to set generic_io_base and
have pci without reading and writing all over the place.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Acked-by: Katsuya MATSUBARA <matsu@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers/pci/pci-sh4.h')
| -rw-r--r-- | arch/sh/drivers/pci/pci-sh4.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/drivers/pci/pci-sh4.h b/arch/sh/drivers/pci/pci-sh4.h index 4925c79..07e2950 100644 --- a/arch/sh/drivers/pci/pci-sh4.h +++ b/arch/sh/drivers/pci/pci-sh4.h @@ -172,11 +172,11 @@ struct sh4_pci_address_map { static inline void pci_write_reg(unsigned long val, unsigned long reg) { - outl(val, PCI_REG(reg)); + ctrl_outl(val, PCI_REG(reg)); } static inline unsigned long pci_read_reg(unsigned long reg) { - return inl(PCI_REG(reg)); + return ctrl_inl(PCI_REG(reg)); } #endif /* __PCI_SH4_H */ |
