[PATCH] define io_map_base for rc32434's PCI controller

[PATCH] define io_map_base for rc32434's PCI controller

[Phil Sutter]

The code is rather based on trial-and-error than knowledge. Verified Via
Rhine functionality in PIO as well as MMIO mode.

Signed-off-by: Phil Sutter <n0-1@freewrt.org>
Tested-by: Florian Fainelli <florian@openwrt.org>
---
 arch/mips/pci/pci-rc32434.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/mips/pci/pci-rc32434.c b/arch/mips/pci/pci-rc32434.c
index 1c2821e..71f7d27 100644
--- a/arch/mips/pci/pci-rc32434.c
+++ b/arch/mips/pci/pci-rc32434.c
@@ -205,6 +205,8 @@ static int __init rc32434_pcibridge_init(void)
 
 static int __init rc32434_pci_init(void)
 {
+	void __iomem *io_map_base;
+
 	pr_info("PCI: Initializing PCI\n");
 
 	ioport_resource.start = rc32434_res_pci_io1.start;
@@ -212,6 +214,15 @@ static int __init rc32434_pci_init(void)
 
 	rc32434_pcibridge_init();
 
+	io_map_base = ioremap(rc32434_res_pci_io1.start,
+		rc32434_res_pci_io1.end - rc32434_res_pci_io1.start + 1);
+
+	if (!io_map_base)
+		return -ENOMEM;
+
+	rc32434_controller.io_map_base =
+		(unsigned long)io_map_base - rc32434_res_pci_io1.start;
+
 	register_pci_controller(&rc32434_controller);
 	rc32434_sync();
 
-- 
1.5.6.4

Re: [PATCH] define io_map_base for rc32434's PCI controller

[Florian Fainelli]

Ralf,

This patch still applies to current linux-queue/linux.git, can you merge it 
please ? Thanks a lot.

Le Wednesday 12 November 2008 00:16:04 Phil Sutter, vous avez écrit :
> The code is rather based on trial-and-error than knowledge. Verified Via
> Rhine functionality in PIO as well as MMIO mode.
>
> Signed-off-by: Phil Sutter <n0-1@freewrt.org>
> Tested-by: Florian Fainelli <florian@openwrt.org>
> ---
-- 
Best regards, Florian Fainelli
Email : florian@openwrt.org
http://openwrt.org
-------------------------------

Re: [PATCH] define io_map_base for rc32434's PCI controller

[Ralf Baechle]

On Sun, Jan 11, 2009 at 05:08:58PM +0100, Florian Fainelli wrote:

> This patch still applies to current linux-queue/linux.git, can you merge it 
> please ? Thanks a lot.

I sent a pull request for the stuff in the upstream-linus tree earlier
today.  To avoid possible confusion and I'll roll the next tree for him
only after he pulled this one.

  Ralf

Re: [PATCH] define io_map_base for rc32434's PCI controller

[Ralf Baechle]

On Wed, Nov 12, 2008 at 12:16:04AM +0100, Phil Sutter wrote:

> The code is rather based on trial-and-error than knowledge. Verified Via
> Rhine functionality in PIO as well as MMIO mode.
> 
> Signed-off-by: Phil Sutter <n0-1@freewrt.org>
> Tested-by: Florian Fainelli <florian@openwrt.org>

Thanks, applied.

  Ralf