[U-Boot] [PATCH v2 0/3] Add Bluewater Systems Snapper 9260/9G20 module support

[U-Boot] [PATCH v2 0/3] Add Bluewater Systems Snapper 9260/9G20 module support

[Ryan Mallon]

Add support for Bluewater Systems Snapper9260/9G20 modules. The 
modules are based on the AT91SAM9260 and AT91SAM9G20 processors
respectively and support NAND flash and Ethernet.

This patches apply against the rework101229 branch of 
git://git.denx.de/u-boot-atmel.git.

Changes since v1:
 - Updated for recent at91 changes
 - Use CONFIG_AT91FAMILY in soft_i2c driver
 - Fixed missing snapper9260.h config file
 - Add config to boards.cfg not Makefile
 - Removed config.mk (now in snapper9260.h)

Ryan Mallon (3):
  Fix at91 includes in soft_i2c driver
  Add support for Bluewater Systems Snapper 9260 and 9G20 modules
  Add Bluewater Systems Snapper 9260 and 9G20 modules to top-level
    boards.cfg

 board/bluewater/snapper9260/Makefile      |   53 ++++++++
 board/bluewater/snapper9260/snapper9260.c |  169 +++++++++++++++++++++++++
 boards.cfg                                |    2 +
 drivers/i2c/soft_i2c.c                    |    4 +-
 include/configs/snapper9260.h             |  191 +++++++++++++++++++++++++++++
 5 files changed, 416 insertions(+), 3 deletions(-)
 create mode 100644 board/bluewater/snapper9260/Makefile
 create mode 100644 board/bluewater/snapper9260/snapper9260.c
 create mode 100644 include/configs/snapper9260.h

[U-Boot] [PATCH v2 1/3] Fix at91 includes in soft_i2c driver

[Ryan Mallon]

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
---
 drivers/i2c/soft_i2c.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index 1a1809a..d3803a2 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -30,9 +30,7 @@
 #include <ioports.h>
 #include <asm/io.h>
 #endif
-#if defined(CONFIG_AT91RM9200) || \
-	defined(CONFIG_AT91SAM9260) ||  defined(CONFIG_AT91SAM9261) || \
-	defined(CONFIG_AT91SAM9263)
+#if defined(CONFIG_AT91RM9200) || defined(CONFIG_AT91FAMILY)
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pio.h>
-- 
1.7.0.4

[U-Boot] [PATCH v2 2/3] Add support for Bluewater Systems Snapper 9260 and 9G20 modules

[Ryan Mallon]

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
---
 board/bluewater/snapper9260/Makefile      |   53 ++++++++
 board/bluewater/snapper9260/snapper9260.c |  169 +++++++++++++++++++++++++
 include/configs/snapper9260.h             |  191 +++++++++++++++++++++++++++++
 3 files changed, 413 insertions(+), 0 deletions(-)
 create mode 100644 board/bluewater/snapper9260/Makefile
 create mode 100644 board/bluewater/snapper9260/snapper9260.c
 create mode 100644 include/configs/snapper9260.h

diff --git a/board/bluewater/snapper9260/Makefile b/board/bluewater/snapper9260/Makefile
new file mode 100644
index 0000000..4fccdaa
--- /dev/null
+++ b/board/bluewater/snapper9260/Makefile
@@ -0,0 +1,53 @@
+#
+# (C) Copyright 2003-2008
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# (C) Copyright 2011 Bluewater Systems
+# Ryan Mallon <ryan@bluewatersys.com>
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS-y	+= snapper9260.o
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS-y))
+SOBJS	:= $(addprefix $(obj),$(SOBJS))
+
+$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
+	$(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+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/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c
new file mode 100644
index 0000000..6bb2ee0
--- /dev/null
+++ b/board/bluewater/snapper9260/snapper9260.c
@@ -0,0 +1,169 @@
+/*
+ * Bluewater Systems Snapper 9260/9G20 modules
+ *
+ * (C) Copyright 2011 Bluewater Systems
+ *   Author: Andre Renaud <andre@bluewatersys.com>
+ *   Author: Ryan Mallon <ryan@bluewatersys.com>
+ *
+ * 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/io.h>
+#include <asm/arch/at91sam9260_matrix.h>
+#include <asm/arch/at91sam9_smc.h>
+#include <asm/arch/at91_common.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_rstc.h>
+#include <asm/arch/gpio.h>
+#include <net.h>
+#include <netdev.h>
+#include <i2c.h>
+#include <pca953x.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* IO Expander pins */
+#define IO_EXP_ETH_RESET	(0 << 1)
+#define IO_EXP_ETH_POWER	(1 << 1)
+
+static void macb_hw_init(void)
+{
+	struct at91_pmc *pmc   = (struct at91_pmc  *)ATMEL_BASE_PMC;
+	struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA;
+	struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC;
+	unsigned long erstl;
+
+	/* Enable clock */
+	writel(1 << ATMEL_ID_EMAC0, &pmc->pcer);
+
+	/* Disable pull-ups to prevent PHY going into test mode */
+	writel(pin_to_mask(AT91_PIN_PA14) |
+	       pin_to_mask(AT91_PIN_PA15) |
+	       pin_to_mask(AT91_PIN_PA18),
+	       &pioa->pudr);
+
+	/* Power down ethernet */
+	pca953x_set_dir(0x28, IO_EXP_ETH_POWER, PCA953X_DIR_OUT);
+	pca953x_set_val(0x28, IO_EXP_ETH_POWER, 1);
+
+	/* Hold ethernet in reset */
+	pca953x_set_dir(0x28, IO_EXP_ETH_RESET, PCA953X_DIR_OUT);
+	pca953x_set_val(0x28, IO_EXP_ETH_RESET, 0);
+
+	/* Enable ethernet power */
+	pca953x_set_val(0x28, IO_EXP_ETH_POWER, 0);
+
+	/* Need to reset PHY -> 500ms reset */
+	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
+	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(13) | 
+	       AT91_RSTC_MR_URSTEN, &rstc->mr);
+	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
+
+	/* Wait for end hardware reset */
+	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL))
+		;
+
+	/* Restore NRST value */
+	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN, &rstc->mr);
+
+	/* Bring the ethernet out of reset */
+	pca953x_set_val(0x28, IO_EXP_ETH_RESET, 1);
+
+	/* The phy internal reset take 21ms */
+	udelay(21 * 1000);
+
+	/* Re-enable pull-up */
+	writel(pin_to_mask(AT91_PIN_PA14) |
+	       pin_to_mask(AT91_PIN_PA15) |
+	       pin_to_mask(AT91_PIN_PA18),
+	       &pioa->puer);
+
+	at91_macb_hw_init();
+}
+
+static void nand_hw_init(void)
+{
+	struct at91_smc *smc       = (struct at91_smc    *)ATMEL_BASE_SMC;
+	struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
+	unsigned long csa;
+
+	/* Enable CS3 as NAND/SmartMedia */
+	csa = readl(&matrix->ebicsa);
+	csa |= AT91_MATRIX_CS3A_SMC_SMARTMEDIA;
+	writel(csa, &matrix->ebicsa);
+
+	/* Configure SMC CS3 for NAND/SmartMedia */
+	writel(AT91_SMC_SETUP_NWE(2) | AT91_SMC_SETUP_NCS_WR(0) |
+	       AT91_SMC_SETUP_NRD(2) | AT91_SMC_SETUP_NCS_RD(0),
+	       &smc->cs[3].setup);
+	writel(AT91_SMC_PULSE_NWE(4) | AT91_SMC_PULSE_NCS_WR(4) |
+	       AT91_SMC_PULSE_NRD(4) | AT91_SMC_PULSE_NCS_RD(4),
+	       &smc->cs[3].pulse);
+	writel(AT91_SMC_CYCLE_NWE(7) | AT91_SMC_CYCLE_NRD(7),
+	       &smc->cs[3].cycle);
+	writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
+	       AT91_SMC_MODE_EXNW_DISABLE |
+	       AT91_SMC_MODE_DBW_8 |
+	       AT91_SMC_MODE_TDF_CYCLE(3),
+	       &smc->cs[3].mode);
+
+	/* Configure RDY/BSY */
+	at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1);
+
+	/* Enable NandFlash */
+	at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
+}
+
+int board_init(void)
+{
+	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
+
+	/* Enable PIO clocks */
+	writel((1 << ATMEL_ID_PIOA) |
+	       (1 << ATMEL_ID_PIOB) |
+	       (1 << ATMEL_ID_PIOC), &pmc->pcer);
+
+	/* The mach-type is the same for both Snapper 9260 and 9G20 */
+	gd->bd->bi_arch_number = MACH_TYPE_SNAPPER_9260;
+
+	/* Address of boot parameters */
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+
+	/* Initialise peripherals */
+	at91_seriald_hw_init();
+	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	nand_hw_init();
+	macb_hw_init();
+
+	return 0;
+}
+
+int board_eth_init(bd_t *bis)
+{
+	return macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, 0x1f);
+}
+
+int dram_init(void)
+{
+	gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+				    CONFIG_SYS_SDRAM_SIZE);
+	return 0;
+}
+
+void reset_phy(void)
+{
+}
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
new file mode 100644
index 0000000..753be77
--- /dev/null
+++ b/include/configs/snapper9260.h
@@ -0,0 +1,191 @@
+/*
+ * Bluewater Systems Snapper 9260 and 9G20 modules
+ * 
+ * (C) Copyright 2011 Bluewater Systems
+ *   Author: Andre Renaud <andre@bluewatersys.com>
+ *   Author: Ryan Mallon <ryan@bluewatersys.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+/* SoC type is defined in boards.cfg */
+#include <asm/hardware.h>
+#include <asm/sizes.h>
+
+#define CONFIG_SYS_TEXT_BASE		0x23f00000
+
+/* ARM asynchronous clock */
+#define CONFIG_SYS_AT91_MAIN_CLOCK	18432000 /* External Crystal, in Hz */
+#define CONFIG_SYS_AT91_SLOW_CLOCK	32768
+#define CONFIG_SYS_HZ 			1000
+
+/* CPU */
+#define CONFIG_ARCH_CPU_INIT
+#undef CONFIG_USE_IRQ
+
+#define CONFIG_CMDLINE_TAG		1 /* enable passing of ATAGs	*/
+#define CONFIG_SETUP_MEMORY_TAGS	1
+#define CONFIG_INITRD_TAG		1
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SKIP_RELOCATE_UBOOT
+#define CONFIG_DISPLAY_CPUINFO  	1
+#define CONFIG_FIT			1
+
+/* SDRAM */
+#define CONFIG_NR_DRAM_BANKS		1
+#define CONFIG_SYS_SDRAM_BASE		ATMEL_BASE_CS1
+#define CONFIG_SYS_SDRAM_SIZE		SZ_64M
+#define CONFIG_SYS_INIT_SP_ADDR		(ATMEL_BASE_SRAM1 + 0x1000 - \
+					 GENERATED_GBL_DATA_SIZE)
+
+/* Mem test settings */
+#define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
+#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE + SZ_1M)
+
+/* NAND Flash */
+#define CONFIG_NAND_ATMEL
+#define CONFIG_SYS_NO_FLASH		1
+#define CONFIG_SYS_MAX_NAND_DEVICE	1
+#define CONFIG_SYS_NAND_BASE		ATMEL_BASE_CS3
+#define CONFIG_SYS_NAND_DBW_8		1
+#define CONFIG_SYS_NAND_MASK_ALE	(1 << 21) /* AD21 */
+#define CONFIG_SYS_NAND_MASK_CLE	(1 << 22) /* AD22 */
+#define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PC14
+#define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC13
+
+/* Ethernet */
+#define CONFIG_MACB			1
+#define CONFIG_RMII			1
+#define CONFIG_NET_MULTI		1
+#define CONFIG_NET_RETRY_COUNT		20
+#define CONFIG_RESET_PHY_R		1
+#define CONFIG_TFTP_PORT
+#define CONFIG_TFTP_TSIZE
+
+/* USB */
+#define CONFIG_USB_ATMEL
+#define CONFIG_USB_OHCI_NEW		1
+#define CONFIG_DOS_PARTITION		1
+#define CONFIG_SYS_USB_OHCI_CPU_INIT	1
+#define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_UHP_BASE
+#define CONFIG_SYS_USB_OHCI_SLOT_NAME	"at91sam9260"
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
+#define CONFIG_USB_STORAGE		1
+
+/* GPIOs and IO expander */
+#define CONFIG_AT91_LEGACY
+#define CONFIG_ATMEL_LEGACY
+#define CONFIG_AT91_GPIO
+#define CONFIG_AT91_GPIO_PULLUP		1
+#define CONFIG_PCA953X
+#define CONFIG_SYS_I2C_PCA953X_ADDR	0x28
+#define CONFIG_SYS_I2C_PCA953X_WIDTH	{{0x28, 16}}
+
+/* UARTs/Serial console */
+#define CONFIG_ATMEL_USART
+#define CONFIG_USART_BASE		ATMEL_BASE_DBGU
+#define CONFIG_USART_ID			ATMEL_ID_SYS
+#define CONFIG_BAUDRATE			115200
+#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
+#define CONFIG_SYS_PROMPT		"Snapper> "
+
+/* I2C - Bit-bashed */
+#define CONFIG_SOFT_I2C			1
+#define CONFIG_SYS_I2C_SPEED		100000
+#define CONFIG_SYS_I2C_SLAVE		0x7F
+#define CONFIG_SOFT_I2C_READ_REPEATED_START 1
+#define CONFIG_I2C_MULTI_BUS		1
+#define I2C_INIT do {							\
+		at91_set_gpio_output(AT91_PIN_PA23, 1);			\
+		at91_set_gpio_output(AT91_PIN_PA24, 1);			\
+		at91_set_pio_multi_drive(AT91_PIO_PORTA, 23, 1);	\
+		at91_set_pio_multi_drive(AT91_PIO_PORTA, 24, 1);	\
+	} while (0)
+#define I2C_SOFT_DECLARATIONS           
+#define I2C_ACTIVE
+#define I2C_TRISTATE	at91_set_gpio_input(AT91_PIN_PA23, 1);
+#define I2C_READ	at91_get_gpio_value(AT91_PIN_PA23);
+#define I2C_SDA(bit) do {						\
+		if (bit) {						\
+			at91_set_gpio_input(AT91_PIN_PA23, 1);		\
+		} else {						\
+			at91_set_gpio_output(AT91_PIN_PA23, 1);		\
+			at91_set_gpio_value(AT91_PIN_PA23, bit);	\
+		}							\
+	} while (0)
+#define I2C_SCL(bit)	at91_set_pio_value(AT91_PIO_PORTA, 24, bit)
+#define I2C_DELAY	udelay(2)
+
+/* Boot options */
+#define CONFIG_SYS_LOAD_ADDR		0x23000000
+#define CONFIG_BOOTDELAY		3
+#define CONFIG_ZERO_BOOTDELAY_CHECK
+
+#define CONFIG_BOOTP_BOOTFILESIZE	1
+#define CONFIG_BOOTP_BOOTPATH		1
+#define CONFIG_BOOTP_GATEWAY		1
+#define CONFIG_BOOTP_HOSTNAME		1
+
+/* Environment settings */
+#define CONFIG_ENV_IS_IN_NAND		1
+#define CONFIG_ENV_OFFSET		SZ_512K
+#define CONFIG_ENV_SIZE			SZ_256K
+#define CONFIG_ENV_OVERWRITE
+#define CONFIG_BOOTARGS			"console=ttyS0,115200 ip=any"
+
+/* Console settings */
+#define CONFIG_SYS_CBSIZE		256
+#define CONFIG_SYS_MAXARGS		16
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE +		\
+					 sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_LONGHELP		1
+#define CONFIG_SYS_EXTBDINFO		1
+#define CONFIG_CMDLINE_EDITING		1
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
+
+/* U-Boot memory settings */
+#define CONFIG_SYS_MALLOC_LEN		SZ_1M
+#define CONFIG_STACKSIZE		SZ_256K
+
+/* Command line configuration */
+#include <config_cmd_default.h>
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_IMI
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_SOURCE
+
+#define CONFIG_CMD_PING			1
+#define CONFIG_CMD_DHCP			1
+#define CONFIG_CMD_FAT			1
+#define CONFIG_CMD_I2C		        1
+#define CONFIG_CMD_GPIO			1
+#define CONFIG_CMD_USB			1
+#define CONFIG_CMD_MII			1
+#define CONFIG_CMD_NAND			1
+#define CONFIG_CMD_PCA953X		1
+#define CONFIG_CMD_PCA953X_INFO		1
+
+#endif /* __CONFIG_H */
-- 
1.7.0.4

[U-Boot] [PATCH v2 3/3] Add Bluewater Systems Snapper 9260 and 9G20 modules to top-level boards.cfg

[Ryan Mallon]

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
---
 boards.cfg |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/boards.cfg b/boards.cfg
index 9b15026..370ab02 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -113,6 +113,8 @@ imx27lite                    arm         arm926ejs   imx27lite           logicpd
 magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27
 omap5912osk                  arm         arm926ejs   -                   ti             omap
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
+snapper9260                  arm         arm926ejs   -                   bluewater      at91        snapper9260:AT91SAM9260
+snapper9g20                  arm         arm926ejs   snapper9260         bluewater      at91        snapper9260:AT91SAM9G20
 ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
 mx51evk                      arm         armv7       mx51evk             freescale      mx5
 vision2                      arm         armv7       vision2             ttcontrol      mx5
-- 
1.7.0.4

[U-Boot] [PATCH v2 1/3] Fix at91 includes in soft_i2c driver

[Wolfgang Denk]

Dear Heiko & Reinhard,

In message <7bc3ea96fb41d5e41ac53281d77d3158bffd3b21.1295995460.git.ryan@bluewatersys.com> Ryan Mallon  wrote:
> 
> Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
> ---
>  drivers/i2c/soft_i2c.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)

I think this one goes through as a bug fix, i. e. for the upcoming
release.

The other patches of this series go into next.

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
Stupidity, like virtue, is its own reward.

[U-Boot] [PATCH v2 2/3] Add support for Bluewater Systems Snapper 9260 and 9G20 modules

[Wolfgang Denk]

Dear Ryan Mallon,

In message <e3e679839f735fff180547840a3fe3cec2b1d535.1295995460.git.ryan@bluewatersys.com> you wrote:
> 
> Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
> ---
>  board/bluewater/snapper9260/Makefile      |   53 ++++++++
>  board/bluewater/snapper9260/snapper9260.c |  169 +++++++++++++++++++++++++
>  include/configs/snapper9260.h             |  191 +++++++++++++++++++++++++++++
>  3 files changed, 413 insertions(+), 0 deletions(-)
>  create mode 100644 board/bluewater/snapper9260/Makefile
>  create mode 100644 board/bluewater/snapper9260/snapper9260.c
>  create mode 100644 include/configs/snapper9260.h

Entry to MAINTAINERS and boards.cfg missing.

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
"Ja, mach' nur einen Plan,    sei nur ein grosses Licht
und mach' dann noch 'nen zweiten Plan,    geh'n tun sie beide nicht."
                                     -- Bert Brecht, Dreigroschenoper

[U-Boot] [PATCH v2 3/3] Add Bluewater Systems Snapper 9260 and 9G20 modules to top-level boards.cfg

[Wolfgang Denk]

Dear Ryan Mallon,

In message <b31f9ead63a567931f8dbf5170bbd34a4adb2612.1295995460.git.ryan@bluewatersys.com> you wrote:
> 
> Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
> ---
>  boards.cfg |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)

This needs to be folded into previous patch.

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
As in certain cults it is possible to kill a process if you know  its
true name.                      -- Ken Thompson and Dennis M. Ritchie

[U-Boot] [PATCH v2 1/3] Fix at91 includes in soft_i2c driver

[Heiko Schocher]

Hello Wolfgang and Reinhard,

Wolfgang Denk wrote:
> Dear Heiko & Reinhard,
> 
> In message <7bc3ea96fb41d5e41ac53281d77d3158bffd3b21.1295995460.git.ryan@bluewatersys.com> Ryan Mallon  wrote:
>> Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
>> ---
>>  drivers/i2c/soft_i2c.c |    4 +---
>>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> I think this one goes through as a bug fix, i. e. for the upcoming
> release.
> 
> The other patches of this series go into next.

Ok. Reinhard? Do you pick up this patch? If so, I give my:

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [PATCH v2 1/3] Fix at91 includes in soft_i2c driver

[Reinhard Meyer]

Dear Heiko Schocher,
> Hello Wolfgang and Reinhard,
>
> Wolfgang Denk wrote:
>> Dear Heiko&  Reinhard,
>>
>> In message<7bc3ea96fb41d5e41ac53281d77d3158bffd3b21.1295995460.git.ryan@bluewatersys.com>  Ryan Mallon  wrote:
>>> Signed-off-by: Ryan Mallon<ryan@bluewatersys.com>
>>> ---
>>>   drivers/i2c/soft_i2c.c |    4 +---
>>>   1 files changed, 1 insertions(+), 3 deletions(-)
>>
>> I think this one goes through as a bug fix, i. e. for the upcoming
>> release.
>>
>> The other patches of this series go into next.
>
> Ok. Reinhard? Do you pick up this patch? If so, I give my:
>
> Acked-by: Heiko Schocher<hs@denx.de>

I was going to complain that it was not alphabetically sorted as I suggested to him,
however I am now considering to remove the AT91RM9200 case altogether.
That one has to be forced into AT91FAMILY.

Once corrected, I will pickup this patch then.

Best Regards,
Reinhard

[U-Boot] [PATCH v2 2/3] Add support for Bluewater Systems Snapper 9260 and 9G20 modules

[Reinhard Meyer]

Dear Wolfgang Denk,
> Dear Ryan Mallon,
>
> In message<e3e679839f735fff180547840a3fe3cec2b1d535.1295995460.git.ryan@bluewatersys.com>  you wrote:
>>
>> Signed-off-by: Ryan Mallon<ryan@bluewatersys.com>
>> ---
>>   board/bluewater/snapper9260/Makefile      |   53 ++++++++
>>   board/bluewater/snapper9260/snapper9260.c |  169 +++++++++++++++++++++++++
>>   include/configs/snapper9260.h             |  191 +++++++++++++++++++++++++++++
>>   3 files changed, 413 insertions(+), 0 deletions(-)
>>   create mode 100644 board/bluewater/snapper9260/Makefile
>>   create mode 100644 board/bluewater/snapper9260/snapper9260.c
>>   create mode 100644 include/configs/snapper9260.h
>
> Entry to MAINTAINERS and boards.cfg missing.

I am already engaged into this. There are minor coding issues involved,
I will comment on them later.

Best Regards,
Reinhard

[U-Boot] [PATCH v2 1/3] Fix at91 includes in soft_i2c driver

[Heiko Schocher]

Hello Reinhard,

Reinhard Meyer wrote:
> Dear Heiko Schocher,
>> Hello Wolfgang and Reinhard,
>>
>> Wolfgang Denk wrote:
>>> Dear Heiko&  Reinhard,
>>>
>>> In
>>> message<7bc3ea96fb41d5e41ac53281d77d3158bffd3b21.1295995460.git.ryan@bluewatersys.com> 
>>> Ryan Mallon  wrote:
>>>> Signed-off-by: Ryan Mallon<ryan@bluewatersys.com>
>>>> ---
>>>>   drivers/i2c/soft_i2c.c |    4 +---
>>>>   1 files changed, 1 insertions(+), 3 deletions(-)
>>>
>>> I think this one goes through as a bug fix, i. e. for the upcoming
>>> release.
>>>
>>> The other patches of this series go into next.
>>
>> Ok. Reinhard? Do you pick up this patch? If so, I give my:
>>
>> Acked-by: Heiko Schocher<hs@denx.de>
> 
> I was going to complain that it was not alphabetically sorted as I
> suggested to him,
> however I am now considering to remove the AT91RM9200 case altogether.
> That one has to be forced into AT91FAMILY.
> 
> Once corrected, I will pickup this patch then.

Ok, thanks!

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [PATCH v2 1/3] Fix at91 includes in soft_i2c driver

[Reinhard Meyer]

Dear Ryan Mellon, dear Heiko Schocher:
>>>>> Signed-off-by: Ryan Mallon<ryan@bluewatersys.com>
>>>>> ---
>>>>>   drivers/i2c/soft_i2c.c |    4 +---
>>>>>   1 files changed, 1 insertions(+), 3 deletions(-)
>>>>
>>>> I think this one goes through as a bug fix, i. e. for the upcoming
>>>> release.
>>>>
>>>> The other patches of this series go into next.
>>>
>>> Ok. Reinhard? Do you pick up this patch? If so, I give my:
>>>
>>> Acked-by: Heiko Schocher<hs@denx.de>
>>
>> I was going to complain that it was not alphabetically sorted as I
>> suggested to him,
>> however I am now considering to remove the AT91RM9200 case altogether.
>> That one has to be forced into AT91FAMILY.
>>
>> Once corrected, I will pickup this patch then.

I made up my mind, it should only test for AT91FAMILY.

AT91RM9200 is supposed to join AT91FAMILY anyway, so lets do this correctly right now.

#if defined(CONFIG_AT91FAMILY)

If its done that way, here is my
Acked-by: Reinhard Meyer<u-boot@emk-elektronik.de>

Ryan, can you please change it as such, and preferably post it as a separate
patch (not with your new board)? So Heiko can pick it up and make it go as a
bug fix to mainline faster than I could do it right now through the "atmel" tree.

Best Regards,
Reinhard

[U-Boot] [PATCH v2 1/3] Fix at91 includes in soft_i2c driver

[Andreas Bießmann]

Dear Reinhard Meyer,

Am 26.01.2011 um 09:18 schrieb Reinhard Meyer:

> Dear Ryan Mellon, dear Heiko Schocher:
>>>>>> Signed-off-by: Ryan Mallon<ryan@bluewatersys.com>
>>>>>> ---
>>>>>>  drivers/i2c/soft_i2c.c |    4 +---
>>>>>>  1 files changed, 1 insertions(+), 3 deletions(-)
>>>>> 
>>>>> I think this one goes through as a bug fix, i. e. for the upcoming
>>>>> release.
>>>>> 
>>>>> The other patches of this series go into next.
>>>> 
>>>> Ok. Reinhard? Do you pick up this patch? If so, I give my:
>>>> 
>>>> Acked-by: Heiko Schocher<hs@denx.de>
>>> 
>>> I was going to complain that it was not alphabetically sorted as I
>>> suggested to him,
>>> however I am now considering to remove the AT91RM9200 case altogether.
>>> That one has to be forced into AT91FAMILY.
>>> 
>>> Once corrected, I will pickup this patch then.
> 
> I made up my mind, it should only test for AT91FAMILY.
> 
> AT91RM9200 is supposed to join AT91FAMILY anyway, so lets do this correctly right now.

that is the plan ...

> #if defined(CONFIG_AT91FAMILY)

regards

Andreas Bie?mann

[U-Boot] [PATCH v2 2/3] Add support for Bluewater Systems Snapper 9260 and 9G20 modules

[Ryan Mallon]

On 01/26/2011 08:40 PM, Reinhard Meyer wrote:
> Dear Wolfgang Denk,
>> Dear Ryan Mallon,
>>
>> In
>> message<e3e679839f735fff180547840a3fe3cec2b1d535.1295995460.git.ryan@bluewatersys.com> 
>> you wrote:
>>>
>>> Signed-off-by: Ryan Mallon<ryan@bluewatersys.com>
>>> ---
>>>   board/bluewater/snapper9260/Makefile      |   53 ++++++++
>>>   board/bluewater/snapper9260/snapper9260.c |  169
>>> +++++++++++++++++++++++++
>>>   include/configs/snapper9260.h             |  191
>>> +++++++++++++++++++++++++++++
>>>   3 files changed, 413 insertions(+), 0 deletions(-)
>>>   create mode 100644 board/bluewater/snapper9260/Makefile
>>>   create mode 100644 board/bluewater/snapper9260/snapper9260.c
>>>   create mode 100644 include/configs/snapper9260.h
>>
>> Entry to MAINTAINERS and boards.cfg missing.
> 
> I am already engaged into this. There are minor coding issues involved,
> I will comment on them later.

Hi Reinhard,

Did you have any additional changes you want made for the
Snapper9260/9G20 patches other than adding a MAINTAINERS entry and
rolling the boards.cfg change into a single patch?

Thanks,
~Ryan

-- 
Bluewater Systems Ltd - ARM Technology Solution Centre

Ryan Mallon         		5 Amuri Park, 404 Barbadoes St
ryan at bluewatersys.com         	PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com	New Zealand
Phone: +64 3 3779127		Freecall: Australia 1800 148 751
Fax:   +64 3 3779135			  USA 1800 261 2934

[U-Boot] [PATCH v2 2/3] Add support for Bluewater Systems Snapper 9260 and 9G20 modules

[Reinhard Meyer]

Dear Ryan Mallon,
> Did you have any additional changes you want made for the
> Snapper9260/9G20 patches other than adding a MAINTAINERS entry and
> rolling the boards.cfg change into a single patch?

Yes, the following things should be changed:

1. sort the boards.cfg entry to the right place.
See top of boards.cfg for the rules.
bluewater would be between atmel and emk ;)

2. #define SOMETHING 1. The "1" is depreciated if it serves no numeric
meaning. Remove them in your board config.
(Make sure the white space goes as well)

3. SZ_* macros are depreciated. Use numeric values. (256 << 20) is
preferred to denote 256MiB.

Sorry I had no time to look deeper into details, but it looked good otherwise.

Can you confirm that the code builds and runs after the changes?
I can't verify the "runs" part...

Best Regards,
Reinhard