linux-mips
[Top] [All Lists]

[PATCH 3/5] MIPS: separate cobalt PCI codes from setup.c

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH 3/5] MIPS: separate cobalt PCI codes from setup.c
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Fri, 1 Dec 2006 22:17:46 +0900
Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips <linux-mips@linux-mips.org>
In-reply-to: <20061201221601.3aa34024.yoichi_yuasa@tripeaks.co.jp>
Organization: TriPeaks Corporation
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20061201221242.261f57b0.yoichi_yuasa@tripeaks.co.jp> <20061201221601.3aa34024.yoichi_yuasa@tripeaks.co.jp>
Sender: linux-mips-bounce@linux-mips.org
Hi Ralf,

This patch has separated cobalt PCI codes from setup.c .
It's removed #ifdef CONFIG_PCI/#endif from cobalt setup.c .

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/Makefile 
mips/arch/mips/cobalt/Makefile
--- mips-orig/arch/mips/cobalt/Makefile 2006-10-12 10:19:25.000465500 +0900
+++ mips/arch/mips/cobalt/Makefile      2006-10-12 10:19:58.502559250 +0900
@@ -4,6 +4,7 @@
 
 obj-y   := irq.o reset.o setup.o
 
+obj-$(CONFIG_PCI)              += pci.o
 obj-$(CONFIG_EARLY_PRINTK)     += console.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/pci.c 
mips/arch/mips/cobalt/pci.c
--- mips-orig/arch/mips/cobalt/pci.c    1970-01-01 09:00:00.000000000 +0900
+++ mips/arch/mips/cobalt/pci.c 2006-10-12 10:19:58.502559250 +0900
@@ -0,0 +1,47 @@
+/*
+ * Register PCI controller.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1996, 1997, 2004, 05 by Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
+ *
+ */
+#include <linux/init.h>
+#include <linux/pci.h>
+
+#include <asm/gt64120.h>
+
+extern struct pci_ops gt64111_pci_ops;
+
+static struct resource cobalt_mem_resource = {
+       .start  = GT_DEF_PCI0_MEM0_BASE,
+       .end    = GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1,
+       .name   = "PCI memory",
+       .flags  = IORESOURCE_MEM,
+};
+
+static struct resource cobalt_io_resource = {
+       .start  = 0x1000,
+       .end    = 0xffff,
+       .name   = "PCI I/O",
+       .flags  = IORESOURCE_IO,
+};
+
+static struct pci_controller cobalt_pci_controller = {
+       .pci_ops        = &gt64111_pci_ops,
+       .mem_resource   = &cobalt_mem_resource,
+       .io_resource    = &cobalt_io_resource,
+       .io_offset      = 0 - GT_DEF_PCI0_IO_BASE,
+};
+
+static int __init cobalt_pci_init(void)
+{
+       register_pci_controller(&cobalt_pci_controller);
+
+       return 0;
+}
+
+arch_initcall(cobalt_pci_init);
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c 
mips/arch/mips/cobalt/setup.c
--- mips-orig/arch/mips/cobalt/setup.c  2006-10-12 10:20:53.049968250 +0900
+++ mips/arch/mips/cobalt/setup.c       2006-10-12 10:22:31.464118750 +0900
@@ -63,22 +63,6 @@ void __init plat_timer_setup(struct irqa
        GT_WRITE(GT_INTRMASK_OFS, GT_INTR_T0EXP_MSK | GT_READ(GT_INTRMASK_OFS));
 }
 
-extern struct pci_ops gt64111_pci_ops;
-
-static struct resource cobalt_mem_resource = {
-       .start  = GT_DEF_PCI0_MEM0_BASE,
-       .end    = GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1,
-       .name   = "PCI memory",
-       .flags  = IORESOURCE_MEM
-};
-
-static struct resource cobalt_io_resource = {
-       .start  = 0x1000,
-       .end    = 0xffff,
-       .name   = "PCI I/O",
-       .flags  = IORESOURCE_IO
-};
-
 /*
  * Cobalt doesn't have PS/2 keyboard/mouse interfaces,
  * keyboard conntroller is never used.
@@ -92,14 +76,6 @@ static struct resource cobalt_reserved_r
        },
 };
 
-static struct pci_controller cobalt_pci_controller = {
-       .pci_ops        = &gt64111_pci_ops,
-       .mem_resource   = &cobalt_mem_resource,
-       .mem_offset     = 0,
-       .io_resource    = &cobalt_io_resource,
-       .io_offset      = 0 - GT_DEF_PCI0_IO_BASE,
-};
-
 void __init plat_mem_setup(void)
 {
        static struct uart_port uart;
@@ -126,10 +102,6 @@ void __init plat_mem_setup(void)
 
        printk("Cobalt board ID: %d\n", cobalt_board_id);
 
-#ifdef CONFIG_PCI
-       register_pci_controller(&cobalt_pci_controller);
-#endif
-
        if (cobalt_board_id > COBALT_BRD_ID_RAQ1) {
 #ifdef CONFIG_EARLY_PRINTK
                cobalt_early_console();

<Prev in Thread] Current Thread [Next in Thread>