All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot-Users] [git patch] MPC8349ADS
@ 2006-01-23 23:46 Kumar Gala
  2006-01-25 19:05 ` [U-Boot-Users] " David Updegraff
  2006-03-12 21:03 ` Wolfgang Denk
  0 siblings, 2 replies; 4+ messages in thread
From: Kumar Gala @ 2006-01-23 23:46 UTC (permalink / raw)
  To: u-boot

Please pull from 'mpc8349ads' branch of
git.kernel.org:/pub/scm/boot/u-boot/u-boot.git

to receive the following updates:

 CHANGELOG                     |    3 
 board/mpc8349ads/Makefile     |    2 
 board/mpc8349ads/mpc8349ads.c |   41 ----
 board/mpc8349ads/pci.c        |  380 ++++++++++++++++++++++++++++++++++++++++++
 include/asm-ppc/mpc8349_pci.h |    1 
 include/configs/MPC8349ADS.h  |   24 +-
 6 files changed, 400 insertions(+), 51 deletions(-)

Kumar Gala:
      Added PCI support for MPC8349ADS board

diff --git a/CHANGELOG b/CHANGELOG
index c1da98f..6c66441 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Added PCI support for MPC8349ADS board
+  Patch by Kumar Gala 11 Jan 2006
+
 * Add support for 28F256J3A flah (=> 64 MB) on PM520 board
 
 * Fix compiler problem with at91rm9200dk board.
diff --git a/board/mpc8349ads/Makefile b/board/mpc8349ads/Makefile
index 4327b0d..f865f9c 100644
--- a/board/mpc8349ads/Makefile
+++ b/board/mpc8349ads/Makefile
@@ -24,7 +24,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= lib$(BOARD).a
 
-OBJS	:= $(BOARD).o
+OBJS	:= $(BOARD).o pci.o
 
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS)
diff --git a/board/mpc8349ads/mpc8349ads.c b/board/mpc8349ads/mpc8349ads.c
index da8d3d7..505acbc 100644
--- a/board/mpc8349ads/mpc8349ads.c
+++ b/board/mpc8349ads/mpc8349ads.c
@@ -147,47 +147,6 @@ int checkboard (void)
 	return 0;
 }
 
-#if defined(CONFIG_PCI)
-/*
- * Initialize PCI Devices, report devices found
- */
-#ifndef CONFIG_PCI_PNP
-static struct pci_config_table pci_mpc83xxads_config_table[] = {
-	{PCI_ANY_ID,PCI_ANY_ID,PCI_ANY_ID,PCI_ANY_ID,
-	pci_cfgfunc_config_device, {PCI_ENET0_IOADDR,
-				    PCI_ENET0_MEMADDR,
-				    PCI_COMMON_MEMORY | PCI_COMMAND_MASTER
-	} },
-	{}
-}
-#endif
-
-
-volatile static struct pci_controller hose[] = {
-	{
-#ifndef CONFIG_PCI_PNP
-	config_table:pci_mpc83xxads_config_table,
-#endif
-	},
-	{
-#ifndef CONFIG_PCI_PNP
-	config_table:pci_mpc83xxads_config_table,
-#endif
-	}
-};
-#endif /* CONFIG_PCI */
-
-
-void
-pci_init_board(void)
-{
-#ifdef CONFIG_PCI
-	extern void pci_mpc83xx_init(volatile struct pci_controller *hose);
-
-	pci_mpc83xx_init(hose);
-#endif /* CONFIG_PCI */
-}
-
 /*
  * if MPC8349ADS is soldered with SDRAM
  */
diff --git a/board/mpc8349ads/pci.c b/board/mpc8349ads/pci.c
new file mode 100644
index 0000000..6cafbaa
--- /dev/null
+++ b/board/mpc8349ads/pci.c
@@ -0,0 +1,380 @@
+/*
+ * 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 <asm/mmu.h>
+#include <common.h>
+#include <asm/global_data.h>
+#include <pci.h>
+#include <asm/mpc8349_pci.h>
+#include <i2c.h>
+
+#ifdef CONFIG_PCI
+
+/* System RAM mapped to PCI space */
+#define CONFIG_PCI_SYS_MEM_BUS	CFG_SDRAM_BASE
+#define CONFIG_PCI_SYS_MEM_PHYS	CFG_SDRAM_BASE
+
+#ifndef CONFIG_PCI_PNP
+static struct pci_config_table pci_mpc83xxads_config_table[] = {
+	{PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+	 PCI_IDSEL_NUMBER, PCI_ANY_ID,
+ 	 pci_cfgfunc_config_device, {PCI_ENET0_IOADDR,
+				     PCI_ENET0_MEMADDR,
+				     PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER
+		}
+	},
+	{}
+};
+#endif
+
+static struct pci_controller pci_hose[] = {
+       {
+#ifndef CONFIG_PCI_PNP
+       config_table:pci_mpc83xxads_config_table,
+#endif
+       },
+       {
+#ifndef CONFIG_PCI_PNP
+       config_table:pci_mpc83xxads_config_table,
+#endif
+       }
+};
+
+/**************************************************************************
+ *
+ * pib_init() -- initialize the PCA9555PW IO expander on the PIB board
+ *
+ */
+void
+pib_init(void)
+{
+	u8 val8;
+	/*
+	 * Assign PIB PMC slot to desired PCI bus
+	 */
+	mpc8349_i2c = (i2c_t*)(CFG_IMMRBAR + CFG_I2C2_OFFSET);
+	i2c_init(CFG_I2C_SPEED, CFG_I2C_SLAVE);
+
+	val8 = 0;
+	i2c_write(0x23, 0x6, 1, &val8, 1);
+	i2c_write(0x23, 0x7, 1, &val8, 1);
+	val8 = 0xff;
+	i2c_write(0x23, 0x2, 1, &val8, 1);
+	i2c_write(0x23, 0x3, 1, &val8, 1);
+
+	val8 = 0;
+	i2c_write(0x26, 0x6, 1, &val8, 1);
+	val8 = 0x34;
+	i2c_write(0x26, 0x7, 1, &val8, 1);
+#if defined(PCI_64BIT)
+	val8 = 0xf4;	/* PMC2:PCI1/64-bit */
+#elif defined(PCI_ALL_PCI1)
+	val8 = 0xf3;	/* PMC1:PCI1 PMC2:PCI1 PMC3:PCI1 */
+#elif defined(PCI_ONE_PCI1)
+	val8 = 0xf9;	/* PMC1:PCI1 PMC2:PCI2 PMC3:PCI2 */
+#else
+	val8 = 0xf5;	/* PMC1:PCI1 PMC2:PCI1 PMC3:PCI2 */
+#endif
+	i2c_write(0x26, 0x2, 1, &val8, 1);
+	val8 = 0xff;
+	i2c_write(0x26, 0x3, 1, &val8, 1);
+	val8 = 0;
+	i2c_write(0x27, 0x6, 1, &val8, 1);
+	i2c_write(0x27, 0x7, 1, &val8, 1);
+	val8 = 0xff;
+	i2c_write(0x27, 0x2, 1, &val8, 1);
+	val8 = 0xef;
+	i2c_write(0x27, 0x3, 1, &val8, 1);
+	asm("eieio");
+
+#if defined(PCI_64BIT)
+	printf("PCI1: 64-bit on PMC2\n");
+#elif defined(PCI_ALL_PCI1)
+	printf("PCI1: 32-bit on PMC1, PMC2, PMC3\n");
+#elif defined(PCI_ONE_PCI1)
+	printf("PCI1: 32-bit on PMC1\n");
+	printf("PCI2: 32-bit on PMC2, PMC3\n");
+#else
+	printf("PCI1: 32-bit on PMC1, PMC2\n");
+	printf("PCI2: 32-bit on PMC3\n");
+#endif
+}
+
+/**************************************************************************
+ * pci_init_board()
+ *
+ * NOTICE: PCI2 is not currently supported
+ *
+ */
+void
+pci_init_board(void)
+{
+	DECLARE_GLOBAL_DATA_PTR;
+	volatile immap_t *	immr;
+	volatile clk8349_t *	clk;
+	volatile law8349_t *	pci_law;
+	volatile pot8349_t *	pci_pot;
+	volatile pcictrl8349_t *	pci_ctrl;
+	volatile pciconf8349_t *	pci_conf;
+	u16 reg16;
+	u32 reg32;
+	u32 dev;
+	struct	pci_controller * hose;
+
+	immr = (immap_t *)CFG_IMMRBAR;
+	clk = (clk8349_t *)&immr->clk;
+	pci_law = immr->sysconf.pcilaw;
+	pci_pot = immr->ios.pot;
+	pci_ctrl = immr->pci_ctrl;
+	pci_conf = immr->pci_conf;
+
+	hose = &pci_hose[0];
+
+	pib_init();
+
+	/*
+	 * Configure PCI controller and PCI_CLK_OUTPUT both in 66M mode
+	 */
+
+	reg32 = clk->occr;
+	udelay(2000);
+	clk->occr = 0xff000000;
+	udelay(2000);
+
+	/*
+	 * Release PCI RST Output signal
+	 */
+	pci_ctrl[0].gcr = 0;
+	udelay(2000);
+	pci_ctrl[0].gcr = 1;
+
+#ifdef CONFIG_MPC83XX_PCI2
+	pci_ctrl[1].gcr = 0;
+	udelay(2000);
+	pci_ctrl[1].gcr = 1;
+#endif
+
+	/* We need to wait at least a 1sec based on PCI specs */
+	{
+		int i;
+
+		for (i = 0; i < 1000; ++i)
+			udelay (1000);
+	}
+
+	/*
+	 * Configure PCI Local Access Windows
+	 */
+	pci_law[0].bar = CFG_PCI1_MEM_PHYS & LAWBAR_BAR;
+	pci_law[0].ar = LAWAR_EN | LAWAR_SIZE_1G;
+
+	pci_law[1].bar = CFG_PCI1_IO_PHYS & LAWBAR_BAR;
+	pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_32M;
+
+	/*
+	 * Configure PCI Outbound Translation Windows
+	 */
+
+	/* PCI1 mem space - prefetch */
+	pci_pot[0].potar = (CFG_PCI1_MEM_BASE >> 12) & POTAR_TA_MASK;
+	pci_pot[0].pobar = (CFG_PCI1_MEM_PHYS >> 12) & POBAR_BA_MASK;
+	pci_pot[0].pocmr = POCMR_EN | POCMR_PREFETCH_EN | (POCMR_CM_256M & POCMR_CM_MASK);
+
+	/* PCI1 IO space */
+	pci_pot[1].potar = (CFG_PCI1_IO_BASE >> 12) & POTAR_TA_MASK;
+	pci_pot[1].pobar = (CFG_PCI1_IO_PHYS >> 12) & POBAR_BA_MASK;
+	pci_pot[1].pocmr = POCMR_EN | POCMR_IO | (POCMR_CM_1M & POCMR_CM_MASK);
+
+	/* PCI1 mmio - non-prefetch mem space */
+	pci_pot[2].potar = (CFG_PCI1_MMIO_BASE >> 12) & POTAR_TA_MASK;
+	pci_pot[2].pobar = (CFG_PCI1_MMIO_PHYS >> 12) & POBAR_BA_MASK;
+	pci_pot[2].pocmr = POCMR_EN | (POCMR_CM_256M & POCMR_CM_MASK);
+
+	/*
+	 * Configure PCI Inbound Translation Windows
+	 */
+
+	/* we need RAM mapped to PCI space for the devices to
+	 * access main memory */
+	pci_ctrl[0].pitar1 = 0x0;
+	pci_ctrl[0].pibar1 = 0x0;
+	pci_ctrl[0].piebar1 = 0x0;
+	pci_ctrl[0].piwar1 = PIWAR_EN | PIWAR_PF | PIWAR_RTT_SNOOP | PIWAR_WTT_SNOOP | (__ilog2(gd->ram_size) - 1);
+
+	hose->first_busno = 0;
+	hose->last_busno = 0xff;
+
+	/* PCI memory prefetch space */
+	pci_set_region(hose->regions + 0,
+		       CFG_PCI1_MEM_BASE,
+		       CFG_PCI1_MEM_PHYS,
+		       CFG_PCI1_MEM_SIZE,
+		       PCI_REGION_MEM|PCI_REGION_PREFETCH);
+
+	/* PCI memory space */
+	pci_set_region(hose->regions + 1,
+		       CFG_PCI1_MMIO_BASE,
+		       CFG_PCI1_MMIO_PHYS,
+		       CFG_PCI1_MMIO_SIZE,
+		       PCI_REGION_MEM);
+
+	/* PCI IO space */
+	pci_set_region(hose->regions + 2,
+		       CFG_PCI1_IO_BASE,
+		       CFG_PCI1_IO_PHYS,
+		       CFG_PCI1_IO_SIZE,
+		       PCI_REGION_IO);
+
+	/* System memory space */
+	pci_set_region(hose->regions + 3,
+		       CONFIG_PCI_SYS_MEM_BUS,
+                       CONFIG_PCI_SYS_MEM_PHYS,
+                       gd->ram_size,
+                       PCI_REGION_MEM | PCI_REGION_MEMORY);
+
+	hose->region_count = 4;
+
+	pci_setup_indirect(hose,
+			   (CFG_IMMRBAR+0x8300),
+			   (CFG_IMMRBAR+0x8304));
+
+	pci_register_hose(hose);
+
+	/*
+	 * Write to Command register
+	 */
+	reg16 = 0xff;
+	dev = PCI_BDF(hose->first_busno, 0, 0);
+	pci_hose_read_config_word (hose, dev, PCI_COMMAND, &reg16);
+	reg16 |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+	pci_hose_write_config_word(hose, dev, PCI_COMMAND, reg16);
+
+	/*
+	 * Clear non-reserved bits in status register.
+	 */
+	pci_hose_write_config_word(hose, dev, PCI_STATUS, 0xffff);
+	pci_hose_write_config_byte(hose, dev, PCI_LATENCY_TIMER, 0x80);
+	pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE, 0x08);
+
+#ifdef CONFIG_PCI_SCAN_SHOW
+	printf("PCI:   Bus Dev VenId DevId Class Int\n");
+#endif
+	/*
+	 * Hose scan.
+	 */
+	hose->last_busno = pci_hose_scan(hose);
+
+#ifdef CONFIG_MPC83XX_PCI2
+	hose = &pci_hose[1];
+
+	/*
+	 * Configure PCI Outbound Translation Windows
+	 */
+
+	/* PCI2 mem space - prefetch */
+	pci_pot[3].potar = (CFG_PCI2_MEM_BASE >> 12) & POTAR_TA_MASK;
+	pci_pot[3].pobar = (CFG_PCI2_MEM_PHYS >> 12) & POBAR_BA_MASK;
+	pci_pot[3].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_PREFETCH_EN | (POCMR_CM_256M & POCMR_CM_MASK);
+
+	/* PCI2 IO space */
+	pci_pot[4].potar = (CFG_PCI2_IO_BASE >> 12) & POTAR_TA_MASK;
+	pci_pot[4].pobar = (CFG_PCI2_IO_PHYS >> 12) & POBAR_BA_MASK;
+	pci_pot[4].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_IO | (POCMR_CM_1M & POCMR_CM_MASK);
+
+	/* PCI2 mmio - non-prefetch mem space */
+	pci_pot[5].potar = (CFG_PCI2_MMIO_BASE >> 12) & POTAR_TA_MASK;
+	pci_pot[5].pobar = (CFG_PCI2_MMIO_PHYS >> 12) & POBAR_BA_MASK;
+	pci_pot[5].pocmr = POCMR_EN | POCMR_PCI2 | (POCMR_CM_256M & POCMR_CM_MASK);
+
+	/*
+	 * Configure PCI Inbound Translation Windows
+	 */
+
+	/* we need RAM mapped to PCI space for the devices to
+	 * access main memory */
+	pci_ctrl[1].pitar1 = 0x0;
+	pci_ctrl[1].pibar1 = 0x0;
+	pci_ctrl[1].piebar1 = 0x0;
+	pci_ctrl[1].piwar1 = PIWAR_EN | PIWAR_PF | PIWAR_RTT_SNOOP | PIWAR_WTT_SNOOP | (__ilog2(gd->ram_size) - 1);
+
+	hose->first_busno = pci_hose[0].last_busno + 1;
+	hose->last_busno = 0xff;
+
+	/* PCI memory prefetch space */
+	pci_set_region(hose->regions + 0,
+		       CFG_PCI2_MEM_BASE,
+		       CFG_PCI2_MEM_PHYS,
+		       CFG_PCI2_MEM_SIZE,
+		       PCI_REGION_MEM|PCI_REGION_PREFETCH);
+
+	/* PCI memory space */
+	pci_set_region(hose->regions + 1,
+		       CFG_PCI2_MMIO_BASE,
+		       CFG_PCI2_MMIO_PHYS,
+		       CFG_PCI2_MMIO_SIZE,
+		       PCI_REGION_MEM);
+
+	/* PCI IO space */
+	pci_set_region(hose->regions + 2,
+		       CFG_PCI2_IO_BASE,
+		       CFG_PCI2_IO_PHYS,
+		       CFG_PCI2_IO_SIZE,
+		       PCI_REGION_IO);
+
+	/* System memory space */
+	pci_set_region(hose->regions + 3,
+		       CONFIG_PCI_SYS_MEM_BUS,
+                       CONFIG_PCI_SYS_MEM_PHYS,
+                       gd->ram_size,
+                       PCI_REGION_MEM | PCI_REGION_MEMORY);
+
+	hose->region_count = 4;
+
+	pci_setup_indirect(hose,
+			   (CFG_IMMRBAR+0x8380),
+			   (CFG_IMMRBAR+0x8384));
+
+	pci_register_hose(hose);
+
+	/*
+	 * Write to Command register
+	 */
+	reg16 = 0xff;
+	dev = PCI_BDF(hose->first_busno, 0, 0);
+	pci_hose_read_config_word (hose, dev, PCI_COMMAND, &reg16);
+	reg16 |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+	pci_hose_write_config_word(hose, dev, PCI_COMMAND, reg16);
+
+	/*
+	 * Clear non-reserved bits in status register.
+	 */
+	pci_hose_write_config_word(hose, dev, PCI_STATUS, 0xffff);
+	pci_hose_write_config_byte(hose, dev, PCI_LATENCY_TIMER, 0x80);
+	pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE, 0x08);
+
+	/*
+	 * Hose scan.
+	 */
+	hose->last_busno = pci_hose_scan(hose);
+#endif
+
+}
+#endif /* CONFIG_PCI */
diff --git a/include/asm-ppc/mpc8349_pci.h b/include/asm-ppc/mpc8349_pci.h
index 48255a3..7a1adba 100644
--- a/include/asm-ppc/mpc8349_pci.h
+++ b/include/asm-ppc/mpc8349_pci.h
@@ -77,6 +77,7 @@
 #define POCMR_ENABLE        0x80000000
 #define POCMR_PCI_IO        0x40000000
 #define POCMR_PREFETCH_EN   0x20000000
+#define POCMR_PCI2          0x10000000
 
 /* Soft PCI reset */
 
diff --git a/include/configs/MPC8349ADS.h b/include/configs/MPC8349ADS.h
index d6d2fab..5677fa1 100644
--- a/include/configs/MPC8349ADS.h
+++ b/include/configs/MPC8349ADS.h
@@ -41,9 +41,8 @@
 #define CONFIG_MPC8349		1	/* MPC8349 specific */
 #define CONFIG_MPC8349ADS	1	/* MPC8349ADS board specific */
 
-/* FIXME: Real PCI support will come in a follow-up update. */
-#undef CONFIG_PCI
-
+#define CONFIG_PCI
+#undef  CONFIG_MPC83XX_PCI2		/* support for 2nd PCI controller */
 #define CONFIG_TSEC_ENET 		/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
 
@@ -324,19 +323,26 @@
  * General PCI
  * Addresses are mapped 1-1.
  */
+
 #define CFG_PCI1_MEM_BASE	0x80000000
 #define CFG_PCI1_MEM_PHYS	CFG_PCI1_MEM_BASE
-#define CFG_PCI1_MEM_SIZE	0x20000000	/* 512M */
+#define CFG_PCI1_MEM_SIZE	0x10000000	/* 256M */
+#define CFG_PCI1_MMIO_BASE	0x90000000
+#define CFG_PCI1_MMIO_PHYS	CFG_PCI1_MMIO_BASE
+#define CFG_PCI1_MMIO_SIZE	0x10000000	/* 256M */
 #define CFG_PCI1_IO_BASE	0x00000000
 #define CFG_PCI1_IO_PHYS	0xe2000000
-#define CFG_PCI1_IO_SIZE	0x1000000	/* 16M */
+#define CFG_PCI1_IO_SIZE	0x00100000	/* 1M */
 
-#define CFG_PCI2_MEM_BASE	0xA0000000
+#define CFG_PCI2_MEM_BASE	0xa0000000
 #define CFG_PCI2_MEM_PHYS	CFG_PCI2_MEM_BASE
-#define CFG_PCI2_MEM_SIZE	0x20000000	/* 512M */
+#define CFG_PCI2_MEM_SIZE	0x10000000	/* 256M */
+#define CFG_PCI2_MMIO_BASE	0xb0000000
+#define CFG_PCI2_MMIO_PHYS	CFG_PCI2_MMIO_BASE
+#define CFG_PCI2_MMIO_SIZE	0x10000000	/* 256M */
 #define CFG_PCI2_IO_BASE	0x00000000
-#define CFG_PCI2_IO_PHYS	0xe3000000
-#define CFG_PCI2_IO_SIZE	0x1000000	/* 16M */
+#define CFG_PCI2_IO_PHYS	0xe2100000
+#define CFG_PCI2_IO_SIZE	0x00100000	/* 1M */
 #if defined(CONFIG_PCI)
 
 #define PCI_ALL_PCI1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [U-Boot-Users] Re: [git patch] MPC8349ADS
  2006-01-23 23:46 [U-Boot-Users] [git patch] MPC8349ADS Kumar Gala
@ 2006-01-25 19:05 ` David Updegraff
  2006-01-25 21:34   ` Kumar Gala
  2006-03-12 21:03 ` Wolfgang Denk
  1 sibling, 1 reply; 4+ messages in thread
From: David Updegraff @ 2006-01-25 19:05 UTC (permalink / raw)
  To: u-boot

Is there a reason this pci.c file lives under board/mpc8349ads instead
of under cpu/mpc83xx ???  Do we each really need to duplicate the whole
thing?

> Please pull from 'mpc8349ads' branch of
> git.kernel.org:/pub/scm/boot/u-boot/u-boot.git
> 
> to receive the following updates:
> 
>  CHANGELOG                     |    3 
>  board/mpc8349ads/Makefile     |    2 
>  board/mpc8349ads/mpc8349ads.c |   41 ----
>  board/mpc8349ads/pci.c        |  380 ++++++++++++++++++++++++++++++++++++++++++
>  include/asm-ppc/mpc8349_pci.h |    1 
>  include/configs/MPC8349ADS.h  |   24 +-
>  6 files changed, 400 insertions(+), 51 deletions(-)
> 
> Kumar Gala:
>       Added PCI support for MPC8349ADS board
> 
> diff --git a/CHANGELOG b/CHANGELOG
> index c1da98f..6c66441 100644
> --- a/CHANGELOG
> +++ b/CHANGELOG
> @@ -2,6 +2,9 @@
>  Changes since U-Boot 1.1.4:
>  ======================================================================
>  
> +* Added PCI support for MPC8349ADS board
> +  Patch by Kumar Gala 11 Jan 2006
> +
>  * Add support for 28F256J3A flah (=> 64 MB) on PM520 board
>  
>  * Fix compiler problem with at91rm9200dk board.
> diff --git a/board/mpc8349ads/Makefile b/board/mpc8349ads/Makefile
> index 4327b0d..f865f9c 100644
> --- a/board/mpc8349ads/Makefile
> +++ b/board/mpc8349ads/Makefile
> @@ -24,7 +24,7 @@ include $(TOPDIR)/config.mk
>  
>  LIB	= lib$(BOARD).a
>  
> -OBJS	:= $(BOARD).o
> +OBJS	:= $(BOARD).o pci.o
>  
>  $(LIB):	$(OBJS) $(SOBJS)
>  	$(AR) crv $@ $(OBJS)
> diff --git a/board/mpc8349ads/mpc8349ads.c b/board/mpc8349ads/mpc8349ads.c
> index da8d3d7..505acbc 100644
> --- a/board/mpc8349ads/mpc8349ads.c
> +++ b/board/mpc8349ads/mpc8349ads.c
> @@ -147,47 +147,6 @@ int checkboard (void)
>  	return 0;
>  }
>  
> -#if defined(CONFIG_PCI)
> -/*
> - * Initialize PCI Devices, report devices found
> - */
> -#ifndef CONFIG_PCI_PNP
> -static struct pci_config_table pci_mpc83xxads_config_table[] = {
> -	{PCI_ANY_ID,PCI_ANY_ID,PCI_ANY_ID,PCI_ANY_ID,
> -	pci_cfgfunc_config_device, {PCI_ENET0_IOADDR,
> -				    PCI_ENET0_MEMADDR,
> -				    PCI_COMMON_MEMORY | PCI_COMMAND_MASTER
> -	} },
> -	{}
> -}
> -#endif
> -
> -
> -volatile static struct pci_controller hose[] = {
> -	{
> -#ifndef CONFIG_PCI_PNP
> -	config_table:pci_mpc83xxads_config_table,
> -#endif
> -	},
> -	{
> -#ifndef CONFIG_PCI_PNP
> -	config_table:pci_mpc83xxads_config_table,
> -#endif
> -	}
> -};
> -#endif /* CONFIG_PCI */
> -
> -
> -void
> -pci_init_board(void)
> -{
> -#ifdef CONFIG_PCI
> -	extern void pci_mpc83xx_init(volatile struct pci_controller *hose);
> -
> -	pci_mpc83xx_init(hose);
> -#endif /* CONFIG_PCI */
> -}
> -
>  /*
>   * if MPC8349ADS is soldered with SDRAM
>   */
> diff --git a/board/mpc8349ads/pci.c b/board/mpc8349ads/pci.c
> new file mode 100644
> index 0000000..6cafbaa
> --- /dev/null
> +++ b/board/mpc8349ads/pci.c
> @@ -0,0 +1,380 @@
> +/*
> + * 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 <asm/mmu.h>
> +#include <common.h>
> +#include <asm/global_data.h>
> +#include <pci.h>
> +#include <asm/mpc8349_pci.h>
> +#include <i2c.h>
> +
> +#ifdef CONFIG_PCI
> +
> +/* System RAM mapped to PCI space */
> +#define CONFIG_PCI_SYS_MEM_BUS	CFG_SDRAM_BASE
> +#define CONFIG_PCI_SYS_MEM_PHYS	CFG_SDRAM_BASE
> +
> +#ifndef CONFIG_PCI_PNP
> +static struct pci_config_table pci_mpc83xxads_config_table[] = {
> +	{PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
> +	 PCI_IDSEL_NUMBER, PCI_ANY_ID,
> + 	 pci_cfgfunc_config_device, {PCI_ENET0_IOADDR,
> +				     PCI_ENET0_MEMADDR,
> +				     PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER
> +		}
> +	},
> +	{}
> +};
> +#endif
> +
> +static struct pci_controller pci_hose[] = {
> +       {
> +#ifndef CONFIG_PCI_PNP
> +       config_table:pci_mpc83xxads_config_table,
> +#endif
> +       },
> +       {
> +#ifndef CONFIG_PCI_PNP
> +       config_table:pci_mpc83xxads_config_table,
> +#endif
> +       }
> +};
> +
> +/**************************************************************************
> + *
> + * pib_init() -- initialize the PCA9555PW IO expander on the PIB board
> + *
> + */
> +void
> +pib_init(void)
> +{
> +	u8 val8;
> +	/*
> +	 * Assign PIB PMC slot to desired PCI bus
> +	 */
> +	mpc8349_i2c = (i2c_t*)(CFG_IMMRBAR + CFG_I2C2_OFFSET);
> +	i2c_init(CFG_I2C_SPEED, CFG_I2C_SLAVE);
> +
> +	val8 = 0;
> +	i2c_write(0x23, 0x6, 1, &val8, 1);
> +	i2c_write(0x23, 0x7, 1, &val8, 1);
> +	val8 = 0xff;
> +	i2c_write(0x23, 0x2, 1, &val8, 1);
> +	i2c_write(0x23, 0x3, 1, &val8, 1);
> +
> +	val8 = 0;
> +	i2c_write(0x26, 0x6, 1, &val8, 1);
> +	val8 = 0x34;
> +	i2c_write(0x26, 0x7, 1, &val8, 1);
> +#if defined(PCI_64BIT)
> +	val8 = 0xf4;	/* PMC2:PCI1/64-bit */
> +#elif defined(PCI_ALL_PCI1)
> +	val8 = 0xf3;	/* PMC1:PCI1 PMC2:PCI1 PMC3:PCI1 */
> +#elif defined(PCI_ONE_PCI1)
> +	val8 = 0xf9;	/* PMC1:PCI1 PMC2:PCI2 PMC3:PCI2 */
> +#else
> +	val8 = 0xf5;	/* PMC1:PCI1 PMC2:PCI1 PMC3:PCI2 */
> +#endif
> +	i2c_write(0x26, 0x2, 1, &val8, 1);
> +	val8 = 0xff;
> +	i2c_write(0x26, 0x3, 1, &val8, 1);
> +	val8 = 0;
> +	i2c_write(0x27, 0x6, 1, &val8, 1);
> +	i2c_write(0x27, 0x7, 1, &val8, 1);
> +	val8 = 0xff;
> +	i2c_write(0x27, 0x2, 1, &val8, 1);
> +	val8 = 0xef;
> +	i2c_write(0x27, 0x3, 1, &val8, 1);
> +	asm("eieio");
> +
> +#if defined(PCI_64BIT)
> +	printf("PCI1: 64-bit on PMC2\n");
> +#elif defined(PCI_ALL_PCI1)
> +	printf("PCI1: 32-bit on PMC1, PMC2, PMC3\n");
> +#elif defined(PCI_ONE_PCI1)
> +	printf("PCI1: 32-bit on PMC1\n");
> +	printf("PCI2: 32-bit on PMC2, PMC3\n");
> +#else
> +	printf("PCI1: 32-bit on PMC1, PMC2\n");
> +	printf("PCI2: 32-bit on PMC3\n");
> +#endif
> +}
> +
> +/**************************************************************************
> + * pci_init_board()
> + *
> + * NOTICE: PCI2 is not currently supported
> + *
> + */
> +void
> +pci_init_board(void)
> +{
> +	DECLARE_GLOBAL_DATA_PTR;
> +	volatile immap_t *	immr;
> +	volatile clk8349_t *	clk;
> +	volatile law8349_t *	pci_law;
> +	volatile pot8349_t *	pci_pot;
> +	volatile pcictrl8349_t *	pci_ctrl;
> +	volatile pciconf8349_t *	pci_conf;
> +	u16 reg16;
> +	u32 reg32;
> +	u32 dev;
> +	struct	pci_controller * hose;
> +
> +	immr = (immap_t *)CFG_IMMRBAR;
> +	clk = (clk8349_t *)&immr->clk;
> +	pci_law = immr->sysconf.pcilaw;
> +	pci_pot = immr->ios.pot;
> +	pci_ctrl = immr->pci_ctrl;
> +	pci_conf = immr->pci_conf;
> +
> +	hose = &pci_hose[0];
> +
> +	pib_init();
> +
> +	/*
> +	 * Configure PCI controller and PCI_CLK_OUTPUT both in 66M mode
> +	 */
> +
> +	reg32 = clk->occr;
> +	udelay(2000);
> +	clk->occr = 0xff000000;
> +	udelay(2000);
> +
> +	/*
> +	 * Release PCI RST Output signal
> +	 */
> +	pci_ctrl[0].gcr = 0;
> +	udelay(2000);
> +	pci_ctrl[0].gcr = 1;
> +
> +#ifdef CONFIG_MPC83XX_PCI2
> +	pci_ctrl[1].gcr = 0;
> +	udelay(2000);
> +	pci_ctrl[1].gcr = 1;
> +#endif
> +
> +	/* We need to wait at least a 1sec based on PCI specs */
> +	{
> +		int i;
> +
> +		for (i = 0; i < 1000; ++i)
> +			udelay (1000);
> +	}
> +
> +	/*
> +	 * Configure PCI Local Access Windows
> +	 */
> +	pci_law[0].bar = CFG_PCI1_MEM_PHYS & LAWBAR_BAR;
> +	pci_law[0].ar = LAWAR_EN | LAWAR_SIZE_1G;
> +
> +	pci_law[1].bar = CFG_PCI1_IO_PHYS & LAWBAR_BAR;
> +	pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_32M;
> +
> +	/*
> +	 * Configure PCI Outbound Translation Windows
> +	 */
> +
> +	/* PCI1 mem space - prefetch */
> +	pci_pot[0].potar = (CFG_PCI1_MEM_BASE >> 12) & POTAR_TA_MASK;
> +	pci_pot[0].pobar = (CFG_PCI1_MEM_PHYS >> 12) & POBAR_BA_MASK;
> +	pci_pot[0].pocmr = POCMR_EN | POCMR_PREFETCH_EN | (POCMR_CM_256M & POCMR_CM_MASK);
> +
> +	/* PCI1 IO space */
> +	pci_pot[1].potar = (CFG_PCI1_IO_BASE >> 12) & POTAR_TA_MASK;
> +	pci_pot[1].pobar = (CFG_PCI1_IO_PHYS >> 12) & POBAR_BA_MASK;
> +	pci_pot[1].pocmr = POCMR_EN | POCMR_IO | (POCMR_CM_1M & POCMR_CM_MASK);
> +
> +	/* PCI1 mmio - non-prefetch mem space */
> +	pci_pot[2].potar = (CFG_PCI1_MMIO_BASE >> 12) & POTAR_TA_MASK;
> +	pci_pot[2].pobar = (CFG_PCI1_MMIO_PHYS >> 12) & POBAR_BA_MASK;
> +	pci_pot[2].pocmr = POCMR_EN | (POCMR_CM_256M & POCMR_CM_MASK);
> +
> +	/*
> +	 * Configure PCI Inbound Translation Windows
> +	 */
> +
> +	/* we need RAM mapped to PCI space for the devices to
> +	 * access main memory */
> +	pci_ctrl[0].pitar1 = 0x0;
> +	pci_ctrl[0].pibar1 = 0x0;
> +	pci_ctrl[0].piebar1 = 0x0;
> +	pci_ctrl[0].piwar1 = PIWAR_EN | PIWAR_PF | PIWAR_RTT_SNOOP | PIWAR_WTT_SNOOP | (__ilog2(gd->ram_size) - 1);
> +
> +	hose->first_busno = 0;
> +	hose->last_busno = 0xff;
> +
> +	/* PCI memory prefetch space */
> +	pci_set_region(hose->regions + 0,
> +		       CFG_PCI1_MEM_BASE,
> +		       CFG_PCI1_MEM_PHYS,
> +		       CFG_PCI1_MEM_SIZE,
> +		       PCI_REGION_MEM|PCI_REGION_PREFETCH);
> +
> +	/* PCI memory space */
> +	pci_set_region(hose->regions + 1,
> +		       CFG_PCI1_MMIO_BASE,
> +		       CFG_PCI1_MMIO_PHYS,
> +		       CFG_PCI1_MMIO_SIZE,
> +		       PCI_REGION_MEM);
> +
> +	/* PCI IO space */
> +	pci_set_region(hose->regions + 2,
> +		       CFG_PCI1_IO_BASE,
> +		       CFG_PCI1_IO_PHYS,
> +		       CFG_PCI1_IO_SIZE,
> +		       PCI_REGION_IO);
> +
> +	/* System memory space */
> +	pci_set_region(hose->regions + 3,
> +		       CONFIG_PCI_SYS_MEM_BUS,
> +                       CONFIG_PCI_SYS_MEM_PHYS,
> +                       gd->ram_size,
> +                       PCI_REGION_MEM | PCI_REGION_MEMORY);
> +
> +	hose->region_count = 4;
> +
> +	pci_setup_indirect(hose,
> +			   (CFG_IMMRBAR+0x8300),
> +			   (CFG_IMMRBAR+0x8304));
> +
> +	pci_register_hose(hose);
> +
> +	/*
> +	 * Write to Command register
> +	 */
> +	reg16 = 0xff;
> +	dev = PCI_BDF(hose->first_busno, 0, 0);
> +	pci_hose_read_config_word (hose, dev, PCI_COMMAND, &reg16);
> +	reg16 |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
> +	pci_hose_write_config_word(hose, dev, PCI_COMMAND, reg16);
> +
> +	/*
> +	 * Clear non-reserved bits in status register.
> +	 */
> +	pci_hose_write_config_word(hose, dev, PCI_STATUS, 0xffff);
> +	pci_hose_write_config_byte(hose, dev, PCI_LATENCY_TIMER, 0x80);
> +	pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE, 0x08);
> +
> +#ifdef CONFIG_PCI_SCAN_SHOW
> +	printf("PCI:   Bus Dev VenId DevId Class Int\n");
> +#endif
> +	/*
> +	 * Hose scan.
> +	 */
> +	hose->last_busno = pci_hose_scan(hose);
> +
> +#ifdef CONFIG_MPC83XX_PCI2
> +	hose = &pci_hose[1];
> +
> +	/*
> +	 * Configure PCI Outbound Translation Windows
> +	 */
> +
> +	/* PCI2 mem space - prefetch */
> +	pci_pot[3].potar = (CFG_PCI2_MEM_BASE >> 12) & POTAR_TA_MASK;
> +	pci_pot[3].pobar = (CFG_PCI2_MEM_PHYS >> 12) & POBAR_BA_MASK;
> +	pci_pot[3].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_PREFETCH_EN | (POCMR_CM_256M & POCMR_CM_MASK);
> +
> +	/* PCI2 IO space */
> +	pci_pot[4].potar = (CFG_PCI2_IO_BASE >> 12) & POTAR_TA_MASK;
> +	pci_pot[4].pobar = (CFG_PCI2_IO_PHYS >> 12) & POBAR_BA_MASK;
> +	pci_pot[4].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_IO | (POCMR_CM_1M & POCMR_CM_MASK);
> +
> +	/* PCI2 mmio - non-prefetch mem space */
> +	pci_pot[5].potar = (CFG_PCI2_MMIO_BASE >> 12) & POTAR_TA_MASK;
> +	pci_pot[5].pobar = (CFG_PCI2_MMIO_PHYS >> 12) & POBAR_BA_MASK;
> +	pci_pot[5].pocmr = POCMR_EN | POCMR_PCI2 | (POCMR_CM_256M & POCMR_CM_MASK);
> +
> +	/*
> +	 * Configure PCI Inbound Translation Windows
> +	 */
> +
> +	/* we need RAM mapped to PCI space for the devices to
> +	 * access main memory */
> +	pci_ctrl[1].pitar1 = 0x0;
> +	pci_ctrl[1].pibar1 = 0x0;
> +	pci_ctrl[1].piebar1 = 0x0;
> +	pci_ctrl[1].piwar1 = PIWAR_EN | PIWAR_PF | PIWAR_RTT_SNOOP | PIWAR_WTT_SNOOP | (__ilog2(gd->ram_size) - 1);
> +
> +	hose->first_busno = pci_hose[0].last_busno + 1;
> +	hose->last_busno = 0xff;
> +
> +	/* PCI memory prefetch space */
> +	pci_set_region(hose->regions + 0,
> +		       CFG_PCI2_MEM_BASE,
> +		       CFG_PCI2_MEM_PHYS,
> +		       CFG_PCI2_MEM_SIZE,
> +		       PCI_REGION_MEM|PCI_REGION_PREFETCH);
> +
> +	/* PCI memory space */
> +	pci_set_region(hose->regions + 1,
> +		       CFG_PCI2_MMIO_BASE,
> +		       CFG_PCI2_MMIO_PHYS,
> +		       CFG_PCI2_MMIO_SIZE,
> +		       PCI_REGION_MEM);
> +
> +	/* PCI IO space */
> +	pci_set_region(hose->regions + 2,
> +		       CFG_PCI2_IO_BASE,
> +		       CFG_PCI2_IO_PHYS,
> +		       CFG_PCI2_IO_SIZE,
> +		       PCI_REGION_IO);
> +
> +	/* System memory space */
> +	pci_set_region(hose->regions + 3,
> +		       CONFIG_PCI_SYS_MEM_BUS,
> +                       CONFIG_PCI_SYS_MEM_PHYS,
> +                       gd->ram_size,
> +                       PCI_REGION_MEM | PCI_REGION_MEMORY);
> +
> +	hose->region_count = 4;
> +
> +	pci_setup_indirect(hose,
> +			   (CFG_IMMRBAR+0x8380),
> +			   (CFG_IMMRBAR+0x8384));
> +
> +	pci_register_hose(hose);
> +
> +	/*
> +	 * Write to Command register
> +	 */
> +	reg16 = 0xff;
> +	dev = PCI_BDF(hose->first_busno, 0, 0);
> +	pci_hose_read_config_word (hose, dev, PCI_COMMAND, &reg16);
> +	reg16 |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
> +	pci_hose_write_config_word(hose, dev, PCI_COMMAND, reg16);
> +
> +	/*
> +	 * Clear non-reserved bits in status register.
> +	 */
> +	pci_hose_write_config_word(hose, dev, PCI_STATUS, 0xffff);
> +	pci_hose_write_config_byte(hose, dev, PCI_LATENCY_TIMER, 0x80);
> +	pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE, 0x08);
> +
> +	/*
> +	 * Hose scan.
> +	 */
> +	hose->last_busno = pci_hose_scan(hose);
> +#endif
> +
> +}
> +#endif /* CONFIG_PCI */
> diff --git a/include/asm-ppc/mpc8349_pci.h b/include/asm-ppc/mpc8349_pci.h
> index 48255a3..7a1adba 100644
> --- a/include/asm-ppc/mpc8349_pci.h
> +++ b/include/asm-ppc/mpc8349_pci.h
> @@ -77,6 +77,7 @@
>  #define POCMR_ENABLE        0x80000000
>  #define POCMR_PCI_IO        0x40000000
>  #define POCMR_PREFETCH_EN   0x20000000
> +#define POCMR_PCI2          0x10000000
>  
>  /* Soft PCI reset */
>  
> diff --git a/include/configs/MPC8349ADS.h b/include/configs/MPC8349ADS.h
> index d6d2fab..5677fa1 100644
> --- a/include/configs/MPC8349ADS.h
> +++ b/include/configs/MPC8349ADS.h
> @@ -41,9 +41,8 @@
>  #define CONFIG_MPC8349		1	/* MPC8349 specific */
>  #define CONFIG_MPC8349ADS	1	/* MPC8349ADS board specific */
>  
> -/* FIXME: Real PCI support will come in a follow-up update. */
> -#undef CONFIG_PCI
> -
> +#define CONFIG_PCI
> +#undef  CONFIG_MPC83XX_PCI2		/* support for 2nd PCI controller */
>  #define CONFIG_TSEC_ENET 		/* tsec ethernet support */
>  #define CONFIG_ENV_OVERWRITE
>  
> @@ -324,19 +323,26 @@
>   * General PCI
>   * Addresses are mapped 1-1.
>   */
> +
>  #define CFG_PCI1_MEM_BASE	0x80000000
>  #define CFG_PCI1_MEM_PHYS	CFG_PCI1_MEM_BASE
> -#define CFG_PCI1_MEM_SIZE	0x20000000	/* 512M */
> +#define CFG_PCI1_MEM_SIZE	0x10000000	/* 256M */
> +#define CFG_PCI1_MMIO_BASE	0x90000000
> +#define CFG_PCI1_MMIO_PHYS	CFG_PCI1_MMIO_BASE
> +#define CFG_PCI1_MMIO_SIZE	0x10000000	/* 256M */
>  #define CFG_PCI1_IO_BASE	0x00000000
>  #define CFG_PCI1_IO_PHYS	0xe2000000
> -#define CFG_PCI1_IO_SIZE	0x1000000	/* 16M */
> +#define CFG_PCI1_IO_SIZE	0x00100000	/* 1M */
>  
> -#define CFG_PCI2_MEM_BASE	0xA0000000
> +#define CFG_PCI2_MEM_BASE	0xa0000000
>  #define CFG_PCI2_MEM_PHYS	CFG_PCI2_MEM_BASE
> -#define CFG_PCI2_MEM_SIZE	0x20000000	/* 512M */
> +#define CFG_PCI2_MEM_SIZE	0x10000000	/* 256M */
> +#define CFG_PCI2_MMIO_BASE	0xb0000000
> +#define CFG_PCI2_MMIO_PHYS	CFG_PCI2_MMIO_BASE
> +#define CFG_PCI2_MMIO_SIZE	0x10000000	/* 256M */
>  #define CFG_PCI2_IO_BASE	0x00000000
> -#define CFG_PCI2_IO_PHYS	0xe3000000
> -#define CFG_PCI2_IO_SIZE	0x1000000	/* 16M */
> +#define CFG_PCI2_IO_PHYS	0xe2100000
> +#define CFG_PCI2_IO_SIZE	0x00100000	/* 1M */
>  #if defined(CONFIG_PCI)
>  
>  #define PCI_ALL_PCI1
> 
> 
> 
> -------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
> for problems?  Stop!  Download the new AJAX search engine that makes
> searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot-Users] Re: [git patch] MPC8349ADS
  2006-01-25 19:05 ` [U-Boot-Users] " David Updegraff
@ 2006-01-25 21:34   ` Kumar Gala
  0 siblings, 0 replies; 4+ messages in thread
From: Kumar Gala @ 2006-01-25 21:34 UTC (permalink / raw)
  To: u-boot

There were enough subtle differences between how MPC8349ADS and the  
TQM board were doing.  In the future it likely we could move common  
code into cpu/mpc83xx/pci.c

Once we have another 83xx board or two it will be easier to figure  
out what that commonality truly is.

- kumar

On Jan 25, 2006, at 1:05 PM, David Updegraff wrote:

> Is there a reason this pci.c file lives under board/mpc8349ads instead
> of under cpu/mpc83xx ???  Do we each really need to duplicate the  
> whole
> thing?
>
>> Please pull from 'mpc8349ads' branch of
>> git.kernel.org:/pub/scm/boot/u-boot/u-boot.git
>>
>> to receive the following updates:
>>
>>  CHANGELOG                     |    3
>>  board/mpc8349ads/Makefile     |    2
>>  board/mpc8349ads/mpc8349ads.c |   41 ----
>>  board/mpc8349ads/pci.c        |  380 +++++++++++++++++++++++++++++ 
>> +++++++++++++
>>  include/asm-ppc/mpc8349_pci.h |    1
>>  include/configs/MPC8349ADS.h  |   24 +-
>>  6 files changed, 400 insertions(+), 51 deletions(-)
>>
>> Kumar Gala:
>>       Added PCI support for MPC8349ADS board
>>
>> diff --git a/CHANGELOG b/CHANGELOG
>> index c1da98f..6c66441 100644
>> --- a/CHANGELOG
>> +++ b/CHANGELOG
>> @@ -2,6 +2,9 @@
>>  Changes since U-Boot 1.1.4:
>>   
>> ===================================================================== 
>> =
>>
>> +* Added PCI support for MPC8349ADS board
>> +  Patch by Kumar Gala 11 Jan 2006
>> +
>>  * Add support for 28F256J3A flah (=> 64 MB) on PM520 board
>>
>>  * Fix compiler problem with at91rm9200dk board.
>> diff --git a/board/mpc8349ads/Makefile b/board/mpc8349ads/Makefile
>> index 4327b0d..f865f9c 100644
>> --- a/board/mpc8349ads/Makefile
>> +++ b/board/mpc8349ads/Makefile
>> @@ -24,7 +24,7 @@ include $(TOPDIR)/config.mk
>>
>>  LIB	= lib$(BOARD).a
>>
>> -OBJS	:= $(BOARD).o
>> +OBJS	:= $(BOARD).o pci.o
>>
>>  $(LIB):	$(OBJS) $(SOBJS)
>>  	$(AR) crv $@ $(OBJS)
>> diff --git a/board/mpc8349ads/mpc8349ads.c b/board/mpc8349ads/ 
>> mpc8349ads.c
>> index da8d3d7..505acbc 100644
>> --- a/board/mpc8349ads/mpc8349ads.c
>> +++ b/board/mpc8349ads/mpc8349ads.c
>> @@ -147,47 +147,6 @@ int checkboard (void)
>>  	return 0;
>>  }
>>
>> -#if defined(CONFIG_PCI)
>> -/*
>> - * Initialize PCI Devices, report devices found
>> - */
>> -#ifndef CONFIG_PCI_PNP
>> -static struct pci_config_table pci_mpc83xxads_config_table[] = {
>> -	{PCI_ANY_ID,PCI_ANY_ID,PCI_ANY_ID,PCI_ANY_ID,
>> -	pci_cfgfunc_config_device, {PCI_ENET0_IOADDR,
>> -				    PCI_ENET0_MEMADDR,
>> -				    PCI_COMMON_MEMORY | PCI_COMMAND_MASTER
>> -	} },
>> -	{}
>> -}
>> -#endif
>> -
>> -
>> -volatile static struct pci_controller hose[] = {
>> -	{
>> -#ifndef CONFIG_PCI_PNP
>> -	config_table:pci_mpc83xxads_config_table,
>> -#endif
>> -	},
>> -	{
>> -#ifndef CONFIG_PCI_PNP
>> -	config_table:pci_mpc83xxads_config_table,
>> -#endif
>> -	}
>> -};
>> -#endif /* CONFIG_PCI */
>> -
>> -
>> -void
>> -pci_init_board(void)
>> -{
>> -#ifdef CONFIG_PCI
>> -	extern void pci_mpc83xx_init(volatile struct pci_controller *hose);
>> -
>> -	pci_mpc83xx_init(hose);
>> -#endif /* CONFIG_PCI */
>> -}
>> -
>>  /*
>>   * if MPC8349ADS is soldered with SDRAM
>>   */
>> diff --git a/board/mpc8349ads/pci.c b/board/mpc8349ads/pci.c
>> new file mode 100644
>> index 0000000..6cafbaa
>> --- /dev/null
>> +++ b/board/mpc8349ads/pci.c
>> @@ -0,0 +1,380 @@
>> +/*
>> + * 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 <asm/mmu.h>
>> +#include <common.h>
>> +#include <asm/global_data.h>
>> +#include <pci.h>
>> +#include <asm/mpc8349_pci.h>
>> +#include <i2c.h>
>> +
>> +#ifdef CONFIG_PCI
>> +
>> +/* System RAM mapped to PCI space */
>> +#define CONFIG_PCI_SYS_MEM_BUS	CFG_SDRAM_BASE
>> +#define CONFIG_PCI_SYS_MEM_PHYS	CFG_SDRAM_BASE
>> +
>> +#ifndef CONFIG_PCI_PNP
>> +static struct pci_config_table pci_mpc83xxads_config_table[] = {
>> +	{PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
>> +	 PCI_IDSEL_NUMBER, PCI_ANY_ID,
>> + 	 pci_cfgfunc_config_device, {PCI_ENET0_IOADDR,
>> +				     PCI_ENET0_MEMADDR,
>> +				     PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER
>> +		}
>> +	},
>> +	{}
>> +};
>> +#endif
>> +
>> +static struct pci_controller pci_hose[] = {
>> +       {
>> +#ifndef CONFIG_PCI_PNP
>> +       config_table:pci_mpc83xxads_config_table,
>> +#endif
>> +       },
>> +       {
>> +#ifndef CONFIG_PCI_PNP
>> +       config_table:pci_mpc83xxads_config_table,
>> +#endif
>> +       }
>> +};
>> +
>> +/ 
>> ********************************************************************* 
>> *****
>> + *
>> + * pib_init() -- initialize the PCA9555PW IO expander on the PIB  
>> board
>> + *
>> + */
>> +void
>> +pib_init(void)
>> +{
>> +	u8 val8;
>> +	/*
>> +	 * Assign PIB PMC slot to desired PCI bus
>> +	 */
>> +	mpc8349_i2c = (i2c_t*)(CFG_IMMRBAR + CFG_I2C2_OFFSET);
>> +	i2c_init(CFG_I2C_SPEED, CFG_I2C_SLAVE);
>> +
>> +	val8 = 0;
>> +	i2c_write(0x23, 0x6, 1, &val8, 1);
>> +	i2c_write(0x23, 0x7, 1, &val8, 1);
>> +	val8 = 0xff;
>> +	i2c_write(0x23, 0x2, 1, &val8, 1);
>> +	i2c_write(0x23, 0x3, 1, &val8, 1);
>> +
>> +	val8 = 0;
>> +	i2c_write(0x26, 0x6, 1, &val8, 1);
>> +	val8 = 0x34;
>> +	i2c_write(0x26, 0x7, 1, &val8, 1);
>> +#if defined(PCI_64BIT)
>> +	val8 = 0xf4;	/* PMC2:PCI1/64-bit */
>> +#elif defined(PCI_ALL_PCI1)
>> +	val8 = 0xf3;	/* PMC1:PCI1 PMC2:PCI1 PMC3:PCI1 */
>> +#elif defined(PCI_ONE_PCI1)
>> +	val8 = 0xf9;	/* PMC1:PCI1 PMC2:PCI2 PMC3:PCI2 */
>> +#else
>> +	val8 = 0xf5;	/* PMC1:PCI1 PMC2:PCI1 PMC3:PCI2 */
>> +#endif
>> +	i2c_write(0x26, 0x2, 1, &val8, 1);
>> +	val8 = 0xff;
>> +	i2c_write(0x26, 0x3, 1, &val8, 1);
>> +	val8 = 0;
>> +	i2c_write(0x27, 0x6, 1, &val8, 1);
>> +	i2c_write(0x27, 0x7, 1, &val8, 1);
>> +	val8 = 0xff;
>> +	i2c_write(0x27, 0x2, 1, &val8, 1);
>> +	val8 = 0xef;
>> +	i2c_write(0x27, 0x3, 1, &val8, 1);
>> +	asm("eieio");
>> +
>> +#if defined(PCI_64BIT)
>> +	printf("PCI1: 64-bit on PMC2\n");
>> +#elif defined(PCI_ALL_PCI1)
>> +	printf("PCI1: 32-bit on PMC1, PMC2, PMC3\n");
>> +#elif defined(PCI_ONE_PCI1)
>> +	printf("PCI1: 32-bit on PMC1\n");
>> +	printf("PCI2: 32-bit on PMC2, PMC3\n");
>> +#else
>> +	printf("PCI1: 32-bit on PMC1, PMC2\n");
>> +	printf("PCI2: 32-bit on PMC3\n");
>> +#endif
>> +}
>> +
>> +/ 
>> ********************************************************************* 
>> *****
>> + * pci_init_board()
>> + *
>> + * NOTICE: PCI2 is not currently supported
>> + *
>> + */
>> +void
>> +pci_init_board(void)
>> +{
>> +	DECLARE_GLOBAL_DATA_PTR;
>> +	volatile immap_t *	immr;
>> +	volatile clk8349_t *	clk;
>> +	volatile law8349_t *	pci_law;
>> +	volatile pot8349_t *	pci_pot;
>> +	volatile pcictrl8349_t *	pci_ctrl;
>> +	volatile pciconf8349_t *	pci_conf;
>> +	u16 reg16;
>> +	u32 reg32;
>> +	u32 dev;
>> +	struct	pci_controller * hose;
>> +
>> +	immr = (immap_t *)CFG_IMMRBAR;
>> +	clk = (clk8349_t *)&immr->clk;
>> +	pci_law = immr->sysconf.pcilaw;
>> +	pci_pot = immr->ios.pot;
>> +	pci_ctrl = immr->pci_ctrl;
>> +	pci_conf = immr->pci_conf;
>> +
>> +	hose = &pci_hose[0];
>> +
>> +	pib_init();
>> +
>> +	/*
>> +	 * Configure PCI controller and PCI_CLK_OUTPUT both in 66M mode
>> +	 */
>> +
>> +	reg32 = clk->occr;
>> +	udelay(2000);
>> +	clk->occr = 0xff000000;
>> +	udelay(2000);
>> +
>> +	/*
>> +	 * Release PCI RST Output signal
>> +	 */
>> +	pci_ctrl[0].gcr = 0;
>> +	udelay(2000);
>> +	pci_ctrl[0].gcr = 1;
>> +
>> +#ifdef CONFIG_MPC83XX_PCI2
>> +	pci_ctrl[1].gcr = 0;
>> +	udelay(2000);
>> +	pci_ctrl[1].gcr = 1;
>> +#endif
>> +
>> +	/* We need to wait at least a 1sec based on PCI specs */
>> +	{
>> +		int i;
>> +
>> +		for (i = 0; i < 1000; ++i)
>> +			udelay (1000);
>> +	}
>> +
>> +	/*
>> +	 * Configure PCI Local Access Windows
>> +	 */
>> +	pci_law[0].bar = CFG_PCI1_MEM_PHYS & LAWBAR_BAR;
>> +	pci_law[0].ar = LAWAR_EN | LAWAR_SIZE_1G;
>> +
>> +	pci_law[1].bar = CFG_PCI1_IO_PHYS & LAWBAR_BAR;
>> +	pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_32M;
>> +
>> +	/*
>> +	 * Configure PCI Outbound Translation Windows
>> +	 */
>> +
>> +	/* PCI1 mem space - prefetch */
>> +	pci_pot[0].potar = (CFG_PCI1_MEM_BASE >> 12) & POTAR_TA_MASK;
>> +	pci_pot[0].pobar = (CFG_PCI1_MEM_PHYS >> 12) & POBAR_BA_MASK;
>> +	pci_pot[0].pocmr = POCMR_EN | POCMR_PREFETCH_EN | (POCMR_CM_256M  
>> & POCMR_CM_MASK);
>> +
>> +	/* PCI1 IO space */
>> +	pci_pot[1].potar = (CFG_PCI1_IO_BASE >> 12) & POTAR_TA_MASK;
>> +	pci_pot[1].pobar = (CFG_PCI1_IO_PHYS >> 12) & POBAR_BA_MASK;
>> +	pci_pot[1].pocmr = POCMR_EN | POCMR_IO | (POCMR_CM_1M &  
>> POCMR_CM_MASK);
>> +
>> +	/* PCI1 mmio - non-prefetch mem space */
>> +	pci_pot[2].potar = (CFG_PCI1_MMIO_BASE >> 12) & POTAR_TA_MASK;
>> +	pci_pot[2].pobar = (CFG_PCI1_MMIO_PHYS >> 12) & POBAR_BA_MASK;
>> +	pci_pot[2].pocmr = POCMR_EN | (POCMR_CM_256M & POCMR_CM_MASK);
>> +
>> +	/*
>> +	 * Configure PCI Inbound Translation Windows
>> +	 */
>> +
>> +	/* we need RAM mapped to PCI space for the devices to
>> +	 * access main memory */
>> +	pci_ctrl[0].pitar1 = 0x0;
>> +	pci_ctrl[0].pibar1 = 0x0;
>> +	pci_ctrl[0].piebar1 = 0x0;
>> +	pci_ctrl[0].piwar1 = PIWAR_EN | PIWAR_PF | PIWAR_RTT_SNOOP |  
>> PIWAR_WTT_SNOOP | (__ilog2(gd->ram_size) - 1);
>> +
>> +	hose->first_busno = 0;
>> +	hose->last_busno = 0xff;
>> +
>> +	/* PCI memory prefetch space */
>> +	pci_set_region(hose->regions + 0,
>> +		       CFG_PCI1_MEM_BASE,
>> +		       CFG_PCI1_MEM_PHYS,
>> +		       CFG_PCI1_MEM_SIZE,
>> +		       PCI_REGION_MEM|PCI_REGION_PREFETCH);
>> +
>> +	/* PCI memory space */
>> +	pci_set_region(hose->regions + 1,
>> +		       CFG_PCI1_MMIO_BASE,
>> +		       CFG_PCI1_MMIO_PHYS,
>> +		       CFG_PCI1_MMIO_SIZE,
>> +		       PCI_REGION_MEM);
>> +
>> +	/* PCI IO space */
>> +	pci_set_region(hose->regions + 2,
>> +		       CFG_PCI1_IO_BASE,
>> +		       CFG_PCI1_IO_PHYS,
>> +		       CFG_PCI1_IO_SIZE,
>> +		       PCI_REGION_IO);
>> +
>> +	/* System memory space */
>> +	pci_set_region(hose->regions + 3,
>> +		       CONFIG_PCI_SYS_MEM_BUS,
>> +                       CONFIG_PCI_SYS_MEM_PHYS,
>> +                       gd->ram_size,
>> +                       PCI_REGION_MEM | PCI_REGION_MEMORY);
>> +
>> +	hose->region_count = 4;
>> +
>> +	pci_setup_indirect(hose,
>> +			   (CFG_IMMRBAR+0x8300),
>> +			   (CFG_IMMRBAR+0x8304));
>> +
>> +	pci_register_hose(hose);
>> +
>> +	/*
>> +	 * Write to Command register
>> +	 */
>> +	reg16 = 0xff;
>> +	dev = PCI_BDF(hose->first_busno, 0, 0);
>> +	pci_hose_read_config_word (hose, dev, PCI_COMMAND, &reg16);
>> +	reg16 |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER |  
>> PCI_COMMAND_MEMORY;
>> +	pci_hose_write_config_word(hose, dev, PCI_COMMAND, reg16);
>> +
>> +	/*
>> +	 * Clear non-reserved bits in status register.
>> +	 */
>> +	pci_hose_write_config_word(hose, dev, PCI_STATUS, 0xffff);
>> +	pci_hose_write_config_byte(hose, dev, PCI_LATENCY_TIMER, 0x80);
>> +	pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE, 0x08);
>> +
>> +#ifdef CONFIG_PCI_SCAN_SHOW
>> +	printf("PCI:   Bus Dev VenId DevId Class Int\n");
>> +#endif
>> +	/*
>> +	 * Hose scan.
>> +	 */
>> +	hose->last_busno = pci_hose_scan(hose);
>> +
>> +#ifdef CONFIG_MPC83XX_PCI2
>> +	hose = &pci_hose[1];
>> +
>> +	/*
>> +	 * Configure PCI Outbound Translation Windows
>> +	 */
>> +
>> +	/* PCI2 mem space - prefetch */
>> +	pci_pot[3].potar = (CFG_PCI2_MEM_BASE >> 12) & POTAR_TA_MASK;
>> +	pci_pot[3].pobar = (CFG_PCI2_MEM_PHYS >> 12) & POBAR_BA_MASK;
>> +	pci_pot[3].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_PREFETCH_EN |  
>> (POCMR_CM_256M & POCMR_CM_MASK);
>> +
>> +	/* PCI2 IO space */
>> +	pci_pot[4].potar = (CFG_PCI2_IO_BASE >> 12) & POTAR_TA_MASK;
>> +	pci_pot[4].pobar = (CFG_PCI2_IO_PHYS >> 12) & POBAR_BA_MASK;
>> +	pci_pot[4].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_IO |  
>> (POCMR_CM_1M & POCMR_CM_MASK);
>> +
>> +	/* PCI2 mmio - non-prefetch mem space */
>> +	pci_pot[5].potar = (CFG_PCI2_MMIO_BASE >> 12) & POTAR_TA_MASK;
>> +	pci_pot[5].pobar = (CFG_PCI2_MMIO_PHYS >> 12) & POBAR_BA_MASK;
>> +	pci_pot[5].pocmr = POCMR_EN | POCMR_PCI2 | (POCMR_CM_256M &  
>> POCMR_CM_MASK);
>> +
>> +	/*
>> +	 * Configure PCI Inbound Translation Windows
>> +	 */
>> +
>> +	/* we need RAM mapped to PCI space for the devices to
>> +	 * access main memory */
>> +	pci_ctrl[1].pitar1 = 0x0;
>> +	pci_ctrl[1].pibar1 = 0x0;
>> +	pci_ctrl[1].piebar1 = 0x0;
>> +	pci_ctrl[1].piwar1 = PIWAR_EN | PIWAR_PF | PIWAR_RTT_SNOOP |  
>> PIWAR_WTT_SNOOP | (__ilog2(gd->ram_size) - 1);
>> +
>> +	hose->first_busno = pci_hose[0].last_busno + 1;
>> +	hose->last_busno = 0xff;
>> +
>> +	/* PCI memory prefetch space */
>> +	pci_set_region(hose->regions + 0,
>> +		       CFG_PCI2_MEM_BASE,
>> +		       CFG_PCI2_MEM_PHYS,
>> +		       CFG_PCI2_MEM_SIZE,
>> +		       PCI_REGION_MEM|PCI_REGION_PREFETCH);
>> +
>> +	/* PCI memory space */
>> +	pci_set_region(hose->regions + 1,
>> +		       CFG_PCI2_MMIO_BASE,
>> +		       CFG_PCI2_MMIO_PHYS,
>> +		       CFG_PCI2_MMIO_SIZE,
>> +		       PCI_REGION_MEM);
>> +
>> +	/* PCI IO space */
>> +	pci_set_region(hose->regions + 2,
>> +		       CFG_PCI2_IO_BASE,
>> +		       CFG_PCI2_IO_PHYS,
>> +		       CFG_PCI2_IO_SIZE,
>> +		       PCI_REGION_IO);
>> +
>> +	/* System memory space */
>> +	pci_set_region(hose->regions + 3,
>> +		       CONFIG_PCI_SYS_MEM_BUS,
>> +                       CONFIG_PCI_SYS_MEM_PHYS,
>> +                       gd->ram_size,
>> +                       PCI_REGION_MEM | PCI_REGION_MEMORY);
>> +
>> +	hose->region_count = 4;
>> +
>> +	pci_setup_indirect(hose,
>> +			   (CFG_IMMRBAR+0x8380),
>> +			   (CFG_IMMRBAR+0x8384));
>> +
>> +	pci_register_hose(hose);
>> +
>> +	/*
>> +	 * Write to Command register
>> +	 */
>> +	reg16 = 0xff;
>> +	dev = PCI_BDF(hose->first_busno, 0, 0);
>> +	pci_hose_read_config_word (hose, dev, PCI_COMMAND, &reg16);
>> +	reg16 |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER |  
>> PCI_COMMAND_MEMORY;
>> +	pci_hose_write_config_word(hose, dev, PCI_COMMAND, reg16);
>> +
>> +	/*
>> +	 * Clear non-reserved bits in status register.
>> +	 */
>> +	pci_hose_write_config_word(hose, dev, PCI_STATUS, 0xffff);
>> +	pci_hose_write_config_byte(hose, dev, PCI_LATENCY_TIMER, 0x80);
>> +	pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE, 0x08);
>> +
>> +	/*
>> +	 * Hose scan.
>> +	 */
>> +	hose->last_busno = pci_hose_scan(hose);
>> +#endif
>> +
>> +}
>> +#endif /* CONFIG_PCI */
>> diff --git a/include/asm-ppc/mpc8349_pci.h b/include/asm-ppc/ 
>> mpc8349_pci.h
>> index 48255a3..7a1adba 100644
>> --- a/include/asm-ppc/mpc8349_pci.h
>> +++ b/include/asm-ppc/mpc8349_pci.h
>> @@ -77,6 +77,7 @@
>>  #define POCMR_ENABLE        0x80000000
>>  #define POCMR_PCI_IO        0x40000000
>>  #define POCMR_PREFETCH_EN   0x20000000
>> +#define POCMR_PCI2          0x10000000
>>
>>  /* Soft PCI reset */
>>
>> diff --git a/include/configs/MPC8349ADS.h b/include/configs/ 
>> MPC8349ADS.h
>> index d6d2fab..5677fa1 100644
>> --- a/include/configs/MPC8349ADS.h
>> +++ b/include/configs/MPC8349ADS.h
>> @@ -41,9 +41,8 @@
>>  #define CONFIG_MPC8349		1	/* MPC8349 specific */
>>  #define CONFIG_MPC8349ADS	1	/* MPC8349ADS board specific */
>>
>> -/* FIXME: Real PCI support will come in a follow-up update. */
>> -#undef CONFIG_PCI
>> -
>> +#define CONFIG_PCI
>> +#undef  CONFIG_MPC83XX_PCI2		/* support for 2nd PCI controller */
>>  #define CONFIG_TSEC_ENET 		/* tsec ethernet support */
>>  #define CONFIG_ENV_OVERWRITE
>>
>> @@ -324,19 +323,26 @@
>>   * General PCI
>>   * Addresses are mapped 1-1.
>>   */
>> +
>>  #define CFG_PCI1_MEM_BASE	0x80000000
>>  #define CFG_PCI1_MEM_PHYS	CFG_PCI1_MEM_BASE
>> -#define CFG_PCI1_MEM_SIZE	0x20000000	/* 512M */
>> +#define CFG_PCI1_MEM_SIZE	0x10000000	/* 256M */
>> +#define CFG_PCI1_MMIO_BASE	0x90000000
>> +#define CFG_PCI1_MMIO_PHYS	CFG_PCI1_MMIO_BASE
>> +#define CFG_PCI1_MMIO_SIZE	0x10000000	/* 256M */
>>  #define CFG_PCI1_IO_BASE	0x00000000
>>  #define CFG_PCI1_IO_PHYS	0xe2000000
>> -#define CFG_PCI1_IO_SIZE	0x1000000	/* 16M */
>> +#define CFG_PCI1_IO_SIZE	0x00100000	/* 1M */
>>
>> -#define CFG_PCI2_MEM_BASE	0xA0000000
>> +#define CFG_PCI2_MEM_BASE	0xa0000000
>>  #define CFG_PCI2_MEM_PHYS	CFG_PCI2_MEM_BASE
>> -#define CFG_PCI2_MEM_SIZE	0x20000000	/* 512M */
>> +#define CFG_PCI2_MEM_SIZE	0x10000000	/* 256M */
>> +#define CFG_PCI2_MMIO_BASE	0xb0000000
>> +#define CFG_PCI2_MMIO_PHYS	CFG_PCI2_MMIO_BASE
>> +#define CFG_PCI2_MMIO_SIZE	0x10000000	/* 256M */
>>  #define CFG_PCI2_IO_BASE	0x00000000
>> -#define CFG_PCI2_IO_PHYS	0xe3000000
>> -#define CFG_PCI2_IO_SIZE	0x1000000	/* 16M */
>> +#define CFG_PCI2_IO_PHYS	0xe2100000
>> +#define CFG_PCI2_IO_SIZE	0x00100000	/* 1M */
>>  #if defined(CONFIG_PCI)
>>
>>  #define PCI_ALL_PCI1
>>
>>
>>
>> -------------------------------------------------------
>> This SF.net email is sponsored by: Splunk Inc. Do you grep through  
>> log files
>> for problems?  Stop!  Download the new AJAX search engine that makes
>> searching your log files as easy as surfing the  web.  DOWNLOAD  
>> SPLUNK!
>> http://sel.as-us.falkag.net/sel? 
>> cmd=lnk&kid=103432&bid=230486&dat=121642
>
>
>
> -------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc. Do you grep through  
> log files
> for problems?  Stop!  Download the new AJAX search engine that makes
> searching your log files as easy as surfing the  web.  DOWNLOAD  
> SPLUNK!
> http://sel.as-us.falkag.net/sel? 
> cmd=lnk&kid=103432&bid=230486&dat=121642
> _______________________________________________
> U-Boot-Users mailing list
> U-Boot-Users at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/u-boot-users

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot-Users] Re: [git patch] MPC8349ADS
  2006-01-23 23:46 [U-Boot-Users] [git patch] MPC8349ADS Kumar Gala
  2006-01-25 19:05 ` [U-Boot-Users] " David Updegraff
@ 2006-03-12 21:03 ` Wolfgang Denk
  1 sibling, 0 replies; 4+ messages in thread
From: Wolfgang Denk @ 2006-03-12 21:03 UTC (permalink / raw)
  To: u-boot

In message <Pine.LNX.4.44.0601231745430.21555-100000@gate.crashing.org> you wrote:
> Please pull from 'mpc8349ads' branch of
> git.kernel.org:/pub/scm/boot/u-boot/u-boot.git

Done. Thanks.

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Always borrow money from a pessimist; they don't expect  to  be  paid
back.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2006-03-12 21:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-23 23:46 [U-Boot-Users] [git patch] MPC8349ADS Kumar Gala
2006-01-25 19:05 ` [U-Boot-Users] " David Updegraff
2006-01-25 21:34   ` Kumar Gala
2006-03-12 21:03 ` Wolfgang Denk

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.