]> git.sur5r.net Git - u-boot/commitdiff
sh: Move SuperH PCI driver from cpu/sh4 to drivers/pci
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Sun, 23 Mar 2008 17:11:26 +0000 (02:11 +0900)
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Fri, 28 Mar 2008 05:16:13 +0000 (14:16 +0900)
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
cpu/sh4/Makefile
cpu/sh4/pci-sh4.c [deleted file]
cpu/sh4/pci-sh7780.c [deleted file]
drivers/pci/Makefile
drivers/pci/pci_sh4.c [new file with mode: 0644]
drivers/pci/pci_sh7780.c [new file with mode: 0644]
include/configs/r7780mp.h

index 7a53cb6dc4d3d42de9dc2496b3885b48813cdc1f..1bb8bd7729e88341e52a577048df7e1532875855 100644 (file)
@@ -29,8 +29,7 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)lib$(CPU).a
 
 START  = start.o
-OBJS   = cpu.o interrupts.o watchdog.o time.o cache.o \
-               pci-sh4.o pci-sh7780.o
+OBJS   = cpu.o interrupts.o watchdog.o time.o cache.o
 
 all:   .depend $(START) $(LIB)
 
diff --git a/cpu/sh4/pci-sh4.c b/cpu/sh4/pci-sh4.c
deleted file mode 100644 (file)
index 9d14f8d..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * SH4 PCI Controller (PCIC) for U-Boot.
- * (C) Dustin McIntire (dustin@sensoria.com)
- * (C) 2007 Nobuhiro Iwamatsu
- * (C) 2008 Yusuke Goda <goda.yusuke@renesas.com>
- *
- * u-boot/cpu/sh4/pci-sh4.c
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-
-#if defined(CONFIG_PCI) &&     \
-       defined(CONFIG_SH4_PCI)
-
-#include <asm/processor.h>
-#include <asm/io.h>
-#include <asm/pci.h>
-#include <pci.h>
-
-int pci_sh4_init(struct pci_controller *hose)
-{
-       hose->first_busno = 0;
-       hose->region_count = 0;
-       hose->last_busno = 0xff;
-
-       /* PCI memory space */
-       pci_set_region(hose->regions + 0,
-               CONFIG_PCI_MEM_BUS,
-               CONFIG_PCI_MEM_PHYS,
-               CONFIG_PCI_MEM_SIZE,
-               PCI_REGION_MEM);
-       hose->region_count++;
-
-       /* PCI IO space */
-       pci_set_region(hose->regions + 1,
-               CONFIG_PCI_IO_BUS,
-               CONFIG_PCI_IO_PHYS,
-               CONFIG_PCI_IO_SIZE,
-               PCI_REGION_IO);
-       hose->region_count++;
-
-       udelay(1000);
-
-       pci_set_ops(hose,
-                   pci_hose_read_config_byte_via_dword,
-                   pci_hose_read_config_word_via_dword,
-                   pci_sh4_read_config_dword,
-                   pci_hose_write_config_byte_via_dword,
-                   pci_hose_write_config_word_via_dword,
-                   pci_sh4_write_config_dword);
-
-       pci_register_hose(hose);
-
-       udelay(1000);
-
-#ifdef CONFIG_PCI_SCAN_SHOW
-       printf("PCI:   Bus Dev VenId DevId Class Int\n");
-#endif
-       hose->last_busno = pci_hose_scan(hose);
-       return 0;
-}
-
-#endif /* defined(CONFIG_PCI) && defined(CONFIG_SH4_PCI) */
diff --git a/cpu/sh4/pci-sh7780.c b/cpu/sh4/pci-sh7780.c
deleted file mode 100644 (file)
index 851d767..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * SH7780 PCI Controller (PCIC) for U-Boot.
- * (C) Dustin McIntire (dustin@sensoria.com)
- * (C) 2007 Nobuhiro Iwamatsu
- * (C) 2008 Yusuke Goda <goda.yusuke@renesas.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-
-#if defined(CONFIG_PCI) && defined(CONFIG_SH4_PCI) \
-       && defined(CONFIG_CPU_SH7780)
-
-#include <asm/processor.h>
-#include <asm/io.h>
-#include <pci.h>
-
-#define SH7780_VENDOR_ID       0x1912
-#define SH7780_DEVICE_ID       0x0002
-#define SH7780_PCICR_PREFIX    0xA5000000
-#define SH7780_PCICR_PFCS      0x00000800
-#define SH7780_PCICR_FTO       0x00000400
-#define SH7780_PCICR_PFE       0x00000200
-#define SH7780_PCICR_TBS       0x00000100
-#define SH7780_PCICR_ARBM      0x00000040
-#define SH7780_PCICR_IOCS      0x00000004
-#define SH7780_PCICR_PRST      0x00000002
-#define SH7780_PCICR_CFIN      0x00000001
-
-#define p4_in(addr)                    *((vu_long *)addr)
-#define p4_out(data,addr)      *(vu_long *)(addr) = (data)
-#define p4_inw(addr)           *((vu_short *)addr)
-#define p4_outw(data,addr)     *(vu_short *)(addr) = (data)
-
-int pci_sh4_read_config_dword(struct pci_controller *hose,
-                                   pci_dev_t dev, int offset, u32 *value)
-{
-       u32 par_data = 0x80000000 | dev;
-
-       p4_out(par_data | (offset & 0xfc), SH7780_PCIPAR);
-       *value = p4_in(SH7780_PCIPDR);
-
-       return 0;
-}
-
-int pci_sh4_write_config_dword(struct pci_controller *hose,
-                                    pci_dev_t dev, int offset, u32 value)
-{
-       u32 par_data = 0x80000000 | dev;
-
-       p4_out(par_data | (offset & 0xfc), SH7780_PCIPAR);
-       p4_out(value, SH7780_PCIPDR);
-       return 0;
-}
-
-int pci_sh7780_init(struct pci_controller *hose)
-{
-       p4_out(0x01, SH7780_PCIECR);
-
-       if (p4_inw(SH7780_PCIVID) != SH7780_VENDOR_ID
-           && p4_inw(SH7780_PCIDID) != SH7780_DEVICE_ID){
-               printf("PCI: Unknown PCI host bridge.\n");
-               return;
-       }
-       printf("PCI: SH7780 PCI host bridge found.\n");
-
-       /* Toggle PCI reset pin */
-       p4_out((SH7780_PCICR_PREFIX | SH7780_PCICR_PRST), SH7780_PCICR);
-       udelay(100000);
-       p4_out(SH7780_PCICR_PREFIX, SH7780_PCICR);
-       p4_outw(0x0047, SH7780_PCICMD);
-
-       p4_out(0x07F00001, SH7780_PCILSR0);
-       p4_out(0x08000000, SH7780_PCILAR0);
-       p4_out(0x00000000, SH7780_PCILSR1);
-       p4_out(0, SH7780_PCILAR1);
-       p4_out(0x08000000, SH7780_PCIMBAR0);
-       p4_out(0x00000000, SH7780_PCIMBAR1);
-
-       p4_out(0xFD000000, SH7780_PCIMBR0);
-       p4_out(0x00FC0000, SH7780_PCIMBMR0);
-
-       /* if use Operand Cache then enable PCICSCR Soonp bits. */
-       p4_out(0x08000000, SH7780_PCICSAR0);
-       p4_out(0x0000001B, SH7780_PCICSCR0);    /* Snoop bit :On */
-
-       p4_out((SH7780_PCICR_PREFIX | SH7780_PCICR_CFIN | SH7780_PCICR_ARBM
-             | SH7780_PCICR_FTO | SH7780_PCICR_PFCS | SH7780_PCICR_PFE),
-            SH7780_PCICR);
-
-       pci_sh4_init(hose);
-       return 0;
-}
-#endif /* defined(CONFIG_PCI) && defined(CONFIG_CPU_SH7780) */
index fe45839466162b36d54a560ae1e8aa2694a8b149..ef7781f899a19d4c7343ba0a0dc595fd8c6a2645 100644 (file)
@@ -31,6 +31,8 @@ COBJS-y += pci_auto.o
 COBJS-y += pci_indirect.o
 COBJS-y += tsi108_pci.o
 COBJS-y += w83c553f.o
+COBJS-$(CONFIG_SH4_PCI) += pci_sh4.o
+COBJS-$(CONFIG_SH7780_PCI) +=pci_sh7780.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
diff --git a/drivers/pci/pci_sh4.c b/drivers/pci/pci_sh4.c
new file mode 100644 (file)
index 0000000..1290c0a
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * SH4 PCI Controller (PCIC) for U-Boot.
+ * (C) Dustin McIntire (dustin@sensoria.com)
+ * (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+ * (C) 2008 Yusuke Goda <goda.yusuke@renesas.com>
+ *
+ * u-boot/cpu/sh4/pci-sh4.c
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+
+#include <asm/processor.h>
+#include <asm/io.h>
+#include <asm/pci.h>
+#include <pci.h>
+
+int pci_sh4_init(struct pci_controller *hose)
+{
+       hose->first_busno = 0;
+       hose->region_count = 0;
+       hose->last_busno = 0xff;
+
+       /* PCI memory space */
+       pci_set_region(hose->regions + 0,
+               CONFIG_PCI_MEM_BUS,
+               CONFIG_PCI_MEM_PHYS,
+               CONFIG_PCI_MEM_SIZE,
+               PCI_REGION_MEM);
+       hose->region_count++;
+
+       /* PCI IO space */
+       pci_set_region(hose->regions + 1,
+               CONFIG_PCI_IO_BUS,
+               CONFIG_PCI_IO_PHYS,
+               CONFIG_PCI_IO_SIZE,
+               PCI_REGION_IO);
+       hose->region_count++;
+
+       udelay(1000);
+
+       pci_set_ops(hose,
+                   pci_hose_read_config_byte_via_dword,
+                   pci_hose_read_config_word_via_dword,
+                   pci_sh4_read_config_dword,
+                   pci_hose_write_config_byte_via_dword,
+                   pci_hose_write_config_word_via_dword,
+                   pci_sh4_write_config_dword);
+
+       pci_register_hose(hose);
+
+       udelay(1000);
+
+#ifdef CONFIG_PCI_SCAN_SHOW
+       printf("PCI:   Bus Dev VenId DevId Class Int\n");
+#endif
+       hose->last_busno = pci_hose_scan(hose);
+       return 0;
+}
diff --git a/drivers/pci/pci_sh7780.c b/drivers/pci/pci_sh7780.c
new file mode 100644 (file)
index 0000000..d63d67d
--- /dev/null
@@ -0,0 +1,107 @@
+/*
+ * SH7780 PCI Controller (PCIC) for U-Boot.
+ * (C) Dustin McIntire (dustin@sensoria.com)
+ * (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+ * (C) 2008 Yusuke Goda <goda.yusuke@renesas.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+
+#include <asm/processor.h>
+#include <asm/io.h>
+#include <pci.h>
+
+#define SH7780_VENDOR_ID       0x1912
+#define SH7780_DEVICE_ID       0x0002
+#define SH7780_PCICR_PREFIX    0xA5000000
+#define SH7780_PCICR_PFCS      0x00000800
+#define SH7780_PCICR_FTO       0x00000400
+#define SH7780_PCICR_PFE       0x00000200
+#define SH7780_PCICR_TBS       0x00000100
+#define SH7780_PCICR_ARBM      0x00000040
+#define SH7780_PCICR_IOCS      0x00000004
+#define SH7780_PCICR_PRST      0x00000002
+#define SH7780_PCICR_CFIN      0x00000001
+
+#define p4_in(addr)                    *((vu_long *)addr)
+#define p4_out(data,addr)      *(vu_long *)(addr) = (data)
+#define p4_inw(addr)           *((vu_short *)addr)
+#define p4_outw(data,addr)     *(vu_short *)(addr) = (data)
+
+int pci_sh4_read_config_dword(struct pci_controller *hose,
+                                   pci_dev_t dev, int offset, u32 *value)
+{
+       u32 par_data = 0x80000000 | dev;
+
+       p4_out(par_data | (offset & 0xfc), SH7780_PCIPAR);
+       *value = p4_in(SH7780_PCIPDR);
+
+       return 0;
+}
+
+int pci_sh4_write_config_dword(struct pci_controller *hose,
+                                    pci_dev_t dev, int offset, u32 value)
+{
+       u32 par_data = 0x80000000 | dev;
+
+       p4_out(par_data | (offset & 0xfc), SH7780_PCIPAR);
+       p4_out(value, SH7780_PCIPDR);
+       return 0;
+}
+
+int pci_sh7780_init(struct pci_controller *hose)
+{
+       p4_out(0x01, SH7780_PCIECR);
+
+       if (p4_inw(SH7780_PCIVID) != SH7780_VENDOR_ID
+           && p4_inw(SH7780_PCIDID) != SH7780_DEVICE_ID){
+               printf("PCI: Unknown PCI host bridge.\n");
+               return;
+       }
+       printf("PCI: SH7780 PCI host bridge found.\n");
+
+       /* Toggle PCI reset pin */
+       p4_out((SH7780_PCICR_PREFIX | SH7780_PCICR_PRST), SH7780_PCICR);
+       udelay(100000);
+       p4_out(SH7780_PCICR_PREFIX, SH7780_PCICR);
+       p4_outw(0x0047, SH7780_PCICMD);
+
+       p4_out(0x07F00001, SH7780_PCILSR0);
+       p4_out(0x08000000, SH7780_PCILAR0);
+       p4_out(0x00000000, SH7780_PCILSR1);
+       p4_out(0, SH7780_PCILAR1);
+       p4_out(0x08000000, SH7780_PCIMBAR0);
+       p4_out(0x00000000, SH7780_PCIMBAR1);
+
+       p4_out(0xFD000000, SH7780_PCIMBR0);
+       p4_out(0x00FC0000, SH7780_PCIMBMR0);
+
+       /* if use Operand Cache then enable PCICSCR Soonp bits. */
+       p4_out(0x08000000, SH7780_PCICSAR0);
+       p4_out(0x0000001B, SH7780_PCICSCR0);    /* Snoop bit :On */
+
+       p4_out((SH7780_PCICR_PREFIX | SH7780_PCICR_CFIN | SH7780_PCICR_ARBM
+             | SH7780_PCICR_FTO | SH7780_PCICR_PFCS | SH7780_PCICR_PFE),
+            SH7780_PCICR);
+
+       pci_sh4_init(hose);
+       return 0;
+}
index 3ddb2f46a08d42b33c4a253c3fb0c69e2f702a95..42787f4fd13766b960d170a665f749040277d830 100644 (file)
 #if defined(CONFIG_CMD_PCI)
 #define CONFIG_PCI
 #define CONFIG_SH4_PCI
+#define CONFIG_SH7780_PCI
 #define CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW   1
 #define __io