* [U-Boot] [PATCH 0/3] Support for XPedite5370 and misc GPIO @ 2008-10-23 22:23 Peter Tyser 2008-10-23 22:23 ` [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices Peter Tyser 2008-11-18 21:29 ` [U-Boot] [PATCH 0/3] Support for XPedite5370 and misc GPIO Wolfgang Denk 0 siblings, 2 replies; 20+ messages in thread From: Peter Tyser @ 2008-10-23 22:23 UTC (permalink / raw) To: u-boot Hello, This patch series adds support for the XPedite5370 SBC. Its an MPC8572-based VPX card with a PMC/XMC site. The XPedite5370 includes a significant number of I2C GPIO devices (5) which are used for board configuration. I added support for 2 new I2C gpio devices in a new drivers/gpio directory. I'm not sure if this is the preferred location/method, so let me know if others have have different preferences. It'd be nice to have a more generic GPIO framework (like Linux's) at some point, but figured this was a step in the right direction by providing a place for generic GPIO devices in drivers/gpio. Thanks, Peter Peter Tyser (3): pca953x: Add support for PCA953x I2C gpio devices ds4510: Add support for Maxim's DS4510 I2C device XPedite5370 board support MAINTAINERS | 3 + MAKEALL | 1 + Makefile | 5 + README | 9 + board/xes/common/Makefile | 56 ++++ board/xes/common/fsl_8572_clk.c | 51 +++ board/xes/common/fsl_85xx_ddr.c | 93 ++++++ board/xes/common/fsl_85xx_pci.c | 287 +++++++++++++++++ board/xes/xpedite5370/Makefile | 45 +++ board/xes/xpedite5370/config.mk | 35 ++ board/xes/xpedite5370/ddr.c | 270 ++++++++++++++++ board/xes/xpedite5370/law.c | 54 ++++ board/xes/xpedite5370/tlb.c | 91 ++++++ board/xes/xpedite5370/u-boot.lds | 145 +++++++++ board/xes/xpedite5370/xpedite5370.c | 125 ++++++++ drivers/gpio/Makefile | 48 +++ drivers/gpio/ds4510.c | 344 ++++++++++++++++++++ drivers/gpio/pca953x.c | 186 +++++++++++ include/configs/XPEDITE5370.h | 590 +++++++++++++++++++++++++++++++++++ include/gpio/ds4510.h | 75 +++++ include/gpio/pca953x.h | 39 +++ 21 files changed, 2552 insertions(+), 0 deletions(-) create mode 100644 board/xes/common/Makefile create mode 100644 board/xes/common/fsl_8572_clk.c create mode 100644 board/xes/common/fsl_85xx_ddr.c create mode 100644 board/xes/common/fsl_85xx_pci.c create mode 100644 board/xes/xpedite5370/Makefile create mode 100644 board/xes/xpedite5370/config.mk create mode 100644 board/xes/xpedite5370/ddr.c create mode 100644 board/xes/xpedite5370/law.c create mode 100644 board/xes/xpedite5370/tlb.c create mode 100644 board/xes/xpedite5370/u-boot.lds create mode 100644 board/xes/xpedite5370/xpedite5370.c create mode 100644 drivers/gpio/Makefile create mode 100644 drivers/gpio/ds4510.c create mode 100644 drivers/gpio/pca953x.c create mode 100644 include/configs/XPEDITE5370.h create mode 100644 include/gpio/ds4510.h create mode 100644 include/gpio/pca953x.h ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices 2008-10-23 22:23 [U-Boot] [PATCH 0/3] Support for XPedite5370 and misc GPIO Peter Tyser @ 2008-10-23 22:23 ` Peter Tyser 2008-10-23 22:23 ` [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device Peter Tyser 2008-11-18 21:33 ` [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices Wolfgang Denk 2008-11-18 21:29 ` [U-Boot] [PATCH 0/3] Support for XPedite5370 and misc GPIO Wolfgang Denk 1 sibling, 2 replies; 20+ messages in thread From: Peter Tyser @ 2008-10-23 22:23 UTC (permalink / raw) To: u-boot Initial support for NXP's 4 and 8 bit I2C gpio expanders (eg pca9537, pca9557, etc). The CONFIG_PCA953X define enables support for the devices while the CONFIG_CMD_PCA953X define enables the pca953x command. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> --- Makefile | 2 + README | 7 ++ drivers/gpio/Makefile | 47 ++++++++++++ drivers/gpio/pca953x.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++ include/gpio/pca953x.h | 39 ++++++++++ 5 files changed, 281 insertions(+), 0 deletions(-) create mode 100644 drivers/gpio/Makefile create mode 100644 drivers/gpio/pca953x.c create mode 100644 include/gpio/pca953x.h diff --git a/Makefile b/Makefile index fceb8a2..40c08a7 100644 --- a/Makefile +++ b/Makefile @@ -221,6 +221,7 @@ LIBS += disk/libdisk.a LIBS += drivers/bios_emulator/libatibiosemu.a LIBS += drivers/block/libblock.a LIBS += drivers/dma/libdma.a +LIBS += drivers/gpio/libgpio.a LIBS += drivers/hwmon/libhwmon.a LIBS += drivers/i2c/libi2c.a LIBS += drivers/input/libinput.a @@ -396,6 +397,7 @@ TAG_SUBDIRS += disk TAG_SUBDIRS += common TAG_SUBDIRS += drivers/bios_emulator TAG_SUBDIRS += drivers/block +TAG_SUBDIRS += drivers/gpio TAG_SUBDIRS += drivers/hwmon TAG_SUBDIRS += drivers/i2c TAG_SUBDIRS += drivers/input diff --git a/README b/README index ebee20f..73bed41 100644 --- a/README +++ b/README @@ -601,6 +601,7 @@ The following options need to be configured: CONFIG_CMD_MII * MII utility commands CONFIG_CMD_NAND * NAND support CONFIG_CMD_NET bootp, tftpboot, rarpboot + CONFIG_CMD_PCA953X * PCA953x I2C gpio commands CONFIG_CMD_PCI * pciinfo CONFIG_CMD_PCMCIA * PCMCIA support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network @@ -678,6 +679,12 @@ The following options need to be configured: Note that if the RTC uses I2C, then the I2C interface must also be configured. See I2C Support, below. +- GPIO Support: + CONFIG_PCA953X - use NXP's PCA953X series I2C GPIO + + Note that if the GPIO device uses I2C, then the I2C interface + must also be configured. See I2C Support, below. + - Timestamp Support: When CONFIG_TIMESTAMP is selected, the timestamp diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile new file mode 100644 index 0000000..dd618ed --- /dev/null +++ b/drivers/gpio/Makefile @@ -0,0 +1,47 @@ +# +# Copyright 2000-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# 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 $(TOPDIR)/config.mk + +LIB := $(obj)libgpio.a + +COBJS-$(CONFIG_PCA953X) += pca953x.o + +COBJS := $(COBJS-y) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +all: $(LIB) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################## diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c new file mode 100644 index 0000000..317241a --- /dev/null +++ b/drivers/gpio/pca953x.c @@ -0,0 +1,186 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * Version 2 as published by the Free Software Foundation. + * + * 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 + */ + +/* + * Driver for NXP's 4 and 8 bit I2C gpio expanders (eg pca9537, pca9557, etc) + * TODO: support additional devices with more than 8-bits GPIO + */ + +#include <common.h> +#include <i2c.h> +#include <gpio/pca953x.h> + +/* + * Modify masked bits in register + */ +static int pca953x_reg_write(uint8_t chip, uint addr, uint mask, uint data) +{ + uint8_t val; + + if (i2c_read(chip, addr, 1, &val, 1)) + return -1; + + val &= ~mask; + val |= data; + + return i2c_write(chip, addr, 1, &val, 1); +} + +/* + * Set output value of IO pins in 'mask' to corresponding value in 'data' + * 0 = low, 1 = high + */ +int pca953x_set_val(uint8_t chip, uint mask, uint data) +{ + return pca953x_reg_write(chip, PCA953X_OUT, mask, data); +} + +/* + * Set read polarity of IO pins in 'mask' to corresponding value in 'data' + * 0 = read pin value, 1 = read inverted pin value + */ +int pca953x_set_pol(uint8_t chip, uint mask, uint data) +{ + return pca953x_reg_write(chip, PCA953X_POL, mask, data); +} + +/* + * Set direction of IO pins in 'mask' to corresponding value in 'data' + * 0 = output, 1 = input + */ +int pca953x_set_dir(uint8_t chip, uint mask, uint data) +{ + return pca953x_reg_write(chip, PCA953X_CONF, mask, data); +} + +/* + * Read current logic level of all IO pins + */ +int pca953x_get_val(uint8_t chip) +{ + uint8_t val; + + if (i2c_read(chip, 0, 1, &val, 1)) + return -1; + + return (int)val; +} + +#ifdef CONFIG_CMD_PCA953X +/* + * Display pca953x information + */ +static int pca953x_info(uint8_t chip) +{ + int i; + uint8_t data; + + printf("pca953x@ 0x%x:\n\n", chip); + printf("gpio pins: 76543210\n"); + printf("-------------------\n"); + + i2c_read(chip, PCA953X_CONF, 1, &data, 1); + printf("conf: "); + for (i = 7; i >= 0; i--) + printf("%c", data & (1 << i) ? 'i' : 'o'); + printf("\n"); + + i2c_read(chip, PCA953X_POL, 1, &data, 1); + printf("invert: "); + for (i = 7; i >= 0; i--) + printf("%c", data & (1 << i) ? '1' : '0'); + printf("\n"); + + i2c_read(chip, PCA953X_IN, 1, &data, 1); + printf("input: "); + for (i = 7; i >= 0; i--) + printf("%c", data & (1 << i) ? '1' : '0'); + printf("\n"); + + i2c_read(chip, PCA953X_OUT, 1, &data, 1); + printf("output: "); + for (i = 7; i >= 0; i--) + printf("%c", data & (1 << i) ? '1' : '0'); + printf("\n"); + + return 0; +} + +int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + int val; + uint8_t chip; + ulong pin; + + chip = (uint8_t)simple_strtoul(argv[1], NULL, 16); + + if (i2c_probe(chip)) { + printf("I2C device 0x%02x not found\n", chip); + return -1; + } + + switch (argc) { + case 3: + if (strcmp(argv[2], "info") == 0) + return pca953x_info(chip); + break; + case 4: + if (strcmp(argv[2], "input") != 0) + break; + + pin = simple_strtoul(argv[3], NULL, 16); + + pca953x_set_dir(chip, (1 << pin), PCA953X_DIR_IN << pin); + val = (pca953x_get_val(chip) & (1 << pin)) != 0; + + printf("chip 0x%02x, pin 0x%lx = %d\n", chip, pin, val); + return val; + case 5: + pin = simple_strtoul(argv[3], NULL, 16); + val = simple_strtoul(argv[4], NULL, 16) & 0x1; + + if (strcmp(argv[2], "output") == 0) { + pca953x_set_dir(chip, (1 << pin), + (PCA953X_DIR_OUT << pin)); + return pca953x_set_val(chip, (1 << pin), (val << pin)); + } else if (strcmp(argv[2], "invert") == 0) { + return pca953x_set_pol(chip, (1 << pin), (val << pin)); + } + break; + default: + break; + } + + printf("Usage:\n%s\n", cmdtp->usage); + return 1; +} + +U_BOOT_CMD( + pca953x, 6, 2, do_pca953x, + "pca953x - pca953x gpio access\n", + "chip info\n" + " - display info for chip\n" + "pca953x chip output pin 0|1\n" + " - set pin as output and drive low or high\n" + "pca953x chip invert pin 0|1\n" + " - disable/enable polarity inversion for reads\n" + "pca953x chip intput pin\n" + " - set pin as input and read value\n" +); + +#endif /* CONFIG_CMD_PCA953X */ diff --git a/include/gpio/pca953x.h b/include/gpio/pca953x.h new file mode 100644 index 0000000..6c2b58c --- /dev/null +++ b/include/gpio/pca953x.h @@ -0,0 +1,39 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * Version 2 as published by the Free Software Foundation. + * + * 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 + */ + +#ifndef __PCA953X_H_ +#define __PCA953X_H_ + +#define PCA953X_IN 0x00 +#define PCA953X_OUT 0x01 +#define PCA953X_POL 0x02 +#define PCA953X_CONF 0x03 + +#define PCA953X_OUT_LOW 0 +#define PCA953X_OUT_HIGH 1 +#define PCA953X_POL_NORMAL 0 +#define PCA953X_POL_INVERT 1 +#define PCA953X_DIR_OUT 0 +#define PCA953X_DIR_IN 1 + +int pca953x_set_val(u8 chip, uint mask, uint data); +int pca953x_set_pol(u8 chip, uint mask, uint data); +int pca953x_set_dir(u8 chip, uint mask, uint data); +int pca953x_get_val(u8 chip); + +#endif /* __PCA953X_H_ */ -- 1.6.0.2.GIT ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device 2008-10-23 22:23 ` [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices Peter Tyser @ 2008-10-23 22:23 ` Peter Tyser 2008-10-23 22:23 ` [U-Boot] [PATCH 3/3] XPedite5370 board support Peter Tyser 2008-11-18 21:37 ` [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device Wolfgang Denk 2008-11-18 21:33 ` [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices Wolfgang Denk 1 sibling, 2 replies; 20+ messages in thread From: Peter Tyser @ 2008-10-23 22:23 UTC (permalink / raw) To: u-boot Initial support for the DS4510, a CPU supervisor with integrated EEPROM, SRAM, and 4 programmable non-volatile GPIO pins. The CONFIG_DS4510 define enables support for the device while the CONFIG_CMD_DS4510 define enables the ds4510 command. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> --- README | 2 + drivers/gpio/Makefile | 1 + drivers/gpio/ds4510.c | 344 +++++++++++++++++++++++++++++++++++++++++++++++++ include/gpio/ds4510.h | 75 +++++++++++ 4 files changed, 422 insertions(+), 0 deletions(-) create mode 100644 drivers/gpio/ds4510.c create mode 100644 include/gpio/ds4510.h diff --git a/README b/README index 73bed41..2c0a19f 100644 --- a/README +++ b/README @@ -572,6 +572,7 @@ The following options need to be configured: CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics CONFIG_CMD_DOC * Disk-On-Chip Support + CONFIG_CMD_DS4510 * ds4510 I2C gpio/memory commands CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EEPROM * EEPROM read/write support @@ -681,6 +682,7 @@ The following options need to be configured: - GPIO Support: CONFIG_PCA953X - use NXP's PCA953X series I2C GPIO + CONFIG_DS4510 - use Maxim's DS4510 I2C GPIO/eeprom Note that if the GPIO device uses I2C, then the I2C interface must also be configured. See I2C Support, below. diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index dd618ed..11f0903 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -26,6 +26,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libgpio.a COBJS-$(CONFIG_PCA953X) += pca953x.o +COBJS-$(CONFIG_DS4510) += ds4510.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/gpio/ds4510.c b/drivers/gpio/ds4510.c new file mode 100644 index 0000000..8b9a836 --- /dev/null +++ b/drivers/gpio/ds4510.c @@ -0,0 +1,344 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * Version 2 as published by the Free Software Foundation. + * + * 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 + */ + +/* + * Driver for DS4510, a CPU supervisor with integrated EEPROM, SRAM, + * and 4 programmable non-volatile GPIO pins. + */ + +#include <common.h> +#include <i2c.h> +#include <command.h> +#include <gpio/ds4510.h> + +/* + * Write to DS4510, taking page boundaries into account + */ +int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count) +{ + int wrlen; + int i = 0; + + do { + wrlen = DS4510_EEPROM_PAGE_SIZE - + DS4510_EEPROM_PAGE_OFFSET(offset); + if (count < wrlen) + wrlen = count; + i2c_write(chip, offset, 1, &buf[i], wrlen); + + /* This delay isn't needed for SRAM writes but shouldn't delay + * things too much, so do it unconditionally for simplicity */ + udelay(DS4510_EEPROM_PAGE_WRITE_DELAY_MS * 1000); + count -= wrlen; + offset += wrlen; + i += wrlen; + } while (count > 0); + + return 0; +} + +/* + * General read from DS4510 + */ +int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count) +{ + return i2c_read(chip, offset, 1, buf, count); +} + +/* + * Write SEE bit in config register. + * nv = 0 - Writes to SEEPROM registers behave like EEPROM + * nv = 1 - Writes to SEEPROM registers behave like SRAM + */ +int ds4510_see_write(uint8_t chip, uint8_t nv) +{ + uint8_t data; + + if (i2c_read(chip, DS4510_CFG, 1, &data, 1)) + return -1; + + if (nv) /* Treat SEEPROM bits as EEPROM */ + data &= ~DS4510_CFG_SEE; + else /* Treat SEEPROM bits as SRAM */ + data |= DS4510_CFG_SEE; + + return ds4510_mem_write(chip, DS4510_CFG, &data, 1); +} + +/* + * Write de-assertion of reset signal delay + */ +int ds4510_rstdelay_write(uint8_t chip, uint8_t delay) +{ + uint8_t data; + + if (i2c_read(chip, DS4510_RSTDELAY, 1, &data, 1)) + return -1; + + data &= ~DS4510_RSTDELAY_MASK; + data |= delay & DS4510_RSTDELAY_MASK; + + return ds4510_mem_write(chip, DS4510_RSTDELAY, &data, 1); +} + +/* + * Write pullup characteristics of IO pins + */ +int ds4510_pullup_write(uint8_t chip, uint8_t val) +{ + val &= DS4510_IO_MASK; + + return ds4510_mem_write(chip, DS4510_PULLUP, (uint8_t *)&val, 1); +} + +/* + * Read pullup characteristics of IO pins + */ +int ds4510_pullup_read(uint8_t chip) +{ + uint8_t val; + + if (i2c_read(chip, DS4510_PULLUP, 1, &val, 1)) + return -1; + + return val & DS4510_IO_MASK; +} + +/* + * Write drive level of IO pins + */ +int ds4510_gpio_write(uint8_t chip, uint8_t val) +{ + uint8_t data; + int i; + + for (i = 0; i < DS4510_NUM_IO; i++) { + i2c_read(chip, DS4510_IO0 - i, 1, &data, 1); + + if (val & (0x1 << i)) + data |= 0x1; + else + data &= ~0x1; + + ds4510_mem_write(chip, DS4510_IO0 - i, &data, 1); + } + + return 0; +} + +/* + * Read drive level of IO pins + */ +int ds4510_gpio_read(uint8_t chip) +{ + uint8_t data; + int val = 0; + int i; + + for (i = 0; i < DS4510_NUM_IO; i++) { + i2c_read(chip, DS4510_IO0 - i, 1, &data, 1); + + if (data & 1) + val |= (1 << i); + } + + return val; +} + +/* + * Read physical level of IO pins + */ +int ds4510_gpio_read_val(uint8_t chip) +{ + uint8_t val; + + if (i2c_read(chip, DS4510_IO_STATUS, 1, &val, 1)) + return -1; + + return val & DS4510_IO_MASK; +} + +#if defined(CONFIG_CMD_DS4510) +/* + * Display DS4510 information + */ +static int ds4510_info(uint8_t chip) +{ + int i; + int tmp; + uint8_t data; + + printf("DS4510 @ 0x%x:\n\n", chip); + + i2c_read(chip, DS4510_RSTDELAY, 1, &data, 1); + printf("rstdelay = 0x%x\n\n", data & DS4510_RSTDELAY_MASK); + + i2c_read(chip, DS4510_CFG, 1, &data, 1); + printf("config = 0x%x\n", data); + printf(" /ready = %d\n", data & DS4510_CFG_READY ? 1 : 0); + printf(" trip pt = %d\n", data & DS4510_CFG_TRIP_POINT ? 1 : 0); + printf(" rst sts = %d\n", data & DS4510_CFG_RESET ? 1 : 0); + printf(" /see = %d\n", data & DS4510_CFG_SEE ? 1 : 0); + printf(" swrst = %d\n\n", data & DS4510_CFG_SWRST ? 1 : 0); + + printf("gpio pins: 3210\n"); + printf("---------------\n"); + printf("pullup "); + + tmp = ds4510_pullup_read(chip); + for (i = DS4510_NUM_IO - 1; i >= 0; i--) + printf("%d", (tmp & (1 << i)) ? 1 : 0); + printf("\n"); + + printf("driven "); + tmp = ds4510_gpio_read(chip); + for (i = DS4510_NUM_IO - 1; i >= 0; i--) + printf("%d", (tmp & (1 << i)) ? 1 : 0); + printf("\n"); + + printf("read "); + tmp = ds4510_gpio_read_val(chip); + for (i = DS4510_NUM_IO - 1; i >= 0; i--) + printf("%d", (tmp & (1 << i)) ? 1 : 0); + printf("\n"); + + return 0; +} + +int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + ulong addr; + ulong pin; + ulong val; + ulong off; + ulong cnt; + int end; + uint8_t chip; + int tmp; + int (*rw_func)(uint8_t, int, uint8_t *, int); + + chip = (uint8_t)simple_strtoul(argv[1], NULL, 16); + + if (i2c_probe(chip)) { + printf("I2C device 0x%02x not found\n", chip); + return -1; + } + + switch (argc) { + case 3: + if (strcmp(argv[2], "info") == 0) + return ds4510_info(chip); + break; + case 4: + val = simple_strtoul(argv[3], NULL, 16); + + if (strcmp(argv[2], "nv") == 0) + return ds4510_see_write(chip, val); + else if (strcmp(argv[2], "rstdelay") == 0) + return ds4510_rstdelay_write(chip, val); + else if (strcmp(argv[2], "input") == 0) + return (ds4510_gpio_read_val(chip) & (1 << val)) != 0; + break; + case 5: + pin = simple_strtoul(argv[3], NULL, 16); + val = simple_strtoul(argv[4], NULL, 16); + + if (pin >= DS4510_NUM_IO) + break; + + if (strcmp(argv[2], "output") == 0) { + tmp = ds4510_gpio_read(chip); + if (val) + tmp |= (1 << pin); + else + tmp &= ~(1 << pin); + return ds4510_gpio_write(chip, tmp); + } else if (strcmp(argv[2], "pullup") == 0) { + tmp = ds4510_pullup_read(chip); + if (val) + tmp |= (1 << pin); + else + tmp &= ~(1 << pin); + return ds4510_pullup_write(chip, tmp); + } + break; + case 7: + addr = simple_strtoul(argv[4], NULL, 16); + off = simple_strtoul(argv[5], NULL, 16); + cnt = simple_strtoul(argv[6], NULL, 16); + + if (strcmp(argv[3], "read") == 0) + rw_func = ds4510_mem_read; + else if (strcmp(argv[3], "write") == 0) + rw_func = ds4510_mem_write; + else + break; + + if (strcmp(argv[2], "eeprom") == 0) { + end = DS4510_EEPROM + DS4510_EEPROM_SIZE; + off += DS4510_EEPROM; + } else if (strcmp(argv[2], "seeprom") == 0) { + end = DS4510_SEEPROM + DS4510_SEEPROM_SIZE; + off += DS4510_SEEPROM; + } else if (strcmp(argv[2], "sram") == 0) { + end = DS4510_SRAM + DS4510_SRAM_SIZE; + off += DS4510_SRAM; + } else { + break; + } + + if ((off + cnt) > end) { + printf("ERROR: invalid len\n"); + return -1; + } + + return rw_func(chip, off, (uint8_t *)addr, cnt); + default: + break; + } + + printf("Usage:\n%s\n", cmdtp->usage); + return 1; +} + +U_BOOT_CMD( + ds4510, 7, 2, do_ds4510, + "ds4510 - ds4510 eeprom/seeprom/sram/gpio access\n", + "chip info\n" + " - display ds4510 info\n" + "ds4510 chip nv 0|1\n" + " - make gpio and seeprom writes volatile/non-volatile\n" + "ds4510 chip rstdelay 0-3\n" + " - set reset output delay\n" + "ds4510 chip output pin 0|1\n" + " - set pin low or high-Z\n" + "ds4510 chip input pin\n" + " - read value of pin\n" + "ds4510 chip pullup pin 0|1\n" + " - disable/enable pullup on specified pin\n" + "ds4510 chip eeprom read addr off cnt\n" + "ds4510 chip eeprom write addr off cnt\n" + " - read/write 'cnt' bytes at EEPROM offset 'off'\n" + "ds4510 chip seeprom read addr off cnt\n" + "ds4510 chip seeprom write addr off cnt\n" + " - read/write 'cnt' bytes at SRAM-shadowed EEPROM offset 'off'\n" + "ds4510 chip sram read addr off cnt\n" + "ds4510 chip sram write addr off cnt\n" + " - read/write 'cnt' bytes at SRAM offset 'off'\n" +); +#endif /* CONFIG_CMD_DS4510 */ diff --git a/include/gpio/ds4510.h b/include/gpio/ds4510.h new file mode 100644 index 0000000..40480af --- /dev/null +++ b/include/gpio/ds4510.h @@ -0,0 +1,75 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * Version 2 as published by the Free Software Foundation. + * + * 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 + */ + +#ifndef __DS4510_H_ +#define __DS4510_H_ + +/* General defines */ +#define DS4510_NUM_IO 0x04 +#define DS4510_IO_MASK ((1 << DS4510_NUM_IO) - 1) +#define DS4510_EEPROM_PAGE_WRITE_DELAY_MS 20 + +/* EEPROM from 0x00 - 0x39 */ +#define DS4510_EEPROM 0x00 +#define DS4510_EEPROM_SIZE 0x40 +#define DS4510_EEPROM_PAGE_SIZE 0x08 +#define DS4510_EEPROM_PAGE_OFFSET(x) ((x) & (DS4510_EEPROM_PAGE_SIZE - 1)) + +/* SEEPROM from 0xf0 - 0xf7 */ +#define DS4510_SEEPROM 0xf0 +#define DS4510_SEEPROM_SIZE 0x08 + +/* Registers overlapping SEEPROM from 0xf0 - 0xf7 */ +#define DS4510_PULLUP 0xF0 +#define DS4510_PULLUP_DIS 0x00 +#define DS4510_PULLUP_EN 0x01 +#define DS4510_RSTDELAY 0xF1 +#define DS4510_RSTDELAY_MASK 0x03 +#define DS4510_RSTDELAY_125 0x00 +#define DS4510_RSTDELAY_250 0x01 +#define DS4510_RSTDELAY_500 0x02 +#define DS4510_RSTDELAY_1000 0x03 +#define DS4510_IO3 0xF4 +#define DS4510_IO2 0xF5 +#define DS4510_IO1 0xF6 +#define DS4510_IO0 0xF7 + +/* Status configuration registers from 0xf8 - 0xf9*/ +#define DS4510_IO_STATUS 0xF8 +#define DS4510_CFG 0xF9 +#define DS4510_CFG_READY 0x80 +#define DS4510_CFG_TRIP_POINT 0x40 +#define DS4510_CFG_RESET 0x20 +#define DS4510_CFG_SEE 0x10 +#define DS4510_CFG_SWRST 0x08 + +/* SRAM from 0xfa - 0xff */ +#define DS4510_SRAM 0xfa +#define DS4510_SRAM_SIZE 0x06 + +int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count); +int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count); +int ds4510_see_write(uint8_t chip, uint8_t nv); +int ds4510_rstdelay_write(uint8_t chip, uint8_t delay); +int ds4510_pullup_write(uint8_t chip, uint8_t val); +int ds4510_pullup_read(uint8_t chip); +int ds4510_gpio_write(uint8_t chip, uint8_t val); +int ds4510_gpio_read(uint8_t chip); +int ds4510_gpio_read_val(uint8_t chip); + +#endif /* __DS4510_H_ */ -- 1.6.0.2.GIT ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 3/3] XPedite5370 board support 2008-10-23 22:23 ` [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device Peter Tyser @ 2008-10-23 22:23 ` Peter Tyser 2008-10-24 23:21 ` Andy Fleming 2008-11-18 21:44 ` Wolfgang Denk 2008-11-18 21:37 ` [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device Wolfgang Denk 1 sibling, 2 replies; 20+ messages in thread From: Peter Tyser @ 2008-10-23 22:23 UTC (permalink / raw) To: u-boot Initial support for Extreme Engineering Solutions XPedite5370 - a MPC8572-based 3U VPX single board computer with a PMC/XMC site. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> --- MAINTAINERS | 3 + MAKEALL | 1 + Makefile | 3 + board/xes/common/Makefile | 56 ++++ board/xes/common/fsl_8572_clk.c | 51 +++ board/xes/common/fsl_85xx_ddr.c | 93 ++++++ board/xes/common/fsl_85xx_pci.c | 287 +++++++++++++++++ board/xes/xpedite5370/Makefile | 45 +++ board/xes/xpedite5370/config.mk | 35 ++ board/xes/xpedite5370/ddr.c | 270 ++++++++++++++++ board/xes/xpedite5370/law.c | 54 ++++ board/xes/xpedite5370/tlb.c | 91 ++++++ board/xes/xpedite5370/u-boot.lds | 145 +++++++++ board/xes/xpedite5370/xpedite5370.c | 125 ++++++++ include/configs/XPEDITE5370.h | 590 +++++++++++++++++++++++++++++++++++ 15 files changed, 1849 insertions(+), 0 deletions(-) create mode 100644 board/xes/common/Makefile create mode 100644 board/xes/common/fsl_8572_clk.c create mode 100644 board/xes/common/fsl_85xx_ddr.c create mode 100644 board/xes/common/fsl_85xx_pci.c create mode 100644 board/xes/xpedite5370/Makefile create mode 100644 board/xes/xpedite5370/config.mk create mode 100644 board/xes/xpedite5370/ddr.c create mode 100644 board/xes/xpedite5370/law.c create mode 100644 board/xes/xpedite5370/tlb.c create mode 100644 board/xes/xpedite5370/u-boot.lds create mode 100644 board/xes/xpedite5370/xpedite5370.c create mode 100644 include/configs/XPEDITE5370.h diff --git a/MAINTAINERS b/MAINTAINERS index 60cb6a6..bd6cb57 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -406,6 +406,9 @@ Rune Torgersen <runet@innovsys.com> MPC8266ADS MPC8266 +Peter Tyser <ptyser@xes-inc.com> + + XPEDITE5370 MPC8572 David Updegraff <dave@cray.com> diff --git a/MAKEALL b/MAKEALL index aa602b7..5044347 100755 --- a/MAKEALL +++ b/MAKEALL @@ -375,6 +375,7 @@ LIST_85xx=" \ TQM8548 \ TQM8555 \ TQM8560 \ + XPEDITE5370 \ " ######################################################################### diff --git a/Makefile b/Makefile index 40c08a7..066552c 100644 --- a/Makefile +++ b/Makefile @@ -2397,6 +2397,9 @@ TQM8560_config: unconfig echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h; @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx tqc +XPEDITE5370_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc mpc85xx xpedite5370 xes + ######################################################################### ## MPC86xx Systems ######################################################################### diff --git a/board/xes/common/Makefile b/board/xes/common/Makefile new file mode 100644 index 0000000..c5cd633 --- /dev/null +++ b/board/xes/common/Makefile @@ -0,0 +1,56 @@ +# +# (C) Copyright 2006 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# 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 $(TOPDIR)/config.mk + +ifneq ($(OBJTREE),$(SRCTREE)) +$(shell mkdir -p $(obj)board/$(VENDOR)/common) +endif + +LIB = $(obj)lib$(VENDOR).a + +COBJS-$(CONFIG_MPC8572) += fsl_8572_clk.o +COBJS-$(CONFIG_MPC85xx) += fsl_85xx_ddr.o +COBJS-$(CONFIG_FSL_PCI_INIT) += fsl_85xx_pci.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/xes/common/fsl_8572_clk.c b/board/xes/common/fsl_8572_clk.c new file mode 100644 index 0000000..f5df2da --- /dev/null +++ b/board/xes/common/fsl_8572_clk.c @@ -0,0 +1,51 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * + * 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> + +/* + * Return SYSCLK input frequency - 50 MHz or 66 MHz depending on POR config + */ +unsigned long get_board_sys_clk(ulong dummy) +{ + volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + u32 gpporcr = gur->gpporcr; + + if (gpporcr & 0x10000) + return 66666666; + else + return 50000000; +} + +/* + * Return DDR input clock - synchronous with SYSCLK or 66 MHz + */ +unsigned long get_board_ddr_clk(ulong dummy) +{ + volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + u32 ddr_ratio = ((gur->porpllsr) & 0x00003e00) >> 9; + + if (ddr_ratio == 0x7) + return get_board_sys_clk(dummy); + + return 66666666; +} diff --git a/board/xes/common/fsl_85xx_ddr.c b/board/xes/common/fsl_85xx_ddr.c new file mode 100644 index 0000000..30b4767 --- /dev/null +++ b/board/xes/common/fsl_85xx_ddr.c @@ -0,0 +1,93 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * + * 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/fsl_ddr_sdram.h> +#include <asm/mmu.h> + +#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) +extern void ddr_enable_ecc(unsigned int dram_size); +#endif + +phys_size_t initdram(int board_type) +{ + phys_size_t dram_size = fsl_ddr_sdram(); + + dram_size = setup_ddr_tlbs(dram_size / 0x100000); + + dram_size *= 0x100000; + +#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) + /* Initialize and enable DDR ECC */ + ddr_enable_ecc(dram_size); +#endif + + return dram_size; +} + +#if defined(CONFIG_DDR_ECC) || (CONFIG_NUM_DDR_CONTROLLERS > 1) +void board_add_ram_info(int use_default) +{ +#if (CONFIG_NUM_DDR_CONTROLLERS > 1) + volatile ccsr_ddr_t *ddr1 = (void *)(CONFIG_SYS_MPC85xx_DDR_ADDR); +#endif + + puts(" ("); + +#if (CONFIG_NUM_DDR_CONTROLLERS > 1) + /* Print interleaving information */ + if (ddr1->cs0_config & 0x20000000) { + switch ((ddr1->cs0_config >> 24) & 0xf) { + case 0: + puts("cache line"); + break; + case 1: + puts("page"); + break; + case 2: + puts("bank"); + break; + case 3: + puts("super-bank"); + break; + default: + puts("invalid"); + break; + } + } else { + puts("no"); + } + + puts(" interleaving"); +#endif + +#if (CONFIG_NUM_DDR_CONTROLLERS > 1) && defined(CONFIG_DDR_ECC) + puts(", "); +#endif + +#if defined(CONFIG_DDR_ECC) + puts("ECC enabled"); +#endif + + puts(")"); +} +#endif /* CONFIG_DDR_ECC || CONFIG_NUM_DDR_CONTROLLERS > 1 */ diff --git a/board/xes/common/fsl_85xx_pci.c b/board/xes/common/fsl_85xx_pci.c new file mode 100644 index 0000000..12437be --- /dev/null +++ b/board/xes/common/fsl_85xx_pci.c @@ -0,0 +1,287 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * Copyright 2007-2008 Freescale Semiconductor, Inc. + * + * 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 <pci.h> +#include <asm/immap_85xx.h> +#include <asm/immap_fsl_pci.h> +#include <libfdt.h> +#include <fdt_support.h> + +extern void fsl_pci_init(struct pci_controller *hose); + +int first_free_busno = 0; + +#ifdef CONFIG_PCIE1 +static struct pci_controller pcie1_hose; +#endif +#ifdef CONFIG_PCIE2 +static struct pci_controller pcie2_hose; +#endif +#ifdef CONFIG_PCIE3 +static struct pci_controller pcie3_hose; +#endif + +/* Correlate host/agent POR bits to usable info. Table 4-14 */ +struct host_agent_cfg_t { + uchar pcie_root[3]; + uchar rio_host; +} host_agent_cfg[8] = { + {{0, 0, 0}, 0}, + {{0, 1, 1}, 1}, + {{1, 0, 1}, 0}, + {{1, 1, 0}, 1}, + {{0, 0, 1}, 0}, + {{0, 1, 0}, 1}, + {{1, 0, 0}, 0}, + {{1, 1, 1}, 1} +}; + +/* Correlate port width POR bits to usable info. Table 4-15 */ +struct io_port_cfg_t { + uchar pcie_width[3]; + uchar rio_width; +} io_port_cfg[16] = { + {{0, 0, 0}, 0}, + {{0, 0, 0}, 0}, + {{4, 0, 0}, 0}, + {{4, 4, 0}, 0}, + {{0, 0, 0}, 0}, + {{0, 0, 0}, 0}, + {{0, 0, 0}, 4}, + {{4, 2, 2}, 0}, + {{0, 0, 0}, 0}, + {{0, 0, 0}, 0}, + {{0, 0, 0}, 0}, + {{4, 0, 0}, 4}, + {{4, 0, 0}, 4}, + {{0, 0, 0}, 4}, + {{0, 0, 0}, 4}, + {{8, 0, 0}, 0}, +}; + +void pci_init_board(void) +{ + struct pci_controller *hose; + volatile ccsr_fsl_pci_t *pci; + int width; + int host; + volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + uint devdisr = gur->devdisr; + uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19; + uint host_agent = (gur->porbmsr & MPC85xx_PORBMSR_HA) >> 16; + + debug(" pci_init_board: devdisr=%x, io_sel=%x, host_agent=%x\n", + devdisr, io_sel, host_agent); + +#ifdef CONFIG_PCIE1 + pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCIE1_ADDR; + hose = &pcie1_hose; + host = host_agent_cfg[host_agent].pcie_root[0]; + width = io_port_cfg[io_sel].pcie_width[0]; + + if (width && !(devdisr & MPC85xx_DEVDISR_PCIE)) { + printf("\n PCIE1 connected as %s (x%d)", + host ? "Root Complex" : "End Point", width); + if (pci->pme_msg_det) { + pci->pme_msg_det = 0xffffffff; + debug(" with errors. Clearing. Now 0x%08x", + pci->pme_msg_det); + } + printf("\n"); + + /* inbound */ + pci_set_region(hose->regions + 0, + CONFIG_SYS_PCI_MEMORY_BUS, + CONFIG_SYS_PCI_MEMORY_PHYS, + CONFIG_SYS_PCI_MEMORY_SIZE, + PCI_REGION_MEM | PCI_REGION_MEMORY); + + /* outbound memory */ + pci_set_region(hose->regions + 1, + CONFIG_SYS_PCIE1_MEM_BASE, + CONFIG_SYS_PCIE1_MEM_PHYS, + CONFIG_SYS_PCIE1_MEM_SIZE, + PCI_REGION_MEM); + + /* outbound io */ + pci_set_region(hose->regions + 2, + CONFIG_SYS_PCIE1_IO_BASE, + CONFIG_SYS_PCIE1_IO_PHYS, + CONFIG_SYS_PCIE1_IO_SIZE, + PCI_REGION_IO); + hose->region_count = 3; + + hose->first_busno = first_free_busno; + pci_setup_indirect(hose, (int)&pci->cfg_addr, + (int) &pci->cfg_data); + + fsl_pci_init(hose); + + first_free_busno = hose->last_busno+1; + printf(" PCIE1 on bus %02x - %02x\n", + hose->first_busno, hose->last_busno); + } +#else + gur->devdisr |= MPC85xx_DEVDISR_PCIE; /* disable */ +#endif /* CONFIG_PCIE1 */ + +#ifdef CONFIG_PCIE2 + pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCIE2_ADDR; + hose = &pcie2_hose; + host = host_agent_cfg[host_agent].pcie_root[1]; + width = io_port_cfg[io_sel].pcie_width[1]; + + if (width && !(devdisr & MPC85xx_DEVDISR_PCIE2)) { + printf("\n PCIE2 connected as %s (x%d)", + host ? "Root Complex" : "End Point", width); + if (pci->pme_msg_det) { + pci->pme_msg_det = 0xffffffff; + debug(" with errors. Clearing. Now 0x%08x", + pci->pme_msg_det); + } + printf("\n"); + + /* inbound */ + pci_set_region(hose->regions + 0, + CONFIG_SYS_PCI_MEMORY_BUS, + CONFIG_SYS_PCI_MEMORY_PHYS, + CONFIG_SYS_PCI_MEMORY_SIZE, + PCI_REGION_MEM | PCI_REGION_MEMORY); + + /* outbound memory */ + pci_set_region(hose->regions + 1, + CONFIG_SYS_PCIE2_MEM_BASE, + CONFIG_SYS_PCIE2_MEM_PHYS, + CONFIG_SYS_PCIE2_MEM_SIZE, + PCI_REGION_MEM); + + /* outbound io */ + pci_set_region(hose->regions + 2, + CONFIG_SYS_PCIE2_IO_BASE, + CONFIG_SYS_PCIE2_IO_PHYS, + CONFIG_SYS_PCIE2_IO_SIZE, + PCI_REGION_IO); + + hose->region_count = 3; + + hose->first_busno = first_free_busno; + pci_setup_indirect(hose, (int)&pci->cfg_addr, + (int)&pci->cfg_data); + + fsl_pci_init(hose); + first_free_busno = hose->last_busno+1; + printf(" PCIE2 on bus %02x - %02x\n", + hose->first_busno, hose->last_busno); + + } +#else + gur->devdisr |= MPC85xx_DEVDISR_PCIE2; /* disable */ +#endif /* CONFIG_PCIE2 */ + +#ifdef CONFIG_PCIE3 + pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCIE3_ADDR; + hose = &pcie3_hose; + host = host_agent_cfg[host_agent].pcie_root[2]; + width = io_port_cfg[io_sel].pcie_width[2]; + + if (width && !(devdisr & MPC85xx_DEVDISR_PCIE3)) { + printf("\n PCIE3 connected as %s (x%d)", + host ? "Root Complex" : "End Point", width); + if (pci->pme_msg_det) { + pci->pme_msg_det = 0xffffffff; + debug(" with errors. Clearing. Now 0x%08x", + pci->pme_msg_det); + } + printf("\n"); + + /* inbound */ + pci_set_region(hose->regions + 0, + CONFIG_SYS_PCI_MEMORY_BUS, + CONFIG_SYS_PCI_MEMORY_PHYS, + CONFIG_SYS_PCI_MEMORY_SIZE, + PCI_REGION_MEM | PCI_REGION_MEMORY); + + /* outbound memory */ + pci_set_region(hose->regions + 1, + CONFIG_SYS_PCIE3_MEM_BASE, + CONFIG_SYS_PCIE3_MEM_PHYS, + CONFIG_SYS_PCIE3_MEM_SIZE, + PCI_REGION_MEM); + + /* outbound io */ + pci_set_region(hose->regions + 2, + CONFIG_SYS_PCIE3_IO_BASE, + CONFIG_SYS_PCIE3_IO_PHYS, + CONFIG_SYS_PCIE3_IO_SIZE, + PCI_REGION_IO); + + hose->region_count = 3; + + hose->first_busno = first_free_busno; + pci_setup_indirect(hose, (int)&pci->cfg_addr, + (int)&pci->cfg_data); + + fsl_pci_init(hose); + first_free_busno = hose->last_busno+1; + printf(" PCIE3 on bus %02x - %02x\n", + hose->first_busno, hose->last_busno); + } +#else + gur->devdisr |= MPC85xx_DEVDISR_PCIE2; /* disable */ +#endif /* CONFIG_PCIE3 */ +} + +#if defined(CONFIG_OF_BOARD_SETUP) +void ft_board_pci_setup(void *blob, bd_t *bd) +{ + int node, tmp[2]; + const char *path; + + node = fdt_path_offset(blob, "/aliases"); + tmp[0] = 0; + if (node >= 0) { +#ifdef CONFIG_PCIE1 + path = fdt_getprop(blob, node, "pci2", NULL); + if (path) { + tmp[1] = pcie1_hose.last_busno - pcie1_hose.first_busno; + do_fixup_by_path(blob, path, "bus-range", &tmp, 8, 1); + } +#endif +#ifdef CONFIG_PCIE2 + path = fdt_getprop(blob, node, "pci1", NULL); + if (path) { + tmp[1] = pcie2_hose.last_busno - pcie2_hose.first_busno; + do_fixup_by_path(blob, path, "bus-range", &tmp, 8, 1); + } +#endif +#ifdef CONFIG_PCIE3 + path = fdt_getprop(blob, node, "pci0", NULL); + if (path) { + tmp[1] = pcie3_hose.last_busno - pcie3_hose.first_busno; + do_fixup_by_path(blob, path, "bus-range", &tmp, 8, 1); + } +#endif + } +} +#endif /* CONFIG_OF_BOARD_SETUP */ diff --git a/board/xes/xpedite5370/Makefile b/board/xes/xpedite5370/Makefile new file mode 100644 index 0000000..919397c --- /dev/null +++ b/board/xes/xpedite5370/Makefile @@ -0,0 +1,45 @@ +# +# Copyright 2008 Extreme Engineering Solutions, Inc. +# Copyright 2007 Freescale Semiconductor, Inc. +# (C) Copyright 2001-2006 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# 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. +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).a + +COBJS-y += $(BOARD).o +COBJS-y += ddr.o +COBJS-y += law.o +COBJS-y += tlb.o + +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(OBJS) $(SOBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/xes/xpedite5370/config.mk b/board/xes/xpedite5370/config.mk new file mode 100644 index 0000000..39469b2 --- /dev/null +++ b/board/xes/xpedite5370/config.mk @@ -0,0 +1,35 @@ +# +# Copyright 2008 Extreme Engineering Solutions, Inc. +# Copyright 2007-2008 Freescale Semiconductor, Inc. +# +# 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 +# + +# +# xpedite5370 board +# +ifndef TEXT_BASE +TEXT_BASE = 0xfff80000 +endif + +PLATFORM_RELFLAGS += -mrelocatable + +PLATFORM_CPPFLAGS += -DCONFIG_E500=1 +PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1 +PLATFORM_CPPFLAGS += -DCONFIG_MPC8572=1 diff --git a/board/xes/xpedite5370/ddr.c b/board/xes/xpedite5370/ddr.c new file mode 100644 index 0000000..fd1d43b --- /dev/null +++ b/board/xes/xpedite5370/ddr.c @@ -0,0 +1,270 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * Copyright 2008 Freescale Semiconductor, Inc. + * + * 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 <i2c.h> + +#include <asm/fsl_ddr_sdram.h> +#include <asm/fsl_ddr_dimm_params.h> + +static void get_spd(ddr2_spd_eeprom_t *spd, unsigned char i2c_address) +{ + i2c_read(i2c_address, SPD_EEPROM_OFFSET, 2, (uchar *)spd, + sizeof(ddr2_spd_eeprom_t)); +} + +unsigned int fsl_ddr_get_mem_data_rate(void) +{ + return get_ddr_freq(0); +} + +void fsl_ddr_get_spd(ddr2_spd_eeprom_t *ctrl_dimms_spd, + unsigned int ctrl_num) +{ + unsigned int i; + unsigned int i2c_address = 0; + + for (i = 0; i < CONFIG_DIMM_SLOTS_PER_CTLR; i++) { + if (ctrl_num == 0) + i2c_address = SPD_EEPROM_ADDRESS1; + if (ctrl_num == 1) + i2c_address = SPD_EEPROM_ADDRESS2; + get_spd(&(ctrl_dimms_spd[i]), i2c_address); + } +} + +/* + * There are four board-specific SDRAM timing parameters which must be + * calculated based on the particular PCB artwork. These are: + * 1.) CPO (Read Capture Delay) + * - TIMING_CFG_2 register + * Source: Calculation based on board trace lengths and + * chip-specific internal delays. + * 2.) WR_DATA_DELAY (Write Command to Data Strobe Delay) + * - TIMING_CFG_2 register + * Source: Calculation based on board trace lengths. + * Unless clock and DQ lanes are very different + * lengths (>2"), this should be set to the nominal value + * of 1/2 clock delay. + * 3.) CLK_ADJUST (Clock and Addr/Cmd alignment control) + * - DDR_SDRAM_CLK_CNTL register + * Source: Signal Integrity Simulations + * 4.) 2T Timing on Addr/Ctl + * - TIMING_CFG_2 register + * Source: Signal Integrity Simulations + * Usually only needed with heavy load/very high speed (>DDR2-800) + * + * ====== XPedite5370 DDR2-600 read delay calculations ====== + * + * See Freescale's App Note AN2583 as refrence. This document also + * contains the chip-specific delays for 8548E, 8572, etc. + * + * For MPC8572E + * Minimum chip delay (Ch 0): 1.372ns + * Maximum chip delay (Ch 0): 2.914ns + * Minimum chip delay (Ch 1): 1.220ns + * Maximum chip delay (Ch 1): 2.595ns + * + * CLK adjust = 5 (from simulations) = 5/8* 3.33ns = 2080ps + * + * Minimum delay calc (Ch 0): + * clock prop - dram skew + min dqs prop delay + clk_adjust + min chip dly + * 2.3" * 180 - 400ps + 1.9" * 180 + 2080ps + 1372ps + * = 3808ps + * = 3.808ns + * + * Maximum delay calc (Ch 0): + * clock prop + dram skew + max dqs prop delay + clk_adjust + max chip dly + * 2.3" * 180 + 400ps + 2.4" * 180 + 2080ps + 2914ps + * = 6240ps + * = 6.240ns + * + * Minimum delay calc (Ch 1): + * clock prop - dram skew + min dqs prop delay + clk_adjust + min chip dly + * 1.46" * 180- 400ps + 0.7" * 180 + 2080ps + 1220ps + * = 3288ps + * = 3.288ns + * + * Maximum delay calc (Ch 1): + * clock prop + dram skew + max dqs prop delay + clk_adjust + min chip dly + * 1.46" * 180+ 400ps + 1.1" * 180 + 2080ps + 2595ps + * = 5536ps + * = 5.536ns + * + * Ch.0: 3.808ns to 6.240ns additional delay needed (pick 5ns as target) + * This is 1.5 clock cycles, pick CPO = READ_LAT + 3/2 (0x8) + * Ch.1: 3.288ns to 5.536ns additional delay needed (pick 4.4ns as target) + * This is 1.32 clock cycles, pick CPO = READ_LAT + 5/4 (0x7) + * + * + * ====== XPedite5370 DDR2-800 read delay calculations ====== + * + * See Freescale's App Note AN2583 as refrence. This document also + * contains the chip-specific delays for 8548E, 8572, etc. + * + * For MPC8572E + * Minimum chip delay (Ch 0): 1.372ns + * Maximum chip delay (Ch 0): 2.914ns + * Minimum chip delay (Ch 1): 1.220ns + * Maximum chip delay (Ch 1): 2.595ns + * + * CLK adjust = 5 (from simulations) = 5/8* 2.5ns = 1563ps + * + * Minimum delay calc (Ch 0): + * clock prop - dram skew + min dqs prop delay + clk_adjust + min chip dly + * 2.3" * 180 - 350ps + 1.9" * 180 + 1563ps + 1372ps + * = 3341ps + * = 3.341ns + * + * Maximum delay calc (Ch 0): + * clock prop + dram skew + max dqs prop delay + clk_adjust + max chip dly + * 2.3" * 180 + 350ps + 2.4" * 180 + 1563ps + 2914ps + * = 5673ps + * = 5.673ns + * + * Minimum delay calc (Ch 1): + * clock prop - dram skew + min dqs prop delay + clk_adjust + min chip dly + * 1.46" * 180- 350ps + 0.7" * 180 + 1563ps + 1220ps + * = 2822ps + * = 2.822ns + * + * Maximum delay calc (Ch 1): + * clock prop + dram skew + max dqs prop delay + clk_adjust + min chip dly + * 1.46" * 180+ 350ps + 1.1" * 180 + 1563ps + 2595ps + * = 4968ps + * = 4.968ns + * + * Ch.0: 3.341ns to 5.673ns additional delay needed (pick 4.5ns as target) + * This is 1.8 clock cycles, pick CPO = READ_LAT + 7/4 (0x9) + * Ch.1: 2.822ns to 4.968ns additional delay needed (pick 3.9ns as target) + * This is 1.56 clock cycles, pick CPO = READ_LAT + 3/2 (0x8) + * + * Write latency (WR_DATA_DELAY) is calculated by doing the following: + * + * The DDR SDRAM specification requires DQS be received no sooner than + * 75% of an SDRAM clock period??and no later than 125% of a clock + * period??from the capturing clock edge of the command/address at the + * SDRAM. + * + * Based on the above tracelengths, the following are calculated: + * Ch. 0 8572 to DRAM propagation (DQ lanes) : 1.9" * 180 = 0.342ns + * Ch. 0 8572 to DRAM propagation (CLKs) : 2.3" * 180 = 0.414ns + * Ch. 1 8572 to DRAM propagation (DQ lanes) : 0.7" * 180 = 0.126ns + * Ch. 1 8572 to DRAM propagation (CLKs ) : 1.47" * 180 = 0.264ns + * + * Difference in arrival time CLK vs. DQS: + * Ch. 0 0.072ns + * Ch. 1 0.138ns + * + * Both of these values are much less than 25% of the clock + * period at DDR2-600 or DDR2-800, so no additional delay is needed over + * the 1/2 cycle which normally aligns the first DQS transition + * exactly WL (CAS latency minus one cycle) after the CAS strobe. + * See Figure 9-53 in MPC8572E manual: "1/2 delay" in Freescale's + * terminology corresponds to exactly one clock period delay after + * the CAS strobe. (due to the fact that the "delay" is referenced + * from the *falling* edge of the CLK, just after the rising edge + * which the CAS strobe is latched on. + */ + +typedef struct board_memctl_options { + uint16_t datarate_mhz_low; + uint16_t datarate_mhz_high; + uint8_t clk_adjust; + uint8_t cpo_override; + uint8_t write_data_delay; +} board_memctl_options_t; + +static struct board_memctl_options bopts_ctrl[][2] = { + { + /* Controller 0 */ + { + /* DDR2 600/667 */ + .datarate_mhz_low = 500, + .datarate_mhz_high = 750, + .clk_adjust = 5, + .cpo_override = 8, + .write_data_delay = 2, + }, + { + /* DDR2 800 */ + .datarate_mhz_low = 750, + .datarate_mhz_high = 850, + .clk_adjust = 5, + .cpo_override = 9, + .write_data_delay = 2, + }, + }, + { + /* Controller 1 */ + { + /* DDR2 600/667 */ + .datarate_mhz_low = 500, + .datarate_mhz_high = 750, + .clk_adjust = 5, + .cpo_override = 7, + .write_data_delay = 2, + }, + { + /* DDR2 800 */ + .datarate_mhz_low = 750, + .datarate_mhz_high = 850, + .clk_adjust = 5, + .cpo_override = 8, + .write_data_delay = 2, + }, + }, +}; + +void fsl_ddr_board_options(memctl_options_t *popts, + dimm_params_t *pdimm, + unsigned int ctrl_num) +{ + struct board_memctl_options *bopts = bopts_ctrl[ctrl_num]; + sys_info_t sysinfo; + int i; + unsigned int datarate; + + get_sys_info(&sysinfo); + datarate = sysinfo.freqDDRBus / 1000 / 1000; + + for (i = 0; i < ARRAY_SIZE(bopts_ctrl[ctrl_num]); i++) { + if ((bopts[i].datarate_mhz_low <= datarate) && + (bopts[i].datarate_mhz_high >= datarate)) { + debug("controller %d:\n", ctrl_num); + debug(" clk_adjust = %d\n", bopts[i].clk_adjust); + debug(" cpo = %d\n", bopts[i].cpo_override); + debug(" write_data_delay = %d\n", + bopts[i].write_data_delay); + popts->clk_adjust = bopts[i].clk_adjust; + popts->cpo_override = bopts[i].cpo_override; + popts->write_data_delay = bopts[i].write_data_delay; + } + } + + /* + * Factors to consider for half-strength driver enable: + * - number of DIMMs installed + */ + popts->half_strength_driver_enable = 0; +} diff --git a/board/xes/xpedite5370/law.c b/board/xes/xpedite5370/law.c new file mode 100644 index 0000000..daee676 --- /dev/null +++ b/board/xes/xpedite5370/law.c @@ -0,0 +1,54 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * Copyright 2008 Freescale Semiconductor, Inc. + * + * (C) Copyright 2000 + * Wolfgang Denk, DENX Software Engineering, wd at denx.de. + * + * 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/fsl_law.h> +#include <asm/mmu.h> + +/* + * Notes: + * CCSRBAR and L2-as-SRAM don't need a configured Local Access Window. + * If flash is 8M at default position (last 8M), no LAW needed. + */ + +struct law_entry law_table[] = { + SET_LAW(CONFIG_SYS_FLASH_BASE2, LAW_SIZE_256M, LAW_TRGT_IF_LBC), + SET_LAW(CONFIG_SYS_NAND_BASE, LAW_SIZE_1M, LAW_TRGT_IF_LBC), +#ifdef CONFIG_SYS_PCIE1_MEM_PHYS + SET_LAW(CONFIG_SYS_PCIE1_MEM_PHYS, LAW_SIZE_1G, LAW_TRGT_IF_PCIE_1), + SET_LAW(CONFIG_SYS_PCIE1_IO_PHYS, LAW_SIZE_8M, LAW_TRGT_IF_PCIE_1), +#endif +#ifdef CONFIG_SYS_PCIE2_MEM_PHYS + SET_LAW(CONFIG_SYS_PCIE2_MEM_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_PCIE_2), + SET_LAW(CONFIG_SYS_PCIE2_IO_PHYS, LAW_SIZE_8M, LAW_TRGT_IF_PCIE_2), +#endif +#ifdef CONFIG_SYS_PCIE3_MEM_PHYS + SET_LAW(CONFIG_SYS_PCIE3_MEM_PHYS, LAW_SIZE_256M, LAW_TRGT_IF_PCIE_3), + SET_LAW(CONFIG_SYS_PCIE3_IO_PHYS, LAW_SIZE_8M, LAW_TRGT_IF_PCIE_3), +#endif +}; + +int num_law_entries = ARRAY_SIZE(law_table); diff --git a/board/xes/xpedite5370/tlb.c b/board/xes/xpedite5370/tlb.c new file mode 100644 index 0000000..3bd3781 --- /dev/null +++ b/board/xes/xpedite5370/tlb.c @@ -0,0 +1,91 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * Copyright 2008 Freescale Semiconductor, Inc. + * + * (C) Copyright 2000 + * Wolfgang Denk, DENX Software Engineering, wd at denx.de. + * + * 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/mmu.h> + +struct fsl_e_tlb_entry tlb_table[] = { + /* TLB 0 - for temp stack in cache */ + SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR, CONFIG_SYS_INIT_RAM_ADDR, + MAS3_SX|MAS3_SW|MAS3_SR, 0, + 0, 0, BOOKE_PAGESZ_4K, 0), + SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024, + MAS3_SX|MAS3_SW|MAS3_SR, 0, + 0, 0, BOOKE_PAGESZ_4K, 0), + SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024, + MAS3_SX|MAS3_SW|MAS3_SR, 0, + 0, 0, BOOKE_PAGESZ_4K, 0), + SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024, + MAS3_SX|MAS3_SW|MAS3_SR, 0, + 0, 0, BOOKE_PAGESZ_4K, 0), + + /* W**G* - NOR flashes */ + /* This will be changed to *I*G* after relocation to RAM. */ + SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE2, CONFIG_SYS_FLASH_BASE2, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_W|MAS2_G, + 0, 0, BOOKE_PAGESZ_256M, 1), + + /* *I*G* - CCSRBAR */ + SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + 0, 1, BOOKE_PAGESZ_1M, 1), + + /* *I*G* - NAND flash */ + SET_TLB_ENTRY(1, CONFIG_SYS_NAND_BASE, CONFIG_SYS_NAND_BASE, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + 0, 2, BOOKE_PAGESZ_1M, 1), + +#ifdef CONFIG_PCIE1 + /* *I*G* - PCIe */ + SET_TLB_ENTRY(1, CONFIG_SYS_PCIE1_MEM_PHYS, CONFIG_SYS_PCIE1_MEM_PHYS, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + 0, 3, BOOKE_PAGESZ_1G, 1), +#endif + +#ifdef CONFIG_PCIE2 + /* *I*G* - PCIe */ + SET_TLB_ENTRY(1, CONFIG_SYS_PCIE2_MEM_PHYS, CONFIG_SYS_PCIE2_MEM_PHYS, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + 0, 4, BOOKE_PAGESZ_256M, 1), +#endif + +#ifdef CONFIG_PCIE3 + /* *I*G* - PCIe */ + SET_TLB_ENTRY(1, CONFIG_SYS_PCIE3_MEM_PHYS, CONFIG_SYS_PCIE3_MEM_PHYS, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + 0, 5, BOOKE_PAGESZ_256M, 1), +#endif + +#if defined(CONFIG_PCIE1) || defined(CONFIG_PCIE2) || defined(CONFIG_PCIE3) + /* *I*G* - PCIe */ + SET_TLB_ENTRY(1, CONFIG_SYS_PCIE1_IO_PHYS, CONFIG_SYS_PCIE1_IO_PHYS, + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + 0, 6, BOOKE_PAGESZ_64M, 1), +#endif + +}; + +int num_tlb_entries = ARRAY_SIZE(tlb_table); diff --git a/board/xes/xpedite5370/u-boot.lds b/board/xes/xpedite5370/u-boot.lds new file mode 100644 index 0000000..cb39912 --- /dev/null +++ b/board/xes/xpedite5370/u-boot.lds @@ -0,0 +1,145 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * Copyright 2007-2008 Freescale Semiconductor, Inc. + * + * 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 + */ + +OUTPUT_ARCH(powerpc) +/* Do we need any of these for elf? + __DYNAMIC = 0; */ +PHDRS +{ + text PT_LOAD; + bss PT_LOAD; +} + +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + . = + SIZEOF_HEADERS; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .rel.text : { *(.rel.text) } + .rela.text : { *(.rela.text) } + .rel.data : { *(.rel.data) } + .rela.data : { *(.rela.data) } + .rel.rodata : { *(.rel.rodata) } + .rela.rodata : { *(.rela.rodata) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.ctors : { *(.rel.ctors) } + .rela.ctors : { *(.rela.ctors) } + .rel.dtors : { *(.rel.dtors) } + .rela.dtors : { *(.rela.dtors) } + .rel.bss : { *(.rel.bss) } + .rela.bss : { *(.rela.bss) } + .rel.plt : { *(.rel.plt) } + .rela.plt : { *(.rela.plt) } + .init : { *(.init) } + .plt : { *(.plt) } + .text : + { + *(.text) + *(.got1) + } :text + _etext = .; + PROVIDE (etext = .); + .rodata : + { + *(.rodata) + *(.rodata1) + *(.rodata.str1.4) + *(.eh_frame) + } :text + .fini : { *(.fini) } =0 + .ctors : { *(.ctors) } + .dtors : { *(.dtors) } + + /* Read-write section, merged into data segment: */ + . = (. + 0x00FF) & 0xFFFFFF00; + _erotext = .; + PROVIDE (erotext = .); + .reloc : + { + *(.got) + _GOT2_TABLE_ = .; + *(.got2) + _FIXUP_TABLE_ = .; + *(.fixup) + } + __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2; + __fixup_entries = (. - _FIXUP_TABLE_) >> 2; + + .data : + { + *(.data) + *(.data1) + *(.sdata) + *(.sdata2) + *(.dynamic) + CONSTRUCTORS + } + _edata = .; + PROVIDE (edata = .); + + . = .; + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + . = .; + __start___ex_table = .; + __ex_table : { *(__ex_table) } + __stop___ex_table = .; + + . = ALIGN(256); + __init_begin = .; + .text.init : { *(.text.init) } + .data.init : { *(.data.init) } + . = ALIGN(256); + __init_end = .; + + .bootpg ADDR(.text) + 0x7f000 : + { + cpu/mpc85xx/start.o (.bootpg) + } :text = 0xffff + + .resetvec ADDR(.text) + 0x7fffc : + { + *(.resetvec) + } :text = 0xffff + + . = ADDR(.text) + 0x80000; + + __bss_start = .; + .bss (NOLOAD) : + { + *(.sbss) *(.scommon) + *(.dynbss) + *(.bss) + *(COMMON) + } :bss + + . = ALIGN(4); + _end = . ; + PROVIDE (end = .); +} diff --git a/board/xes/xpedite5370/xpedite5370.c b/board/xes/xpedite5370/xpedite5370.c new file mode 100644 index 0000000..3526172 --- /dev/null +++ b/board/xes/xpedite5370/xpedite5370.c @@ -0,0 +1,125 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * + * 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 <command.h> +#include <asm/processor.h> +#include <asm/mmu.h> +#include <asm/immap_85xx.h> +#include <asm/immap_fsl_pci.h> +#include <asm/io.h> +#include <asm/cache.h> +#include <libfdt.h> +#include <fdt_support.h> +#include <gpio/pca953x.h> + +DECLARE_GLOBAL_DATA_PTR; + +extern void ft_board_pci_setup(void *blob, bd_t *bd); + +int checkboard(void) +{ + char *s; + + printf("Board: X-ES %s 3U VPX SBC\n", CONFIG_SYS_BOARD_NAME); + printf(" "); + s = getenv("board_rev"); + if (s) + printf("Rev %s, ", s); + s = getenv("serial#"); + if (s) + printf("Serial# %s, ", s); + s = getenv("board_cfg"); + if (s) + printf("Cfg %s", s); + printf("\n"); + + return 0; +} + +static void flash_cs_fixup(void) +{ + volatile ccsr_lbc_t *lbc = (void *)(CONFIG_SYS_MPC85xx_LBC_ADDR); + int flash_sel; + + /* Print boot dev and swap flash flash chip selects if booted from 2nd + * flash. Swapping chip selects presents user with a common memory + * map regardless of which flash was booted from. */ + flash_sel = !((pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) & + CONFIG_SYS_PCA953X_C0_FLASH_PASS_CS)); + printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1); + + if (flash_sel) { + lbc->br0 = CONFIG_SYS_BR1_PRELIM; + lbc->or0 = CONFIG_SYS_OR1_PRELIM; + + lbc->br1 = CONFIG_SYS_BR0_PRELIM; + lbc->or1 = CONFIG_SYS_OR0_PRELIM; + } +} + +int board_early_init_r(void) +{ + const unsigned int flashbase = CONFIG_SYS_FLASH_BASE2; + int i; + + /* Initialize PCA9557 devices */ + pca953x_set_pol(CONFIG_SYS_I2C_PCA953X_ADDR0, 0xff, 0); + pca953x_set_pol(CONFIG_SYS_I2C_PCA953X_ADDR1, 0xff, 0); + pca953x_set_pol(CONFIG_SYS_I2C_PCA953X_ADDR0, 0xff, 0); + pca953x_set_pol(CONFIG_SYS_I2C_PCA953X_ADDR0, 0xff, 0); + + /* Invalidate flash region */ + for (i = 0; i < 256 * 1024 * 1024; i += 32) { + asm volatile ("dcbi %0,%1": : "b" (flashbase), "r" (i)); + asm volatile ("icbi %0,%1": : "b" (flashbase), "r" (i)); + } + + disable_tlb(0); + set_tlb(1, (CONFIG_SYS_FLASH_BASE2 & 0xf0000000), + (CONFIG_SYS_FLASH_BASE2 & 0xf0000000), + MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, + 0, 0, BOOKE_PAGESZ_256M, 1); + + flash_cs_fixup(); + + return 0; +} + +#if defined(CONFIG_OF_BOARD_SETUP) +void ft_board_setup(void *blob, bd_t *bd) +{ +#ifdef CONFIG_PCI + ft_board_pci_setup(blob, bd); +#endif + ft_cpu_setup(blob, bd); +} +#endif + +#ifdef CONFIG_MP +extern void cpu_mp_lmb_reserve(struct lmb *lmb); + +void board_lmb_reserve(struct lmb *lmb) +{ + cpu_mp_lmb_reserve(lmb); +} +#endif diff --git a/include/configs/XPEDITE5370.h b/include/configs/XPEDITE5370.h new file mode 100644 index 0000000..9e01d00 --- /dev/null +++ b/include/configs/XPEDITE5370.h @@ -0,0 +1,590 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * Copyright 2007-2008 Freescale Semiconductor, Inc. + * + * 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 + */ + +/* + * xpedite5370 board configuration file + */ +#ifndef __CONFIG_H +#define __CONFIG_H + +/* + * High Level Configuration Options + */ +#define CONFIG_BOOKE 1 /* BOOKE */ +#define CONFIG_E500 1 /* BOOKE e500 family */ +#define CONFIG_MPC85xx 1 /* MPC8540/60/55/41/48 */ +#define CONFIG_MPC8572 1 +#define CONFIG_XPEDITE5370 1 +#define CONFIG_SYS_BOARD_NAME "XPedite5370" +#define CONFIG_NUM_CPUS 2 /* 2 Cores */ +#define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ +#define CONFIG_RELOC_FIXUP_WORKS /* Fully relocate to SDRAM */ + +#define CONFIG_PCI 1 /* Enable PCI/PCIE */ +#define CONFIG_PCI_PNP 1 /* do pci plug-and-play */ +#define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */ +#define CONFIG_PCIE1 1 /* PCIE controler 1 */ +#define CONFIG_PCIE2 1 /* PCIE controler 2 */ +#define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */ +#define CONFIG_FSL_PCIE_RESET 1 /* need PCIe reset errata */ +#define CONFIG_FSL_LAW 1 /* Use common FSL init code */ + +/* + * DDR config + */ +#define CONFIG_FSL_DDR2 +#undef CONFIG_FSL_DDR_INTERACTIVE +#define CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup */ +#define CONFIG_DDR_SPD +#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define SPD_EEPROM_ADDRESS1 0x54 /* Both channels use the */ +#define SPD_EEPROM_ADDRESS2 0x54 /* same SPD data */ +#define SPD_EEPROM_OFFSET 0x200 /* OFFSET of SPD in EEPROM */ +#define CONFIG_NUM_DDR_CONTROLLERS 2 +#define CONFIG_DIMM_SLOTS_PER_CTLR 1 +#define CONFIG_CHIP_SELECTS_PER_CTRL 1 +#define CONFIG_DDR_ECC +#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER +#define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ +#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE +#define CONFIG_VERY_BIG_RAM + +#ifndef __ASSEMBLY__ +extern unsigned long get_board_sys_clk(unsigned long dummy); +extern unsigned long get_board_ddr_clk(unsigned long dummy); +#endif + +#define CONFIG_SYS_CLK_FREQ get_board_sys_clk(0) /* sysclk for MPC85xx */ +#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk(0) /* ddrclk for MPC85xx */ + +/* + * These can be toggled for performance analysis, otherwise use default. + */ +#define CONFIG_L2_CACHE /* toggle L2 cache */ +#define CONFIG_BTB /* toggle branch predition */ +#define CONFIG_ADDR_STREAMING /* toggle addr streaming */ +#define CONFIG_ENABLE_36BIT_PHYS 1 + +/* + * Base addresses -- Note these are effective addresses where the + * actual resources get mapped (not physical addresses) + */ +#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000 /* CCSRBAR Default */ +#define CONFIG_SYS_CCSRBAR 0xef000000 /* relocated CCSRBAR */ +#define CONFIG_SYS_CCSRBAR_PHYS CONFIG_SYS_CCSRBAR /* physical addr of CCSRBAR */ +#define CONFIG_SYS_IMMR CONFIG_SYS_CCSRBAR /* PQII uses CONFIG_SYS_IMMR */ +#define CONFIG_SYS_PCIE1_ADDR (CONFIG_SYS_CCSRBAR + 0xa000) +#define CONFIG_SYS_PCIE2_ADDR (CONFIG_SYS_CCSRBAR + 0x9000) + +/* + * Diagnostics + */ +#define CONFIG_SYS_ALT_MEMTEST +#define CONFIG_SYS_MEMTEST_START 0x10000000 +#define CONFIG_SYS_MEMTEST_END 0x20000000 + +/* + * Memory map + * 0x0000_0000 0x7fff_ffff DDR 2G Cacheable + * 0x8000_0000 0xbfff_ffff PCIe1 Mem 1G non-cacheable + * 0xc000_0000 0xcfff_ffff PCIe2 Mem 256M non-cacheable + * 0xe000_0000 0xe7ff_ffff SRAM/SSRAM/L1 Cache 128M non-cacheable + * 0xe800_0000 0xe87f_ffff PCIe1 IO 8M non-cacheable + * 0xe880_0000 0xe8ff_ffff PCIe2 IO 8M non-cacheable + * 0xef00_0000 0xef0f_ffff CCSR/IMMR 1M non-cacheable + * 0xef80_0000 0xef8f_ffff NAND Flash 1M non-cacheable + * 0xf000_0000 0xf7ff_ffff NOR Flash 2 128M non-cacheable + * 0xf800_0000 0xffff_ffff NOR Flash 1 128M non-cacheable + */ + +#define CONFIG_SYS_LBC_LCRR (LCRR_CLKDIV_4 | LCRR_EADC_3) + +/* + * NAND flash configuration + */ +#define CONFIG_SYS_NAND_BASE 0xef800000 +#define CONFIG_SYS_NAND_BASE2 0xef840000 /* Unused@this time */ + +/* + * NOR flash configuration + */ +#define CONFIG_SYS_FLASH_BASE 0xf8000000 +#define CONFIG_SYS_FLASH_BASE2 0xf0000000 +#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE2} +#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ +#define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ +#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ +#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ +#define CONFIG_FLASH_CFI_DRIVER +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_SYS_FLASH_AUTOPROTECT_LIST { {0xfff40000, 0xc0000}, \ + {0xf7f40000, 0xc0000} } +#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ + +/* + * Chip select configuration + */ +/* NOR Flash 0 */ +#define CONFIG_SYS_BR0_PRELIM (CONFIG_SYS_FLASH_BASE | \ + BR_PS_16 | \ + BR_V) +#define CONFIG_SYS_OR0_PRELIM (OR_AM_128MB | \ + OR_GPCM_CSNT | \ + OR_GPCM_XACS | \ + OR_GPCM_ACS_DIV2 | \ + OR_GPCM_SCY_8 | \ + OR_GPCM_TRLX | \ + OR_GPCM_EHTR | \ + OR_GPCM_EAD) + +/* NOR Flash 1 */ +#define CONFIG_SYS_BR1_PRELIM (CONFIG_SYS_FLASH_BASE2 | \ + BR_PS_16 | \ + BR_V) +#define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_OR0_PRELIM + +/* NAND flash on CS2 */ +#define CONFIG_SYS_BR2_PRELIM (CONFIG_SYS_NAND_BASE | \ + (2<<BR_DECC_SHIFT) | \ + BR_PS_8 | \ + BR_MS_FCM | \ + BR_V) + +/* NAND flash on CS2 */ +#define CONFIG_SYS_OR2_PRELIM (OR_AM_256KB | \ + OR_FCM_PGS | \ + OR_FCM_CSCT | \ + OR_FCM_CST | \ + OR_FCM_CHT | \ + OR_FCM_SCY_1 | \ + OR_FCM_TRLX | \ + OR_FCM_EHTR) + +/* NAND flash on CS3 */ +#define CONFIG_SYS_BR3_PRELIM (CONFIG_SYS_NAND_BASE2 | \ + (2<<BR_DECC_SHIFT) | \ + BR_PS_8 | \ + BR_MS_FCM | \ + BR_V) +#define CONFIG_SYS_OR3_PRELIM CONFIG_SYS_OR2_PRELIM + +/* + * Use L1 as initial stack + */ +#define CONFIG_L1_INIT_RAM 1 +#define CONFIG_SYS_INIT_RAM_LOCK 1 +#define CONFIG_SYS_INIT_RAM_ADDR 0xe0000000 +#define CONFIG_SYS_INIT_RAM_END 0x00004000 + +#define CONFIG_SYS_GBL_DATA_SIZE 128 /* num bytes initial data */ +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET + +#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 KB for Mon */ +#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ + +/* + * Serial Port + */ +#define CONFIG_CONS_INDEX 1 +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE 1 +#define CONFIG_SYS_NS16550_CLK get_bus_freq(0) +#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500) +#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600) +#define CONFIG_SYS_BAUDRATE_TABLE \ + {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} +#define CONFIG_BAUDRATE 115200 +#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ +#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ + +/* + * Use the HUSH parser + */ +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + +/* + * Pass open firmware flat tree + */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_OF_STDOUT_VIA_ALIAS 1 + +#define CONFIG_SYS_64BIT_VSPRINTF 1 +#define CONFIG_SYS_64BIT_STRTOUL 1 + +/* + * I2C + */ +#define CONFIG_FSL_I2C /* Use FSL common I2C driver */ +#define CONFIG_HARD_I2C /* I2C with hardware support */ +#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ +#define CONFIG_I2C_MULTI_BUS +#define CONFIG_I2C_CMD_TREE + +/* PEX8518 slave I2C interface */ +#define CONFIG_SYS_I2C_PEX8518_ADDR 0x70 + +/* I2C DS1631 temperature sensor */ +#define CONFIG_SYS_I2C_DS1621_ADDR 0x48 +#define CONFIG_DTT_DS1621 +#define CONFIG_DTT_SENSORS { 0 } + +/* I2C EEPROM - AT24C128B */ +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 +#define CONFIG_SYS_I2C_SLAVE 0x7F +#define CONFIG_SYS_I2C_OFFSET 0x3000 +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6 /* 64 byte pages */ +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* take up to 10 msec */ + +/* I2C RTC */ +#define CONFIG_RTC_M41T11 1 +#define CONFIG_SYS_I2C_RTC_ADDR 0x68 +#define CONFIG_SYS_M41T11_BASE_YEAR 2000 + +/* GPIO/EEPROM/SRAM */ +#define CONFIG_DS4510 +#define CONFIG_SYS_I2C_DS4510_ADDR 0x51 + +/* GPIO */ +#define CONFIG_PCA953X +#define CONFIG_SYS_I2C_PCA953X_ADDR0 0x18 +#define CONFIG_SYS_I2C_PCA953X_ADDR1 0x1c +#define CONFIG_SYS_I2C_PCA953X_ADDR2 0x1e +#define CONFIG_SYS_I2C_PCA953X_ADDR3 0x1f + +/* + * PU = pulled high, PD = pulled low + * I = input, O = output, IO = input/output + */ +/* PCA9557 @ 0x18*/ +#define CONFIG_SYS_PCA953X_C0_SER0_EN 0x01 /* PU; UART0 enable (1: enabled) */ +#define CONFIG_SYS_PCA953X_C0_SER0_MODE 0x02 /* PU; UART0 serial mode select */ +#define CONFIG_SYS_PCA953X_C0_SER1_EN 0x04 /* PU; UART1 enable (1: enabled) */ +#define CONFIG_SYS_PCA953X_C0_SER1_MODE 0x08 /* PU; UART1 serial mode select */ +#define CONFIG_SYS_PCA953X_C0_FLASH_PASS_CS 0x10 /* PU; Boot flash CS select */ +#define CONFIG_SYS_PCA953X_NVM_WP 0x20 /* PU; Set to 0 to enable NVM writing */ +#define CONFIG_SYS_PCA953X_C0_VCORE_VID2 0x40 /* VID2 of ISL6262 */ +#define CONFIG_SYS_PCA953X_C0_VCORE_VID3 0x80 /* VID3 of ISL6262 */ + +/* PCA9557 @ 0x1c*/ +#define CONFIG_SYS_PCA953X_XMC0_ROOT0 0x01 /* PU; Low if XMC is RC */ +#define CONFIG_SYS_PCA953X_XMC0_MVMR0 0x02 /* XMC EEPROM write protect */ +#define CONFIG_SYS_PCA953X_XMC0_WAKE 0x04 /* PU; XMC wake */ +#define CONFIG_SYS_PCA953X_XMC0_BIST 0x08 /* PU; XMC built in self test */ +#define CONFIG_SYS_PCA953X_XMC_PRESENT 0x10 /* PU; Low if XMC module installed */ +#define CONFIG_SYS_PCA953X_PMC_PRESENT 0x20 /* PU; Low if PMC module installed */ +#define CONFIG_SYS_PCA953X_PMC0_MONARCH 0x40 /* PMC monarch mode enable */ +#define CONFIG_SYS_PCA953X_PMC0_EREADY 0x80 /* PU; PMC PCI eready */ + +/* PCA9557 @ 0x1e*/ +#define CONFIG_SYS_PCA953X_P0_GA0 0x01 /* PU; VPX Geographical address */ +#define CONFIG_SYS_PCA953X_P0_GA1 0x02 /* PU; VPX Geographical address */ +#define CONFIG_SYS_PCA953X_P0_GA2 0x04 /* PU; VPX Geographical address */ +#define CONFIG_SYS_PCA953X_P0_GA3 0x08 /* PU; VPX Geographical address */ +#define CONFIG_SYS_PCA953X_P0_GA4 0x10 /* PU; VPX Geographical address */ +#define CONFIG_SYS_PCA953X_P0_GAP 0x20 /* PU; tied to VPX P0.GAP */ +#define CONFIG_SYS_PCA953X_P1_SYSEN 0x80 /* PU; Pulled high; tied to VPX P1.SYSCON */ + +/* PCA9557 @ 0x1f */ +#define CONFIG_SYS_PCA953X_GPIO_VPX0 0x01 /* PU */ +#define CONFIG_SYS_PCA953X_GPIO_VPX1 0x02 /* PU */ +#define CONFIG_SYS_PCA953X_GPIO_VPX2 0x04 /* PU */ +#define CONFIG_SYS_PCA953X_GPIO_VPX3 0x08 /* PU */ +#define CONFIG_SYS_PCA953X_VPX_FRU_WRCTL 0x10 /* PD; I2C master source for FRU SEEPROM */ + +/* + * General PCI + * Memory space is mapped 1-1, but I/O space must start from 0. + */ +/* PCI view of System Memory */ +#define CONFIG_SYS_PCI_MEMORY_BUS 0x00000000 +#define CONFIG_SYS_PCI_MEMORY_PHYS 0x00000000 +#define CONFIG_SYS_PCI_MEMORY_SIZE 0x80000000 + +/* PCIE1 - VPX P1 */ +#define CONFIG_SYS_PCIE1_MEM_BASE 0x80000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BASE +#define CONFIG_SYS_PCIE1_MEM_SIZE 0x40000000 /* 1G */ +#define CONFIG_SYS_PCIE1_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE1_IO_PHYS 0xe8000000 +#define CONFIG_SYS_PCIE1_IO_SIZE 0x00800000 /* 8M */ + +/* PCIE2 - PEX8518 */ +#define CONFIG_SYS_PCIE2_MEM_BASE 0xc0000000 +#define CONFIG_SYS_PCIE2_MEM_PHYS CONFIG_SYS_PCIE2_MEM_BASE +#define CONFIG_SYS_PCIE2_MEM_SIZE 0x10000000 /* 256M */ +#define CONFIG_SYS_PCIE2_IO_BASE 0x00000000 +#define CONFIG_SYS_PCIE2_IO_PHYS 0xe8800000 +#define CONFIG_SYS_PCIE2_IO_SIZE 0x00800000 /* 8M */ + +/* + * Networking options + */ +#define CONFIG_TSEC_ENET /* tsec ethernet support */ +#define CONFIG_PHY_GIGE 1 /* Include GbE speed/duplex detection */ +#define CONFIG_NET_MULTI 1 +#define CONFIG_TSEC_TBI +#define CONFIG_MII 1 /* MII PHY management */ +#define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ +#define CONFIG_ETHPRIME "eTSEC2" + +#define CONFIG_TSEC1 1 +#define CONFIG_TSEC1_NAME "eTSEC1" +#define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) +#define TSEC1_PHY_ADDR 1 +#define TSEC1_PHYIDX 0 +#define CONFIG_HAS_ETH0 + +#define CONFIG_TSEC2 1 +#define CONFIG_TSEC2_NAME "eTSEC2" +#define TSEC2_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) +#define TSEC2_PHY_ADDR 2 +#define TSEC2_PHYIDX 0 +#define CONFIG_HAS_ETH1 + +/* + * Command configuration. + */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DATE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_DS4510 +#define CONFIG_CMD_DTT +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_ELF +#define CONFIG_CMD_ENV +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_I2C +#define CONFIG_CMD_JFFS2 +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_CMD_PCA953X +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PING +#define CONFIG_CMD_SNTP + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ +#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ +#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ +#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */ +#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ +#define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */ +#define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */ +#define CONFIG_PANIC_HANG /* do not reset board on panic */ +#define CONFIG_PREBOOT /* enable preboot variable */ +#define CONFIG_FIT 1 +#define CONFIG_FIT_VERBOSE 1 +#define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ + +/* + * For booting Linux, the board info and command line data + * have to be in the first 16 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/ + +/* + * Boot Flags + */ +#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ +#define BOOTFLAG_WARM 0x02 /* Software reboot */ + +/* + * Environment Configuration + */ +#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */ +#define CONFIG_ENV_SIZE 0x8000 +#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024)) + +/* + * Flash memory map: + * fff80000 - ffffffff Pri U-Boot (512 KB) + * fff40000 - fff7ffff Pri U-Boot Environment (256 KB) + * fff00000 - fff3ffff Pri FDT (256KB) + * fef00000 - ffefffff Pri OS image (16MB) + * f8000000 - feefffff Pri OS Use/Filesystem (111MB) + * + * f7f80000 - f7ffffff Sec U-Boot (512 KB) + * f7f40000 - f7f7ffff Sec U-Boot Environment (256 KB) + * f7f00000 - f7f3ffff Sec FDT (256KB) + * f6f00000 - f7efffff Sec OS image (16MB) + * f0000000 - f6efffff Sec OS Use/Filesystem (111MB) + */ +#define CONFIG_UBOOT1_ADDR_STR MK_STR(0xfff80000) +#define CONFIG_UBOOT2_ADDR_STR MK_STR(0xf7f80000) +#define CONFIG_FDT1_FLASH_ADDR_STR MK_STR(0xfff00000) +#define CONFIG_FDT2_FLASH_ADDR_STR MK_STR(0xf7f00000) +#define CONFIG_OS1_FLASH_ADDR_STR MK_STR(0xfef00000) +#define CONFIG_OS2_FLASH_ADDR_STR MK_STR(0xf6f00000) + +#define CONFIG_PROG_UBOOT1 \ + "$download_cmd $loadaddr $ubootfile; " \ + "if test $? -eq 0; then " \ + "protect off "CONFIG_UBOOT1_ADDR_STR" +80000; " \ + "erase "CONFIG_UBOOT1_ADDR_STR" +80000; " \ + "cp.w $loadaddr "CONFIG_UBOOT1_ADDR_STR" 40000; " \ + "protect on "CONFIG_UBOOT1_ADDR_STR" +80000; " \ + "cmp.b $loadaddr "CONFIG_UBOOT1_ADDR_STR" 80000; " \ + "if test $? -ne 0; then " \ + "echo PROGRAM FAILED; " \ + "else; " \ + "echo PROGRAM SUCCEEDED; " \ + "fi; " \ + "else; " \ + "echo DOWNLOAD FAILED; " \ + "fi;" + +#define CONFIG_PROG_UBOOT2 \ + "$download_cmd $loadaddr $ubootfile; " \ + "if test $? -eq 0; then " \ + "protect off "CONFIG_UBOOT2_ADDR_STR" +80000; " \ + "erase "CONFIG_UBOOT2_ADDR_STR" +80000; " \ + "cp.w $loadaddr "CONFIG_UBOOT2_ADDR_STR" 40000; " \ + "protect on "CONFIG_UBOOT2_ADDR_STR" +80000; " \ + "cmp.b $loadaddr "CONFIG_UBOOT2_ADDR_STR" 80000; " \ + "if test $? -ne 0; then " \ + "echo PROGRAM FAILED; " \ + "else; " \ + "echo PROGRAM SUCCEEDED; " \ + "fi; " \ + "else; " \ + "echo DOWNLOAD FAILED; " \ + "fi;" + +#define CONFIG_BOOT_OS_NET \ + "$download_cmd $osaddr $osfile; " \ + "if test $? -eq 0; then " \ + "if test -n $fdtaddr; then " \ + "$download_cmd $fdtaddr $fdtfile; " \ + "if test $? -eq 0; then " \ + "bootm $osaddr - $fdtaddr; " \ + "else; " \ + "echo FDT DOWNLOAD FAILED; " \ + "fi; " \ + "else; " \ + "bootm $osaddr; " \ + "fi; " \ + "else; " \ + "echo OS DOWNLOAD FAILED; " \ + "fi;" + +#define CONFIG_PROG_OS1 \ + "$download_cmd $osaddr $osfile; " \ + "if test $? -eq 0; then " \ + "erase "CONFIG_OS1_FLASH_ADDR_STR" +$filesize; " \ + "cp.b $osaddr "CONFIG_OS1_FLASH_ADDR_STR" $filesize; " \ + "cmp.b $osaddr "CONFIG_OS1_FLASH_ADDR_STR" $filesize; " \ + "if test $? -ne 0; then " \ + "echo OS PROGRAM FAILED; " \ + "else; " \ + "echo OS PROGRAM SUCCEEDED; " \ + "fi; " \ + "else; " \ + "echo OS DOWNLOAD FAILED; " \ + "fi;" + +#define CONFIG_PROG_OS2 \ + "$download_cmd $osaddr $osfile; " \ + "if test $? -eq 0; then " \ + "erase "CONFIG_OS2_FLASH_ADDR_STR" +$filesize; " \ + "cp.b $osaddr "CONFIG_OS2_FLASH_ADDR_STR" $filesize; " \ + "cmp.b $osaddr "CONFIG_OS2_FLASH_ADDR_STR" $filesize; " \ + "if test $? -ne 0; then " \ + "echo OS PROGRAM FAILED; " \ + "else; " \ + "echo OS PROGRAM SUCCEEDED; " \ + "fi; " \ + "else; " \ + "echo OS DOWNLOAD FAILED; " \ + "fi;" + +#define CONFIG_PROG_FDT1 \ + "$download_cmd $fdtaddr $fdtfile; " \ + "if test $? -eq 0; then " \ + "erase "CONFIG_FDT1_FLASH_ADDR_STR" +$filesize;" \ + "cp.b $fdtaddr "CONFIG_FDT1_FLASH_ADDR_STR" $filesize; " \ + "cmp.b $fdtaddr "CONFIG_FDT1_FLASH_ADDR_STR" $filesize; " \ + "if test $? -ne 0; then " \ + "echo FDT PROGRAM FAILED; " \ + "else; " \ + "echo FDT PROGRAM SUCCEEDED; " \ + "fi; " \ + "else; " \ + "echo FDT DOWNLOAD FAILED; " \ + "fi;" + +#define CONFIG_PROG_FDT2 \ + "$download_cmd $fdtaddr $fdtfile; " \ + "if test $? -eq 0; then " \ + "erase "CONFIG_FDT2_FLASH_ADDR_STR" +$filesize;" \ + "cp.b $fdtaddr "CONFIG_FDT2_FLASH_ADDR_STR" $filesize; " \ + "cmp.b $fdtaddr "CONFIG_FDT2_FLASH_ADDR_STR" $filesize; " \ + "if test $? -ne 0; then " \ + "echo FDT PROGRAM FAILED; " \ + "else; " \ + "echo FDT PROGRAM SUCCEEDED; " \ + "fi; " \ + "else; " \ + "echo FDT DOWNLOAD FAILED; " \ + "fi;" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "autoload=yes\0" \ + "download_cmd=tftp\0" \ + "console_args=console=ttyS0,115200\0" \ + "root_args=root=/dev/nfs rw\0" \ + "misc_args=ip=on\0" \ + "set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \ + "bootfile=/home/user/file\0" \ + "osfile=/home/user/uImage-XPedite5370\0" \ + "fdtfile=/home/user/xpedite5370.dtb\0" \ + "ubootfile=/home/user/u-boot.bin\0" \ + "fdtaddr=c00000\0" \ + "osaddr=0x1000000\0" \ + "loadaddr=0x1000000\0" \ + "prog_uboot1="CONFIG_PROG_UBOOT1"\0" \ + "prog_uboot2="CONFIG_PROG_UBOOT2"\0" \ + "prog_os1="CONFIG_PROG_OS1"\0" \ + "prog_os2="CONFIG_PROG_OS2"\0" \ + "prog_fdt1="CONFIG_PROG_FDT1"\0" \ + "prog_fdt2="CONFIG_PROG_FDT2"\0" \ + "bootcmd_net=run set_bootargs; "CONFIG_BOOT_OS_NET"\0" \ + "bootcmd_flash1=run set_bootargs; bootm "CONFIG_OS1_FLASH_ADDR_STR" - "CONFIG_FDT1_FLASH_ADDR_STR"\0" \ + "bootcmd_flash2=run set_bootargs; bootm "CONFIG_OS2_FLASH_ADDR_STR" - "CONFIG_FDT2_FLASH_ADDR_STR"\0" \ + "bootcmd=run bootcmd_flash1\0" +#endif /* __CONFIG_H */ -- 1.6.0.2.GIT ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 3/3] XPedite5370 board support 2008-10-23 22:23 ` [U-Boot] [PATCH 3/3] XPedite5370 board support Peter Tyser @ 2008-10-24 23:21 ` Andy Fleming 2008-10-25 0:30 ` Peter Tyser 2008-11-18 21:44 ` Wolfgang Denk 1 sibling, 1 reply; 20+ messages in thread From: Andy Fleming @ 2008-10-24 23:21 UTC (permalink / raw) To: u-boot On Thu, Oct 23, 2008 at 5:23 PM, Peter Tyser <ptyser@xes-inc.com> wrote: > Initial support for Extreme Engineering Solutions XPedite5370 - > a MPC8572-based 3U VPX single board computer with a PMC/XMC > site. > > Signed-off-by: Peter Tyser <ptyser@xes-inc.com> > --- > MAINTAINERS | 3 + > MAKEALL | 1 + > Makefile | 3 + > board/xes/common/Makefile | 56 ++++ > board/xes/common/fsl_8572_clk.c | 51 +++ > board/xes/common/fsl_85xx_ddr.c | 93 ++++++ > board/xes/common/fsl_85xx_pci.c | 287 +++++++++++++++++ Could you take a look at the new PCI code Kumar submitted (which I just applied), and rework the board code to imitate that code (it should be a trivial change, but one that makes things cleaner) > +int board_early_init_r(void) > +{ > + const unsigned int flashbase = CONFIG_SYS_FLASH_BASE2; > + int i; > + > + /* Initialize PCA9557 devices */ > + pca953x_set_pol(CONFIG_SYS_I2C_PCA953X_ADDR0, 0xff, 0); > + pca953x_set_pol(CONFIG_SYS_I2C_PCA953X_ADDR1, 0xff, 0); > + pca953x_set_pol(CONFIG_SYS_I2C_PCA953X_ADDR0, 0xff, 0); > + pca953x_set_pol(CONFIG_SYS_I2C_PCA953X_ADDR0, 0xff, 0); > + > + /* Invalidate flash region */ > + for (i = 0; i < 256 * 1024 * 1024; i += 32) { > + asm volatile ("dcbi %0,%1": : "b" (flashbase), "r" (i)); > + asm volatile ("icbi %0,%1": : "b" (flashbase), "r" (i)); > + } Take a look at the current 8572DS code for doing this. By mapping things correctly, you can use dcbf, and not have to go through the entire memory space of your flash. Otherwise, it looks good to me. Andy ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 3/3] XPedite5370 board support 2008-10-24 23:21 ` Andy Fleming @ 2008-10-25 0:30 ` Peter Tyser 0 siblings, 0 replies; 20+ messages in thread From: Peter Tyser @ 2008-10-25 0:30 UTC (permalink / raw) To: u-boot > > board/xes/common/fsl_8572_clk.c | 51 +++ > > board/xes/common/fsl_85xx_ddr.c | 93 ++++++ > > board/xes/common/fsl_85xx_pci.c | 287 +++++++++++++++++ > > > Could you take a look at the new PCI code Kumar submitted (which I > just applied), and rework the board code to imitate that code (it > should be a trivial change, but one that makes things cleaner) > > > + /* Invalidate flash region */ > > + for (i = 0; i < 256 * 1024 * 1024; i += 32) { > > + asm volatile ("dcbi %0,%1": : "b" (flashbase), "r" (i)); > > + asm volatile ("icbi %0,%1": : "b" (flashbase), "r" (i)); > > + } > > > Take a look at the current 8572DS code for doing this. By mapping > things correctly, you can use dcbf, and not have to go through the > entire memory space of your flash. > Thanks for the comments Andy. I'll make the changes you referenced as well as a tiny bit of aesthetic cleanup to XPEDITE5370.h and resubmit on Monday. Peter ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 3/3] XPedite5370 board support 2008-10-23 22:23 ` [U-Boot] [PATCH 3/3] XPedite5370 board support Peter Tyser 2008-10-24 23:21 ` Andy Fleming @ 2008-11-18 21:44 ` Wolfgang Denk 2008-11-18 22:13 ` Peter Tyser 1 sibling, 1 reply; 20+ messages in thread From: Wolfgang Denk @ 2008-11-18 21:44 UTC (permalink / raw) To: u-boot Dear Peter Tyser, In message <1224800639-31350-4-git-send-email-ptyser@xes-inc.com> you wrote: > > Initial support for Extreme Engineering Solutions XPedite5370 - > a MPC8572-based 3U VPX single board computer with a PMC/XMC > site. ... > diff --git a/board/xes/common/fsl_85xx_ddr.c b/board/xes/common/fsl_85xx_ddr.c > new file mode 100644 > index 0000000..30b4767 > --- /dev/null > +++ b/board/xes/common/fsl_85xx_ddr.c ... > + puts(" ("); > + > +#if (CONFIG_NUM_DDR_CONTROLLERS > 1) > + /* Print interleaving information */ > + if (ddr1->cs0_config & 0x20000000) { > + switch ((ddr1->cs0_config >> 24) & 0xf) { > + case 0: > + puts("cache line"); > + break; > + case 1: > + puts("page"); > + break; > + case 2: > + puts("bank"); > + break; > + case 3: > + puts("super-bank"); > + break; > + default: > + puts("invalid"); > + break; > + } > + } else { > + puts("no"); > + } > + > + puts(" interleaving"); > +#endif > + > +#if (CONFIG_NUM_DDR_CONTROLLERS > 1) && defined(CONFIG_DDR_ECC) > + puts(", "); > +#endif > + > +#if defined(CONFIG_DDR_ECC) > + puts("ECC enabled"); > +#endif > + > + puts(")"); Please don't be too noisy. Turn this into debug() calls. > diff --git a/board/xes/common/fsl_85xx_pci.c b/board/xes/common/fsl_85xx_pci.c > new file mode 100644 > index 0000000..12437be > --- /dev/null > +++ b/board/xes/common/fsl_85xx_pci.c ... > + if (width && !(devdisr & MPC85xx_DEVDISR_PCIE)) { > + printf("\n PCIE1 connected as %s (x%d)", > + host ? "Root Complex" : "End Point", width); Alignment not by TAB. > + if (pci->pme_msg_det) { > + pci->pme_msg_det = 0xffffffff; > + debug(" with errors. Clearing. Now 0x%08x", > + pci->pme_msg_det); Alignment not by TAB. > + } > + printf("\n"); > + > + /* inbound */ > + pci_set_region(hose->regions + 0, > + CONFIG_SYS_PCI_MEMORY_BUS, > + CONFIG_SYS_PCI_MEMORY_PHYS, > + CONFIG_SYS_PCI_MEMORY_SIZE, > + PCI_REGION_MEM | PCI_REGION_MEMORY); Alignment not by TAB. And so on. > diff --git a/board/xes/xpedite5370/xpedite5370.c b/board/xes/xpedite5370/xpedite5370.c > new file mode 100644 > index 0000000..3526172 > --- /dev/null > +++ b/board/xes/xpedite5370/xpedite5370.c ... > + /* Print boot dev and swap flash flash chip selects if booted from 2nd > + * flash. Swapping chip selects presents user with a common memory > + * map regardless of which flash was booted from. */ Multiline comment style. > + flash_sel = !((pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) & > + CONFIG_SYS_PCA953X_C0_FLASH_PASS_CS)); > + printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1); Please be less noisy! s/printf/debug/ > +#define CONFIG_EXTRA_ENV_SETTINGS \ > + "autoload=yes\0" \ > + "download_cmd=tftp\0" \ > + "console_args=console=ttyS0,115200\0" \ > + "root_args=root=/dev/nfs rw\0" \ > + "misc_args=ip=on\0" \ > + "set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \ > + "bootfile=/home/user/file\0" \ > + "osfile=/home/user/uImage-XPedite5370\0" \ > + "fdtfile=/home/user/xpedite5370.dtb\0" \ > + "ubootfile=/home/user/u-boot.bin\0" \ > + "fdtaddr=c00000\0" \ > + "osaddr=0x1000000\0" \ > + "loadaddr=0x1000000\0" \ > + "prog_uboot1="CONFIG_PROG_UBOOT1"\0" \ > + "prog_uboot2="CONFIG_PROG_UBOOT2"\0" \ > + "prog_os1="CONFIG_PROG_OS1"\0" \ > + "prog_os2="CONFIG_PROG_OS2"\0" \ > + "prog_fdt1="CONFIG_PROG_FDT1"\0" \ > + "prog_fdt2="CONFIG_PROG_FDT2"\0" \ > + "bootcmd_net=run set_bootargs; "CONFIG_BOOT_OS_NET"\0" \ > + "bootcmd_flash1=run set_bootargs; bootm "CONFIG_OS1_FLASH_ADDR_STR" - "CONFIG_FDT1_FLASH_ADDR_STR"\0" \ > + "bootcmd_flash2=run set_bootargs; bootm "CONFIG_OS2_FLASH_ADDR_STR" - "CONFIG_FDT2_FLASH_ADDR_STR"\0" \ > + "bootcmd=run bootcmd_flash1\0" > +#endif /* __CONFIG_H */ Alignment not by TAB, lines way too long. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Nothing ever becomes real until it is experienced. - John Keats ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 3/3] XPedite5370 board support 2008-11-18 21:44 ` Wolfgang Denk @ 2008-11-18 22:13 ` Peter Tyser 2008-11-18 22:20 ` Wolfgang Denk 0 siblings, 1 reply; 20+ messages in thread From: Peter Tyser @ 2008-11-18 22:13 UTC (permalink / raw) To: u-boot On Tue, 2008-11-18 at 22:44 +0100, Wolfgang Denk wrote: > Dear Peter Tyser, > > In message <1224800639-31350-4-git-send-email-ptyser@xes-inc.com> you wrote: > > > > Initial support for Extreme Engineering Solutions XPedite5370 - > > a MPC8572-based 3U VPX single board computer with a PMC/XMC > > site. > ... > > > diff --git a/board/xes/common/fsl_85xx_ddr.c b/board/xes/common/fsl_85xx_ddr.c > > new file mode 100644 > > index 0000000..30b4767 > > --- /dev/null > > +++ b/board/xes/common/fsl_85xx_ddr.c > ... > > + puts(" ("); > > + > > +#if (CONFIG_NUM_DDR_CONTROLLERS > 1) > > + /* Print interleaving information */ > > + if (ddr1->cs0_config & 0x20000000) { > > + switch ((ddr1->cs0_config >> 24) & 0xf) { > > + case 0: > > + puts("cache line"); > > + break; > > + case 1: > > + puts("page"); > > + break; > > + case 2: > > + puts("bank"); > > + break; > > + case 3: > > + puts("super-bank"); > > + break; > > + default: > > + puts("invalid"); > > + break; > > + } > > + } else { > > + puts("no"); > > + } > > + > > + puts(" interleaving"); > > +#endif > > + > > +#if (CONFIG_NUM_DDR_CONTROLLERS > 1) && defined(CONFIG_DDR_ECC) > > + puts(", "); > > +#endif > > + > > +#if defined(CONFIG_DDR_ECC) > > + puts("ECC enabled"); > > +#endif > > + > > + puts(")"); > > Please don't be too noisy. Turn this into debug() calls. This information is very useful to a customer and doesn't add much as far as output. No newlines at least. The output also prints information which is configurable. I think giving the user feedback about how they have the board configured is useful. We have the standard Freescale DDR printf's turned into debug as that is much, much more verbose than the output above. > > diff --git a/board/xes/common/fsl_85xx_pci.c b/board/xes/common/fsl_85xx_pci.c > > new file mode 100644 > > index 0000000..12437be > > --- /dev/null > > +++ b/board/xes/common/fsl_85xx_pci.c > ... > > + if (width && !(devdisr & MPC85xx_DEVDISR_PCIE)) { > > + printf("\n PCIE1 connected as %s (x%d)", > > + host ? "Root Complex" : "End Point", width); > > Alignment not by TAB. Ok. > > + if (pci->pme_msg_det) { > > + pci->pme_msg_det = 0xffffffff; > > + debug(" with errors. Clearing. Now 0x%08x", > > + pci->pme_msg_det); > > Alignment not by TAB. > > > + } > > + printf("\n"); > > + > > + /* inbound */ > > + pci_set_region(hose->regions + 0, > > + CONFIG_SYS_PCI_MEMORY_BUS, > > + CONFIG_SYS_PCI_MEMORY_PHYS, > > + CONFIG_SYS_PCI_MEMORY_SIZE, > > + PCI_REGION_MEM | PCI_REGION_MEMORY); > > Alignment not by TAB. > > And so on. > > > diff --git a/board/xes/xpedite5370/xpedite5370.c b/board/xes/xpedite5370/xpedite5370.c > > new file mode 100644 > > index 0000000..3526172 > > --- /dev/null > > +++ b/board/xes/xpedite5370/xpedite5370.c > ... > > + /* Print boot dev and swap flash flash chip selects if booted from 2nd > > + * flash. Swapping chip selects presents user with a common memory > > + * map regardless of which flash was booted from. */ > > Multiline comment style. Will fix. > > + flash_sel = !((pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) & > > + CONFIG_SYS_PCA953X_C0_FLASH_PASS_CS)); > > + printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1); > > Please be less noisy! s/printf/debug/ This information is also very useful to a customer. > > +#define CONFIG_EXTRA_ENV_SETTINGS \ > > + "autoload=yes\0" \ > > + "download_cmd=tftp\0" \ > > + "console_args=console=ttyS0,115200\0" \ > > + "root_args=root=/dev/nfs rw\0" \ > > + "misc_args=ip=on\0" \ > > + "set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \ > > + "bootfile=/home/user/file\0" \ > > + "osfile=/home/user/uImage-XPedite5370\0" \ > > + "fdtfile=/home/user/xpedite5370.dtb\0" \ > > + "ubootfile=/home/user/u-boot.bin\0" \ > > + "fdtaddr=c00000\0" \ > > + "osaddr=0x1000000\0" \ > > + "loadaddr=0x1000000\0" \ > > + "prog_uboot1="CONFIG_PROG_UBOOT1"\0" \ > > + "prog_uboot2="CONFIG_PROG_UBOOT2"\0" \ > > + "prog_os1="CONFIG_PROG_OS1"\0" \ > > + "prog_os2="CONFIG_PROG_OS2"\0" \ > > + "prog_fdt1="CONFIG_PROG_FDT1"\0" \ > > + "prog_fdt2="CONFIG_PROG_FDT2"\0" \ > > + "bootcmd_net=run set_bootargs; "CONFIG_BOOT_OS_NET"\0" \ > > + "bootcmd_flash1=run set_bootargs; bootm "CONFIG_OS1_FLASH_ADDR_STR" - "CONFIG_FDT1_FLASH_ADDR_STR"\0" \ > > + "bootcmd_flash2=run set_bootargs; bootm "CONFIG_OS2_FLASH_ADDR_STR" - "CONFIG_FDT2_FLASH_ADDR_STR"\0" \ > > + "bootcmd=run bootcmd_flash1\0" > > +#endif /* __CONFIG_H */ > > Alignment not by TAB, lines way too long. What are you referring to as far as "Alignment not by TAB"? Everyone's config file breaks the 80 column rule, is this really necessary to change? I think splitting it up makes an already confusing define even more confusing. Thanks, Peter ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 3/3] XPedite5370 board support 2008-11-18 22:13 ` Peter Tyser @ 2008-11-18 22:20 ` Wolfgang Denk 2008-11-18 22:39 ` Peter Tyser 0 siblings, 1 reply; 20+ messages in thread From: Wolfgang Denk @ 2008-11-18 22:20 UTC (permalink / raw) To: u-boot Dear Peter Tyser, In message <1227046406.3065.49.camel@localhost.localdomain> you wrote: > > This information is very useful to a customer and doesn't add much as > far as output. No newlines at least. The output also prints > information which is configurable. I think giving the user feedback > about how they have the board configured is useful. You really need this level of detail only for board bring up and debugging. After that, this is a constand and never changes, right? Si it is normally enough to print the RAM size (and eventually some speed characteristics). > We have the standard Freescale DDR printf's turned into debug as that is > much, much more verbose than the output above. Indeed :-( > > > + flash_sel = !((pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) & > > > + CONFIG_SYS_PCA953X_C0_FLASH_PASS_CS)); > > > + printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1); > > > > Please be less noisy! s/printf/debug/ > > This information is also very useful to a customer. Is it, really? well... > > > +#define CONFIG_EXTRA_ENV_SETTINGS \ > > > + "autoload=yes\0" \ ... > > > + "prog_fdt2="CONFIG_PROG_FDT2"\0" \ > > > + "bootcmd_net=run set_bootargs; "CONFIG_BOOT_OS_NET"\0" \ > > > + "bootcmd_flash1=run set_bootargs; bootm "CONFIG_OS1_FLASH_ADDR_STR" - "CONFIG_FDT1_FLASH_ADDR_STR"\0" \ > > > + "bootcmd_flash2=run set_bootargs; bootm "CONFIG_OS2_FLASH_ADDR_STR" - "CONFIG_FDT2_FLASH_ADDR_STR"\0" \ > > > + "bootcmd=run bootcmd_flash1\0" > > > +#endif /* __CONFIG_H */ > > > > Alignment not by TAB, lines way too long. > > What are you referring to as far as "Alignment not by TAB"? You indent the lines by a single space, but they should be indented by a TAB. > Everyone's config file breaks the 80 column rule, is this really > necessary to change? I think splitting it up makes an already confusing > define even more confusing. At least the ';' is a good place to split. And you might check if it really makes sense to use variable names with 25 characters like "CONFIG_OS2_FLASH_ADDR_STR" (no, it doesn't). Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "In Christianity neither morality nor religion come into contact with reality at any point." - Friedrich Nietzsche ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 3/3] XPedite5370 board support 2008-11-18 22:20 ` Wolfgang Denk @ 2008-11-18 22:39 ` Peter Tyser 2008-11-18 23:03 ` Wolfgang Denk 2008-11-19 17:29 ` Jon Loeliger 0 siblings, 2 replies; 20+ messages in thread From: Peter Tyser @ 2008-11-18 22:39 UTC (permalink / raw) To: u-boot On Tue, 2008-11-18 at 23:20 +0100, Wolfgang Denk wrote: > Dear Peter Tyser, > > In message <1227046406.3065.49.camel@localhost.localdomain> you wrote: > > > > This information is very useful to a customer and doesn't add much as > > far as output. No newlines at least. The output also prints > > information which is configurable. I think giving the user feedback > > about how they have the board configured is useful. > > You really need this level of detail only for board bring up and > debugging. After that, this is a constand and never changes, right? Si > it is normally enough to print the RAM size (and eventually some speed > characteristics). User's can change the DDR configuration with the "memctl_intlv_ctl" and "ba_intlv_ctl". I don't imagine they'll fuss with those variable much, but they should certainly be aware if they do, or change one by accident, etc. Different board configs do/don't have ECC (same product, different build options), so I think the ECC info is also useful to a customer as they may have multiple boards with different configs. > > We have the standard Freescale DDR printf's turned into debug as that is > > much, much more verbose than the output above. > > Indeed :-( > > > > > + flash_sel = !((pca953x_get_val(CONFIG_SYS_I2C_PCA953X_ADDR0) & > > > > + CONFIG_SYS_PCA953X_C0_FLASH_PASS_CS)); > > > > + printf("FLASH: Executed from FLASH%d\n", flash_sel ? 2 : 1); > > > > > > Please be less noisy! s/printf/debug/ > > > > This information is also very useful to a customer. > > Is it, really? well... > > > > > +#define CONFIG_EXTRA_ENV_SETTINGS \ > > > > + "autoload=yes\0" \ > ... > > > > + "prog_fdt2="CONFIG_PROG_FDT2"\0" \ > > > > + "bootcmd_net=run set_bootargs; "CONFIG_BOOT_OS_NET"\0" \ > > > > + "bootcmd_flash1=run set_bootargs; bootm "CONFIG_OS1_FLASH_ADDR_STR" - "CONFIG_FDT1_FLASH_ADDR_STR"\0" \ > > > > + "bootcmd_flash2=run set_bootargs; bootm "CONFIG_OS2_FLASH_ADDR_STR" - "CONFIG_FDT2_FLASH_ADDR_STR"\0" \ > > > > + "bootcmd=run bootcmd_flash1\0" > > > > +#endif /* __CONFIG_H */ > > > > > > Alignment not by TAB, lines way too long. > > > > What are you referring to as far as "Alignment not by TAB"? > > You indent the lines by a single space, but they should be indented by > a TAB. Many boards I look at don't use TABS. In particular Freescale reference platforms. Many boards even have different amounts of spaces:) I don't see the value of indentation in this case as it doesn't increase readability and just makes already long lines even longer. > > Everyone's config file breaks the 80 column rule, is this really > > necessary to change? I think splitting it up makes an already confusing > > define even more confusing. > > At least the ';' is a good place to split. And you might check if it > really makes sense to use variable names with 25 characters like > "CONFIG_OS2_FLASH_ADDR_STR" (no, it doesn't). That define is no longer than the standard CONFIG_EXTRA_ENV_SETTINGS define that its used in, or any number of other standard defines. And they aren't used anywhere other than this 40 line section of code in 1 file. I thought the increase in clarity of long defines made up for their ugliness. I'll go ahead and split the lines on the ';' as you suggested. You have the final say, so if any of the above are sticking points to getting the code accepted let me know and I'll change them as requested. Thanks, Peter ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 3/3] XPedite5370 board support 2008-11-18 22:39 ` Peter Tyser @ 2008-11-18 23:03 ` Wolfgang Denk 2008-11-19 17:29 ` Jon Loeliger 1 sibling, 0 replies; 20+ messages in thread From: Wolfgang Denk @ 2008-11-18 23:03 UTC (permalink / raw) To: u-boot Dear Peter Tyser, In message <1227047989.3065.73.camel@localhost.localdomain> you wrote: > > > You indent the lines by a single space, but they should be indented by > > a TAB. > > Many boards I look at don't use TABS. In particular Freescale reference > platforms. Many boards even have different amounts of spaces:) I don't The fact that earlier submissions pased less strict revierws is nop excuse or reason to accept code that violated the Coding Style requirements. On contrary - if you are aware of such Coding Style problems, then patches to fix these are highly appreciated. > That define is no longer than the standard CONFIG_EXTRA_ENV_SETTINGS > define that its used in, or any number of other standard defines. And > they aren't used anywhere other than this 40 line section of code in 1 > file. I thought the increase in clarity of long defines made up for > their ugliness. I'll go ahead and split the lines on the ';' as you > suggested. PLease re-read the Coding Style requirements, especially "Chapter 4: Naming". > You have the final say, so if any of the above are sticking points to > getting the code accepted let me know and I'll change them as requested. I wouldn't have mentioned it here if I didn't care about it. Thanks. Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de A little suffering is good for the soul. -- Kirk, "The Corbomite Maneuver", stardate 1514.0 ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 3/3] XPedite5370 board support 2008-11-18 22:39 ` Peter Tyser 2008-11-18 23:03 ` Wolfgang Denk @ 2008-11-19 17:29 ` Jon Loeliger 2008-11-19 18:00 ` Peter Tyser 1 sibling, 1 reply; 20+ messages in thread From: Jon Loeliger @ 2008-11-19 17:29 UTC (permalink / raw) To: u-boot Peter Tyser wrote: >>> We have the standard Freescale DDR printf's turned into debug as that is >>> much, much more verbose than the output above. >> Indeed :-( Hrm. Out of curiosity, which printf()s do you find noisy? > Many boards I look at don't use TABS. In particular Freescale reference > platforms. Many boards even have different amounts of spaces:) I don't > see the value of indentation in this case as it doesn't increase > readability and just makes already long lines even longer. Really? Which ones? We should clean those up! Thanks, jdl ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 3/3] XPedite5370 board support 2008-11-19 17:29 ` Jon Loeliger @ 2008-11-19 18:00 ` Peter Tyser 0 siblings, 0 replies; 20+ messages in thread From: Peter Tyser @ 2008-11-19 18:00 UTC (permalink / raw) To: u-boot Hi Jon, On Wed, 2008-11-19 at 11:29 -0600, Jon Loeliger wrote: > Peter Tyser wrote: > > >>> We have the standard Freescale DDR printf's turned into debug as that is > >>> much, much more verbose than the output above. > >> Indeed :-( > > Hrm. Out of curiosity, which printf()s do you find noisy? There are some printf()s related to chip/bank interleaving in cpu/mpc8xxx/main.c: printf("\nMemory controller interleaving enabled: "); printf("Cache-line interleaving!\n"); printf("Bank(chip-select) interleaving enabled: "); printf("CS0+CS1 and CS2+CS3\n"); I do think the info is useful, just a bit wordy (and are the !'s necessary:). With those printfs in main.c enabled, there could be 4 printf lines on bootup related to DDR - clocking, size, and 2 for interleaving. > > Many boards I look at don't use TABS. In particular Freescale reference > > platforms. Many boards even have different amounts of spaces:) I don't > > see the value of indentation in this case as it doesn't increase > > readability and just makes already long lines even longer. > > Really? Which ones? We should clean those up! The MPC8548CDS and MPC8349EMDS headers were the 2 I looked at that had inconsistent spacing, but I didn't look all that thoroughly. An 'ls include/configs/MPC* | xargs grep -i "^\ \+\""' should show the boards which don't use proper indentation for the environment variables in general. So much cleanup, so little time:) Best, Peter ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device 2008-10-23 22:23 ` [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device Peter Tyser 2008-10-23 22:23 ` [U-Boot] [PATCH 3/3] XPedite5370 board support Peter Tyser @ 2008-11-18 21:37 ` Wolfgang Denk 2008-11-18 21:57 ` Peter Tyser 1 sibling, 1 reply; 20+ messages in thread From: Wolfgang Denk @ 2008-11-18 21:37 UTC (permalink / raw) To: u-boot Dear Peter Tyser, In message <1224800639-31350-3-git-send-email-ptyser@xes-inc.com> you wrote: > Initial support for the DS4510, a CPU supervisor with > integrated EEPROM, SRAM, and 4 programmable non-volatile > GPIO pins. The CONFIG_DS4510 define enables support > for the device while the CONFIG_CMD_DS4510 define > enables the ds4510 command. > > Signed-off-by: Peter Tyser <ptyser@xes-inc.com> > --- > README | 2 + > drivers/gpio/Makefile | 1 + > drivers/gpio/ds4510.c | 344 +++++++++++++++++++++++++++++++++++++++++++++++++ > include/gpio/ds4510.h | 75 +++++++++++ > 4 files changed, 422 insertions(+), 0 deletions(-) > create mode 100644 drivers/gpio/ds4510.c > create mode 100644 include/gpio/ds4510.h This should go to devices/i2c/ > + /* This delay isn't needed for SRAM writes but shouldn't delay > + * things too much, so do it unconditionally for simplicity */ Please fix multiline comment style. > +int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) > +{ ... > + case 4: > + val = simple_strtoul(argv[3], NULL, 16); > + > + if (strcmp(argv[2], "nv") == 0) > + return ds4510_see_write(chip, val); > + else if (strcmp(argv[2], "rstdelay") == 0) > + return ds4510_rstdelay_write(chip, val); > + else if (strcmp(argv[2], "input") == 0) > + return (ds4510_gpio_read_val(chip) & (1 << val)) != 0; > + break; We have generic code for processing multiple command selections. Please use that. > + case 5: ... > + if (strcmp(argv[2], "output") == 0) { > + tmp = ds4510_gpio_read(chip); > + if (val) > + tmp |= (1 << pin); > + else > + tmp &= ~(1 << pin); > + return ds4510_gpio_write(chip, tmp); > + } else if (strcmp(argv[2], "pullup") == 0) { Ditto. > + case 7: ... > + if (strcmp(argv[3], "read") == 0) > + rw_func = ds4510_mem_read; > + else if (strcmp(argv[3], "write") == 0) > + rw_func = ds4510_mem_write; > + else > + break; > + > + if (strcmp(argv[2], "eeprom") == 0) { > + end = DS4510_EEPROM + DS4510_EEPROM_SIZE; > + off += DS4510_EEPROM; > + } else if (strcmp(argv[2], "seeprom") == 0) { > + end = DS4510_SEEPROM + DS4510_SEEPROM_SIZE; > + off += DS4510_SEEPROM; > + } else if (strcmp(argv[2], "sram") == 0) { > + end = DS4510_SRAM + DS4510_SRAM_SIZE; > + off += DS4510_SRAM; > + } else { > + break; > + } Ditto. > +U_BOOT_CMD( > + ds4510, 7, 2, do_ds4510, > + "ds4510 - ds4510 eeprom/seeprom/sram/gpio access\n", > + "chip info\n" > + " - display ds4510 info\n" > + "ds4510 chip nv 0|1\n" > + " - make gpio and seeprom writes volatile/non-volatile\n" > + "ds4510 chip rstdelay 0-3\n" > + " - set reset output delay\n" > + "ds4510 chip output pin 0|1\n" > + " - set pin low or high-Z\n" > + "ds4510 chip input pin\n" > + " - read value of pin\n" > + "ds4510 chip pullup pin 0|1\n" > + " - disable/enable pullup on specified pin\n" > + "ds4510 chip eeprom read addr off cnt\n" > + "ds4510 chip eeprom write addr off cnt\n" > + " - read/write 'cnt' bytes at EEPROM offset 'off'\n" > + "ds4510 chip seeprom read addr off cnt\n" > + "ds4510 chip seeprom write addr off cnt\n" > + " - read/write 'cnt' bytes at SRAM-shadowed EEPROM offset 'off'\n" > + "ds4510 chip sram read addr off cnt\n" > + "ds4510 chip sram write addr off cnt\n" > + " - read/write 'cnt' bytes at SRAM offset 'off'\n" Why do we need the "chip" argument? It just adds typing... Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de You speak of courage. Obviously you do not know the difference bet- ween courage and foolhardiness. Always it is the brave ones who die, the soldiers. -- Kor, the Klingon Commander, "Errand of Mercy", stardate 3201.7 ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device 2008-11-18 21:37 ` [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device Wolfgang Denk @ 2008-11-18 21:57 ` Peter Tyser 2008-11-18 23:16 ` Wolfgang Denk 0 siblings, 1 reply; 20+ messages in thread From: Peter Tyser @ 2008-11-18 21:57 UTC (permalink / raw) To: u-boot On Tue, 2008-11-18 at 22:37 +0100, Wolfgang Denk wrote: > Dear Peter Tyser, > > In message <1224800639-31350-3-git-send-email-ptyser@xes-inc.com> you wrote: > > Initial support for the DS4510, a CPU supervisor with > > integrated EEPROM, SRAM, and 4 programmable non-volatile > > GPIO pins. The CONFIG_DS4510 define enables support > > for the device while the CONFIG_CMD_DS4510 define > > enables the ds4510 command. > > > > Signed-off-by: Peter Tyser <ptyser@xes-inc.com> > > --- > > README | 2 + > > drivers/gpio/Makefile | 1 + > > drivers/gpio/ds4510.c | 344 +++++++++++++++++++++++++++++++++++++++++++++++++ > > include/gpio/ds4510.h | 75 +++++++++++ > > 4 files changed, 422 insertions(+), 0 deletions(-) > > create mode 100644 drivers/gpio/ds4510.c > > create mode 100644 include/gpio/ds4510.h > > This should go to devices/i2c/ I'm assuming you're referring to drivers/i2c. I was under the impression the driver/i2c directory was only for drivers which controller I2C buses (similar to drivers/i2c/busses in Linux), not actual I2C chip device drivers. I don't currently see any other I2C chip drivers in there and didn't want to be the first to add one:) I agree that the ds4510 doesn't fit in the GPIO category well. How about drivers/misc? If I'm mistaken about what is supposed to go in drivers/i2c let me know and I'll move it in there. > > + /* This delay isn't needed for SRAM writes but shouldn't delay > > + * things too much, so do it unconditionally for simplicity */ > > Please fix multiline comment style. Will do. > > > +int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) > > +{ > ... > > + case 4: > > + val = simple_strtoul(argv[3], NULL, 16); > > + > > + if (strcmp(argv[2], "nv") == 0) > > + return ds4510_see_write(chip, val); > > + else if (strcmp(argv[2], "rstdelay") == 0) > > + return ds4510_rstdelay_write(chip, val); > > + else if (strcmp(argv[2], "input") == 0) > > + return (ds4510_gpio_read_val(chip) & (1 << val)) != 0; > > + break; > > We have generic code for processing multiple command selections. > Please use that. Will do. > > + case 5: > ... > > + if (strcmp(argv[2], "output") == 0) { > > + tmp = ds4510_gpio_read(chip); > > + if (val) > > + tmp |= (1 << pin); > > + else > > + tmp &= ~(1 << pin); > > + return ds4510_gpio_write(chip, tmp); > > + } else if (strcmp(argv[2], "pullup") == 0) { > > Ditto. > > > + case 7: > ... > > + if (strcmp(argv[3], "read") == 0) > > + rw_func = ds4510_mem_read; > > + else if (strcmp(argv[3], "write") == 0) > > + rw_func = ds4510_mem_write; > > + else > > + break; > > + > > + if (strcmp(argv[2], "eeprom") == 0) { > > + end = DS4510_EEPROM + DS4510_EEPROM_SIZE; > > + off += DS4510_EEPROM; > > + } else if (strcmp(argv[2], "seeprom") == 0) { > > + end = DS4510_SEEPROM + DS4510_SEEPROM_SIZE; > > + off += DS4510_SEEPROM; > > + } else if (strcmp(argv[2], "sram") == 0) { > > + end = DS4510_SRAM + DS4510_SRAM_SIZE; > > + off += DS4510_SRAM; > > + } else { > > + break; > > + } > > Ditto. > > > +U_BOOT_CMD( > > + ds4510, 7, 2, do_ds4510, > > + "ds4510 - ds4510 eeprom/seeprom/sram/gpio access\n", > > + "chip info\n" > > + " - display ds4510 info\n" > > + "ds4510 chip nv 0|1\n" > > + " - make gpio and seeprom writes volatile/non-volatile\n" > > + "ds4510 chip rstdelay 0-3\n" > > + " - set reset output delay\n" > > + "ds4510 chip output pin 0|1\n" > > + " - set pin low or high-Z\n" > > + "ds4510 chip input pin\n" > > + " - read value of pin\n" > > + "ds4510 chip pullup pin 0|1\n" > > + " - disable/enable pullup on specified pin\n" > > + "ds4510 chip eeprom read addr off cnt\n" > > + "ds4510 chip eeprom write addr off cnt\n" > > + " - read/write 'cnt' bytes at EEPROM offset 'off'\n" > > + "ds4510 chip seeprom read addr off cnt\n" > > + "ds4510 chip seeprom write addr off cnt\n" > > + " - read/write 'cnt' bytes at SRAM-shadowed EEPROM offset 'off'\n" > > + "ds4510 chip sram read addr off cnt\n" > > + "ds4510 chip sram write addr off cnt\n" > > + " - read/write 'cnt' bytes at SRAM offset 'off'\n" > > Why do we need the "chip" argument? It just adds typing... In theory more than 1 chip could be on a board. The chip uses an address pin pull up/down to determine the device's i2c address. Thanks, Peter ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device 2008-11-18 21:57 ` Peter Tyser @ 2008-11-18 23:16 ` Wolfgang Denk 0 siblings, 0 replies; 20+ messages in thread From: Wolfgang Denk @ 2008-11-18 23:16 UTC (permalink / raw) To: u-boot Dear Peter Tyser, In message <1227045436.3065.32.camel@localhost.localdomain> you wrote: > > > > create mode 100644 drivers/gpio/ds4510.c > > > create mode 100644 include/gpio/ds4510.h > > > > This should go to devices/i2c/ > > I'm assuming you're referring to drivers/i2c. I was under the Right. > impression the driver/i2c directory was only for drivers which > controller I2C buses (similar to drivers/i2c/busses in Linux), not > actual I2C chip device drivers. I don't currently see any other I2C > chip drivers in there and didn't want to be the first to add one:) Ah yes, you are right again. Hm... > I agree that the ds4510 doesn't fit in the GPIO category well. How > about drivers/misc? If I'm mistaken about what is supposed to go in > drivers/i2c let me know and I'll move it in there. I think drivers/misc/ is probably the best place we have at the moment, indeed. > > > + "ds4510 - ds4510 eeprom/seeprom/sram/gpio access\n", > > > + "chip info\n" > > > + " - display ds4510 info\n" > > > + "ds4510 chip nv 0|1\n" > > > + " - make gpio and seeprom writes volatile/non-volatile\n" > > > + "ds4510 chip rstdelay 0-3\n" > > > + " - set reset output delay\n" > > > + "ds4510 chip output pin 0|1\n" > > > + " - set pin low or high-Z\n" > > > + "ds4510 chip input pin\n" > > > + " - read value of pin\n" > > > + "ds4510 chip pullup pin 0|1\n" > > > + " - disable/enable pullup on specified pin\n" > > > + "ds4510 chip eeprom read addr off cnt\n" > > > + "ds4510 chip eeprom write addr off cnt\n" > > > + " - read/write 'cnt' bytes at EEPROM offset 'off'\n" > > > + "ds4510 chip seeprom read addr off cnt\n" > > > + "ds4510 chip seeprom write addr off cnt\n" > > > + " - read/write 'cnt' bytes at SRAM-shadowed EEPROM offset 'off'\n" > > > + "ds4510 chip sram read addr off cnt\n" > > > + "ds4510 chip sram write addr off cnt\n" > > > + " - read/write 'cnt' bytes at SRAM offset 'off'\n" > > > > Why do we need the "chip" argument? It just adds typing... > > In theory more than 1 chip could be on a board. The chip uses an > address pin pull up/down to determine the device's i2c address. We should follow the model used elsewhere, then, i. e. add a "ds4510 dev" command which can display and select a "current" device that then gets used in all commands unless you explicitely switch to a new device (or bus - please keep in mind that we can have multiple I2C busses as well). Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de EMACS belongs in <sys/errno.h>: Editor too big! ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices 2008-10-23 22:23 ` [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices Peter Tyser 2008-10-23 22:23 ` [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device Peter Tyser @ 2008-11-18 21:33 ` Wolfgang Denk 2008-11-18 21:51 ` Peter Tyser 1 sibling, 1 reply; 20+ messages in thread From: Wolfgang Denk @ 2008-11-18 21:33 UTC (permalink / raw) To: u-boot Dear Peter Tyser, In message <1224800639-31350-2-git-send-email-ptyser@xes-inc.com> you wrote: > Initial support for NXP's 4 and 8 bit I2C gpio expanders > (eg pca9537, pca9557, etc). The CONFIG_PCA953X define > enables support for the devices while the CONFIG_CMD_PCA953X > define enables the pca953x command. I'm not sure if we need such a detailed level of access to these chips. We already have a couple of similar I/O expanders in some boards, for example implemente in some PICs. See for example the "pic read" / "pic write" conde in board/lwmon/lwmon.c etc. I think we should generalize this - and more than read / write isn't really needed, or is it? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Virtue is a relative term. -- Spock, "Friday's Child", stardate 3499.1 ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices 2008-11-18 21:33 ` [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices Wolfgang Denk @ 2008-11-18 21:51 ` Peter Tyser 2008-11-18 23:11 ` Wolfgang Denk 0 siblings, 1 reply; 20+ messages in thread From: Peter Tyser @ 2008-11-18 21:51 UTC (permalink / raw) To: u-boot Hi Wolfgang, On Tue, 2008-11-18 at 22:33 +0100, Wolfgang Denk wrote: > Dear Peter Tyser, > > In message <1224800639-31350-2-git-send-email-ptyser@xes-inc.com> you wrote: > > Initial support for NXP's 4 and 8 bit I2C gpio expanders > > (eg pca9537, pca9557, etc). The CONFIG_PCA953X define > > enables support for the devices while the CONFIG_CMD_PCA953X > > define enables the pca953x command. > > I'm not sure if we need such a detailed level of access to these > chips. We already have a couple of similar I/O expanders in some > boards, for example implemente in some PICs. See for example the "pic > read" / "pic write" conde in board/lwmon/lwmon.c etc. > > I think we should generalize this - and more than read / write isn't > really needed, or is it? What do you mean by "we should generalize this"? I view the read/write/invert commands as necessary to easily configure/read/write the GPIO pins, and the info command is nice, but not necessary. The info command is nice to get an idea of what's going on at a high level - eg is the input on pin 2 being inverted? What pins are currently being driven low? etc. I've found the iopinfo command useful for the 82xx boards and tried to replicate similar functionality in this driver. I like the info command but understand if others want it removed. Let me know if you'd like me to change it. Thanks, Peter ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices 2008-11-18 21:51 ` Peter Tyser @ 2008-11-18 23:11 ` Wolfgang Denk 0 siblings, 0 replies; 20+ messages in thread From: Wolfgang Denk @ 2008-11-18 23:11 UTC (permalink / raw) To: u-boot Dear Peter Tyser, In message <1227045075.3065.25.camel@localhost.localdomain> you wrote: > > > I'm not sure if we need such a detailed level of access to these > > chips. We already have a couple of similar I/O expanders in some > > boards, for example implemente in some PICs. See for example the "pic > > read" / "pic write" conde in board/lwmon/lwmon.c etc. > > > > I think we should generalize this - and more than read / write isn't > > really needed, or is it? > > What do you mean by "we should generalize this"? Cre4ate a common version of the code that can be used in all of these boards. > I view the read/write/invert commands as necessary to easily > configure/read/write the GPIO pins, and the info command is nice, but > not necessary. I never needed an invert command yet, but it probably doesn't hurt either, and so does info. > The info command is nice to get an idea of what's going on at a high > level - eg is the input on pin 2 being inverted? What pins are > currently being driven low? etc. I've found the iopinfo command useful > for the 82xx boards and tried to replicate similar functionality in this > driver. I like the info command but understand if others want it > removed. Don't remove it, but maybe make it a selectable option so those who like it can include it while others that are tryting to minimize the memory footprint don't suffer from it. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Bradley's Bromide: If computers get too powerful, we can organize them into a committee - that will do them in. ^ permalink raw reply [flat|nested] 20+ messages in thread
* [U-Boot] [PATCH 0/3] Support for XPedite5370 and misc GPIO 2008-10-23 22:23 [U-Boot] [PATCH 0/3] Support for XPedite5370 and misc GPIO Peter Tyser 2008-10-23 22:23 ` [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices Peter Tyser @ 2008-11-18 21:29 ` Wolfgang Denk 1 sibling, 0 replies; 20+ messages in thread From: Wolfgang Denk @ 2008-11-18 21:29 UTC (permalink / raw) To: u-boot Dear Peter Tyser, In message <1224800639-31350-1-git-send-email-ptyser@xes-inc.com> you wrote: > > This patch series adds support for the XPedite5370 SBC. > Its an MPC8572-based VPX card with a PMC/XMC site. The > XPedite5370 includes a significant number of I2C GPIO devices (5) > which are used for board configuration. I added support for > 2 new I2C gpio devices in a new drivers/gpio directory. I'm > not sure if this is the preferred location/method, so let me know I think it would be better to add these to drivers/i2c instead. > if others have have different preferences. It'd be nice to have a > more generic GPIO framework (like Linux's) at some point, but Agreed, but U-Boot is a bootloader, and small is beatiful :-) And this is not just a few GPIO pins, but I2C devices, right? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de The management question ... is not _whether_ to build a pilot system and throw it away. You _will_ do that. The only question is whether to plan in advance to build a throwaway, or to promise to deliver the throwaway to customers. - Fred Brooks, "The Mythical Man Month" ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2008-11-19 18:00 UTC | newest] Thread overview: 20+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-10-23 22:23 [U-Boot] [PATCH 0/3] Support for XPedite5370 and misc GPIO Peter Tyser 2008-10-23 22:23 ` [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices Peter Tyser 2008-10-23 22:23 ` [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device Peter Tyser 2008-10-23 22:23 ` [U-Boot] [PATCH 3/3] XPedite5370 board support Peter Tyser 2008-10-24 23:21 ` Andy Fleming 2008-10-25 0:30 ` Peter Tyser 2008-11-18 21:44 ` Wolfgang Denk 2008-11-18 22:13 ` Peter Tyser 2008-11-18 22:20 ` Wolfgang Denk 2008-11-18 22:39 ` Peter Tyser 2008-11-18 23:03 ` Wolfgang Denk 2008-11-19 17:29 ` Jon Loeliger 2008-11-19 18:00 ` Peter Tyser 2008-11-18 21:37 ` [U-Boot] [PATCH 2/3] Add support for Maxim's DS4510 I2C device Wolfgang Denk 2008-11-18 21:57 ` Peter Tyser 2008-11-18 23:16 ` Wolfgang Denk 2008-11-18 21:33 ` [U-Boot] [PATCH 1/3] Add support for PCA953x I2C gpio devices Wolfgang Denk 2008-11-18 21:51 ` Peter Tyser 2008-11-18 23:11 ` Wolfgang Denk 2008-11-18 21:29 ` [U-Boot] [PATCH 0/3] Support for XPedite5370 and misc GPIO 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.