]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 13 Mar 2014 17:32:26 +0000 (18:32 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 13 Mar 2014 17:32:26 +0000 (18:32 +0100)
25 files changed:
arch/arm/cpu/armv7/am33xx/board.c
board/BuR/kwb/board.c
board/gateworks/gw_ventana/Makefile [new file with mode: 0644]
board/gateworks/gw_ventana/README [new file with mode: 0644]
board/gateworks/gw_ventana/clocks.cfg [new file with mode: 0644]
board/gateworks/gw_ventana/gsc.c [new file with mode: 0644]
board/gateworks/gw_ventana/gsc.h [new file with mode: 0644]
board/gateworks/gw_ventana/gw_ventana.c [new file with mode: 0644]
board/gateworks/gw_ventana/gw_ventana.cfg [new file with mode: 0644]
board/gateworks/gw_ventana/ventana_eeprom.h [new file with mode: 0644]
board/siemens/dxr2/board.c
board/wandboard/wandboard.c
boards.cfg
drivers/net/cpsw.c
drivers/power/pmic/Makefile
drivers/power/pmic/pmic_pfuze100.c [new file with mode: 0644]
drivers/spi/omap3_spi.c
include/configs/am335x_evm.h
include/configs/cm_t35.h
include/configs/gw_ventana.h [new file with mode: 0644]
include/configs/mx25pdk.h
include/linux/fb.h
include/mmc.h
include/phy.h
include/power/pfuze100_pmic.h [new file with mode: 0644]

index 2b15a64667bac7a26ade84955da935349a0b08c2..fb44cc8290aaf33cb8c7d1e1496eabc537e70ec9 100644 (file)
@@ -202,6 +202,7 @@ static void watchdog_disable(void)
 }
 #endif
 
+#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
 void s_init(void)
 {
        /*
@@ -220,22 +221,19 @@ void s_init(void)
 #ifdef CONFIG_SPL_BUILD
        save_omap_boot_params();
 #endif
-#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
        watchdog_disable();
        timer_init();
        set_uart_mux_conf();
        setup_clocks_for_console();
        uart_soft_reset();
-#endif
 #ifdef CONFIG_NOR_BOOT
        gd->baudrate = CONFIG_BAUDRATE;
        serial_init();
        gd->have_console = 1;
-#else
+#elif defined(CONFIG_SPL_BUILD)
        gd = &gdata;
        preloader_console_init();
 #endif
-#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
        prcm_init();
        set_mux_conf_regs();
 #if defined(CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC)
@@ -243,8 +241,8 @@ void s_init(void)
        rtc32k_enable();
 #endif
        sdram_init();
-#endif
 }
+#endif
 
 #ifndef CONFIG_SYS_DCACHE_OFF
 void enable_caches(void)
index 8aa16bcf808986850d4fdd02c67d33f0461fbcfd..804765a8de9b7866780f99ae39422c6f712efc84 100644 (file)
@@ -120,7 +120,7 @@ void am33xx_spl_board_init(void)
 
        /* power-ON  3V3 via Resetcontroller */
        oldspeed = i2c_get_bus_speed();
-       if (0 != i2c_set_bus_speed(CONFIG_SYS_OMAP24_I2C_SPEED_PSOC)) {
+       if (i2c_set_bus_speed(CONFIG_SYS_OMAP24_I2C_SPEED_PSOC) >= 0) {
                buf = RSTCTRL_FORCE_PWR_NEN;
                i2c_write(RSTCTRL_ADDR, RSTCTRL_CTRLREG, 1,
                          (uint8_t *)&buf, sizeof(buf));
@@ -221,7 +221,7 @@ int board_late_init(void)
                           TPS65217_WLEDCTRL1, 0x09, 0xFF);
        /* write bootinfo into scratchregister of resetcontroller */
        oldspeed = i2c_get_bus_speed();
-       if (0 != i2c_set_bus_speed(CONFIG_SYS_OMAP24_I2C_SPEED_PSOC)) {
+       if (i2c_set_bus_speed(CONFIG_SYS_OMAP24_I2C_SPEED_PSOC) >= 0) {
                i2c_write(RSTCTRL_ADDR, RSTCTRL_SCRATCHREG, 1,
                          (uint8_t *)&buf, sizeof(buf));
                i2c_set_bus_speed(oldspeed);
diff --git a/board/gateworks/gw_ventana/Makefile b/board/gateworks/gw_ventana/Makefile
new file mode 100644 (file)
index 0000000..e8dab89
--- /dev/null
@@ -0,0 +1,10 @@
+#
+# Copyright (C) 2012-2013, Guennadi Liakhovetski <lg@denx.de>
+# (C) Copyright 2012-2013 Freescale Semiconductor, Inc.
+# Copyright (C) 2013, Gateworks Corporation
+#
+# SPDX-License-Identifier:  GPL-2.0+
+#
+
+obj-y  := gw_ventana.o gsc.o
+
diff --git a/board/gateworks/gw_ventana/README b/board/gateworks/gw_ventana/README
new file mode 100644 (file)
index 0000000..9e697d6
--- /dev/null
@@ -0,0 +1,55 @@
+U-Boot for the Gateworks Ventana Product Family boards
+
+This file contains information for the port of U-Boot to the Gateworks
+Ventana Product family boards.
+
+1. Boot source, boot from NAND
+------------------------------
+
+The i.MX6 BOOT ROM expects some structures that provide details of NAND layout
+and bad block information (referred to as 'bootstreams') which are replicated
+multiple times in NAND. The number of replications is configurable through
+board strapping options and eFUSE settings.  The Freescale 'kobs-ng'
+application from the Freescale LTIB BSP, which runs under Linux, must be used
+to program the bootstream in order to setup the replicated headers correctly.
+
+The Gateworks Ventana boards with NAND flash have been factory programmed
+such that their eFUSE settings expect 2 copies of the boostream (this is
+specified by providing kobs-ng with the --search_exponent=1 argument). Once in
+Linux with MTD support for the NAND on /dev/mtd0 you can program the boostream
+with:
+
+kobs-ng init -v -x --search_exponent=1 u-boot.imx
+
+The kobs-ng application uses an imximage (u-boot.imx) which contains the
+Image Vector Table (IVT) and Device Configuration Data (DCD) structures that
+the i.MX6 BOOT ROM requires to boot.  The kobs-ng adds the Firmware
+Configuration Block (FCB) and Discovered Bad Block Table (DBBT).
+
+This information is taken from:
+  http://trac.gateworks.com/wiki/ventana/bootloader#NANDFLASH
+
+More details about the i.MX6 BOOT ROM can be found in the IMX6 reference manual.
+
+2. Build
+--------
+
+There are several Gateworks Ventana boards that share a simliar design but
+vary based on CPU, Memory configuration, and subloaded devices.  Although
+the subloaded devices are handled dynamically in the bootloader using
+factory configured EEPROM data to modify the device-tree, the CPU choice
+(IMX6Q vs IMX6DL) and memory configurations are currently compile-time
+options.
+
+The following Gateworks Ventana configurations exist:
+ gwventanaq1gspi: MX6Q,1GB,SPI FLASH
+ gwventanaq     : MX6Q,512MB,NAND FLASH
+ gwventanaq1g   : MX6Q,1GB,NAND FLASH
+ gwventanadl    : MX6DL,512MB,NAND FLASH
+ gwventanadl1g  : MX6DL,1GB,NAND FLASH
+
+To build U-Boot for the MX6Q,1GB,NAND FLASH for example:
+
+ make gwventanaq1g_config
+ make
+
diff --git a/board/gateworks/gw_ventana/clocks.cfg b/board/gateworks/gw_ventana/clocks.cfg
new file mode 100644 (file)
index 0000000..a8118a2
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
+ * Copyright (C) 2013 Gateworks Corporation
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * Device Configuration Data (DCD)
+ *
+ * Each entry must have the format:
+ * Addr-type           Address        Value
+ *
+ * where:
+ *      Addr-type register length (1,2 or 4 bytes)
+ *      Address   absolute address of the register
+ *      value     value to be stored in the register
+ */
+
+/* set the default clock gate to save power */
+DATA 4, CCM_CCGR0, 0x00C03F3F
+DATA 4, CCM_CCGR1, 0x0030FC03
+DATA 4, CCM_CCGR2, 0x0FFFC000
+DATA 4, CCM_CCGR3, 0x3FF00000
+DATA 4, CCM_CCGR4, 0xFFFFF300 /* enable NAND/GPMI/BCH clocks */
+DATA 4, CCM_CCGR5, 0x0F0000C3
+DATA 4, CCM_CCGR6, 0x000003FF
+
+/* enable AXI cache for VDOA/VPU/IPU */
+DATA 4, MX6_IOMUXC_GPR4, 0xF00000CF
+/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
+DATA 4, MX6_IOMUXC_GPR6, 0x007F007F
+DATA 4, MX6_IOMUXC_GPR7, 0x007F007F
+
+/*
+ * Setup CCM_CCOSR register as follows:
+ *
+ * cko1_en  = 1    --> CKO1 enabled
+ * cko1_div = 111  --> divide by 8
+ * cko1_sel = 1011 --> ahb_clk_root
+ *
+ * This sets CKO1 at ahb_clk_root/8 = 132/8 = 16.5 MHz
+ */
+DATA 4, CCM_CCOSR, 0x000000fb
diff --git a/board/gateworks/gw_ventana/gsc.c b/board/gateworks/gw_ventana/gsc.c
new file mode 100644 (file)
index 0000000..37966ab
--- /dev/null
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2013 Gateworks Corporation
+ *
+ * Author: Tim Harvey <tharvey@gateworks.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <asm/errno.h>
+#include <common.h>
+#include <i2c.h>
+#include <linux/ctype.h>
+
+#include "gsc.h"
+
+#define MINMAX(n, percent)     ((n)*(100-percent)/100), ((n)*(100+percent)/100)
+
+/*
+ * The Gateworks System Controller will fail to ACK a master transaction if
+ * it is busy, which can occur during its 1HZ timer tick while reading ADC's.
+ * When this does occur, it will never be busy long enough to fail more than
+ * 2 back-to-back transfers.  Thus we wrap i2c_read and i2c_write with
+ * 3 retries.
+ */
+int gsc_i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
+{
+       int retry = 3;
+       int n = 0;
+       int ret;
+
+       while (n++ < retry) {
+               ret = i2c_read(chip, addr, alen, buf, len);
+               if (!ret)
+                       break;
+               debug("%s: 0x%02x 0x%02x retry%d: %d\n", __func__, chip, addr,
+                     n, ret);
+               if (ret != -ENODEV)
+                       break;
+               mdelay(10);
+       }
+       return ret;
+}
+
+int gsc_i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
+{
+       int retry = 3;
+       int n = 0;
+       int ret;
+
+       while (n++ < retry) {
+               ret = i2c_write(chip, addr, alen, buf, len);
+               if (!ret)
+                       break;
+               debug("%s: 0x%02x 0x%02x retry%d: %d\n", __func__, chip, addr,
+                     n, ret);
+               if (ret != -ENODEV)
+                       break;
+               mdelay(10);
+       }
+       mdelay(1);
+       return ret;
+}
+
+#ifdef CONFIG_CMD_GSC
+static void read_hwmon(const char *name, uint reg, uint size, uint low,
+                      uint high)
+{
+       unsigned char buf[3];
+       uint ui;
+
+       printf("%-8s:", name);
+       memset(buf, 0, sizeof(buf));
+       if (gsc_i2c_read(GSC_HWMON_ADDR, reg, 1, buf, size)) {
+               puts("fRD\n");
+       } else {
+               ui = buf[0] | (buf[1]<<8) | (buf[2]<<16);
+               if (ui == 0xffffff)
+                       printf("invalid");
+               else if (ui < low)
+                       printf("%d Failed - Low", ui);
+               else if (ui > high)
+                       printf("%d Failed - High", ui);
+               else
+                       printf("%d", ui);
+       }
+       puts("\n");
+}
+
+int do_gsc(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       const char *model = getenv("model");
+
+       i2c_set_bus_num(0);
+       read_hwmon("Temp",     GSC_HWMON_TEMP, 2, 0, 9000);
+       read_hwmon("VIN",      GSC_HWMON_VIN, 3, 8000, 60000);
+       read_hwmon("VBATT",    GSC_HWMON_VBATT, 3, 1800, 3500);
+       read_hwmon("VDD_3P3",  GSC_HWMON_VDD_3P3, 3, MINMAX(3300, 10));
+       read_hwmon("VDD_HIGH", GSC_HWMON_VDD_HIGH, 3, MINMAX(3000, 10));
+       read_hwmon("VDD_DDR",  GSC_HWMON_VDD_DDR, 3, MINMAX(1500, 10));
+       read_hwmon("VDD_5P0",  GSC_HWMON_VDD_5P0, 3, MINMAX(5000, 10));
+       read_hwmon("VDD_2P5",  GSC_HWMON_VDD_2P5, 3, MINMAX(2500, 10));
+       read_hwmon("VDD_1P8",  GSC_HWMON_VDD_1P8, 3, MINMAX(1800, 10));
+
+       switch (model[3]) {
+       case '1': /* GW51xx */
+               read_hwmon("VDD_CORE", GSC_HWMON_VDD_CORE, 3, MINMAX(1175, 10));
+               read_hwmon("VDD_SOC",  GSC_HWMON_VDD_SOC, 3, MINMAX(1175, 10));
+               break;
+       case '2': /* GW52xx */
+       case '3': /* GW53xx */
+               read_hwmon("VDD_CORE", GSC_HWMON_VDD_CORE, 3, MINMAX(1175, 10));
+               read_hwmon("VDD_SOC",  GSC_HWMON_VDD_SOC, 3, MINMAX(1175, 10));
+               read_hwmon("VDD_1P0",  GSC_HWMON_VDD_1P0, 3, MINMAX(1000, 10));
+               break;
+       case '4': /* GW54xx */
+               read_hwmon("VDD_CORE", GSC_HWMON_VDD_CORE, 3, MINMAX(1375, 10));
+               read_hwmon("VDD_SOC",  GSC_HWMON_VDD_SOC, 3, MINMAX(1375, 10));
+               read_hwmon("VDD_1P0",  GSC_HWMON_VDD_1P0, 3, MINMAX(1000, 10));
+               break;
+       }
+       return 0;
+}
+
+U_BOOT_CMD(gsc, 1, 1, do_gsc,
+          "GSC test",
+          ""
+);
+
+#endif /* CONFIG_CMD_GSC */
diff --git a/board/gateworks/gw_ventana/gsc.h b/board/gateworks/gw_ventana/gsc.h
new file mode 100644 (file)
index 0000000..da970c3
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2013 Gateworks Corporation
+ *
+ * Author: Tim Harvey <tharvey@gateworks.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __ASSEMBLY__
+
+/* i2c slave addresses */
+#define GSC_SC_ADDR            0x20
+#define GSC_RTC_ADDR           0x68
+#define GSC_HWMON_ADDR         0x29
+#define GSC_EEPROM_ADDR                0x51
+
+/* System Controller registers */
+enum {
+       GSC_SC_CTRL0            = 0x00,
+       GSC_SC_CTRL1            = 0x01,
+       GSC_SC_STATUS           = 0x0a,
+       GSC_SC_FWVER            = 0x0e,
+};
+
+/* System Controller Control1 bits */
+enum {
+       GSC_SC_CTRL1_WDDIS      = 7, /* 1 = disable watchdog */
+};
+
+/* System Controller Interrupt bits */
+enum {
+       GSC_SC_IRQ_PB           = 0, /* Pushbutton switch */
+       GSC_SC_IRQ_SECURE       = 1, /* Secure Key erase operation complete */
+       GSC_SC_IRQ_EEPROM_WP    = 2, /* EEPROM write violation */
+       GSC_SC_IRQ_GPIO         = 4, /* GPIO change */
+       GSC_SC_IRQ_TAMPER       = 5, /* Tamper detect */
+       GSC_SC_IRQ_WATCHDOG     = 6, /* Watchdog trip */
+       GSC_SC_IRQ_PBLONG       = 7, /* Pushbutton long hold */
+};
+
+/* Hardware Monitor registers */
+enum {
+       GSC_HWMON_TEMP          = 0x00,
+       GSC_HWMON_VIN           = 0x02,
+       GSC_HWMON_VDD_3P3       = 0x05,
+       GSC_HWMON_VBATT         = 0x08,
+       GSC_HWMON_VDD_5P0       = 0x0b,
+       GSC_HWMON_VDD_CORE      = 0x0e,
+       GSC_HWMON_VDD_HIGH      = 0x14,
+       GSC_HWMON_VDD_DDR       = 0x17,
+       GSC_HWMON_VDD_SOC       = 0x11,
+       GSC_HWMON_VDD_1P8       = 0x1d,
+       GSC_HWMON_VDD_2P5       = 0x23,
+       GSC_HWMON_VDD_1P0       = 0x20,
+};
+
+/*
+ * I2C transactions to the GSC are done via these functions which
+ * perform retries in the case of a busy GSC NAK'ing the transaction
+ */
+int gsc_i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len);
+int gsc_i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len);
+#endif
+
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
new file mode 100644 (file)
index 0000000..c130e2c
--- /dev/null
@@ -0,0 +1,1263 @@
+/*
+ * Copyright (C) 2013 Gateworks Corporation
+ *
+ * Author: Tim Harvey <tharvey@gateworks.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/iomux.h>
+#include <asm/arch/mx6-pins.h>
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/gpio.h>
+#include <asm/imx-common/iomux-v3.h>
+#include <asm/imx-common/mxc_i2c.h>
+#include <asm/imx-common/boot_mode.h>
+#include <asm/imx-common/sata.h>
+#include <jffs2/load_kernel.h>
+#include <hwconfig.h>
+#include <i2c.h>
+#include <linux/ctype.h>
+#include <fdt_support.h>
+#include <fsl_esdhc.h>
+#include <miiphy.h>
+#include <mmc.h>
+#include <mtd_node.h>
+#include <netdev.h>
+#include <power/pmic.h>
+#include <power/pfuze100_pmic.h>
+#include <i2c.h>
+#include <fdt_support.h>
+#include <jffs2/load_kernel.h>
+#include <spi_flash.h>
+
+#include "gsc.h"
+#include "ventana_eeprom.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* GPIO's common to all baseboards */
+#define GP_PHY_RST     IMX_GPIO_NR(1, 30)
+#define GP_USB_OTG_PWR IMX_GPIO_NR(3, 22)
+#define GP_SD3_CD      IMX_GPIO_NR(7, 0)
+#define GP_RS232_EN    IMX_GPIO_NR(2, 11)
+#define GP_MSATA_SEL   IMX_GPIO_NR(2, 8)
+
+/* I2C bus numbers */
+#define I2C_GSC                0
+#define I2C_PMIC       1
+
+#define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |            \
+       PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |               \
+       PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
+
+#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |            \
+       PAD_CTL_PUS_47K_UP  | PAD_CTL_SPEED_LOW |               \
+       PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
+
+#define ENET_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |            \
+       PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED   |             \
+       PAD_CTL_DSE_40ohm   | PAD_CTL_HYS)
+
+#define SPI_PAD_CTRL (PAD_CTL_HYS |                            \
+       PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED |             \
+       PAD_CTL_DSE_40ohm     | PAD_CTL_SRE_FAST)
+
+#define DIO_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |             \
+       PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |               \
+       PAD_CTL_DSE_34ohm | PAD_CTL_HYS | PAD_CTL_SRE_FAST)
+
+#define I2C_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                   \
+       PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |   \
+       PAD_CTL_ODE | PAD_CTL_SRE_FAST)
+
+/*
+ * EEPROM board info struct populated by read_eeprom so that we only have to
+ * read it once.
+ */
+static struct ventana_board_info ventana_info;
+
+enum {
+       GW54proto, /* original GW5400-A prototype */
+       GW51xx,
+       GW52xx,
+       GW53xx,
+       GW54xx,
+       GW_UNKNOWN,
+};
+
+int board_type;
+
+/* UART1: Function varies per baseboard */
+iomux_v3_cfg_t const uart1_pads[] = {
+       MX6_PAD_SD3_DAT6__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
+       MX6_PAD_SD3_DAT7__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
+};
+
+/* UART2: Serial Console */
+iomux_v3_cfg_t const uart2_pads[] = {
+       MX6_PAD_SD4_DAT7__UART2_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
+       MX6_PAD_SD4_DAT4__UART2_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
+};
+
+#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
+
+/* I2C1: GSC */
+struct i2c_pads_info i2c_pad_info0 = {
+       .scl = {
+               .i2c_mode = MX6_PAD_EIM_D21__I2C1_SCL | PC,
+               .gpio_mode = MX6_PAD_EIM_D21__GPIO3_IO21 | PC,
+               .gp = IMX_GPIO_NR(3, 21)
+       },
+       .sda = {
+               .i2c_mode = MX6_PAD_EIM_D28__I2C1_SDA | PC,
+               .gpio_mode = MX6_PAD_EIM_D28__GPIO3_IO28 | PC,
+               .gp = IMX_GPIO_NR(3, 28)
+       }
+};
+
+/* I2C2: PMIC/PCIe Switch/PCIe Clock/Mezz */
+struct i2c_pads_info i2c_pad_info1 = {
+       .scl = {
+               .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | PC,
+               .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | PC,
+               .gp = IMX_GPIO_NR(4, 12)
+       },
+       .sda = {
+               .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | PC,
+               .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | PC,
+               .gp = IMX_GPIO_NR(4, 13)
+       }
+};
+
+/* I2C3: Misc/Expansion */
+struct i2c_pads_info i2c_pad_info2 = {
+       .scl = {
+               .i2c_mode = MX6_PAD_GPIO_3__I2C3_SCL | PC,
+               .gpio_mode = MX6_PAD_GPIO_3__GPIO1_IO03 | PC,
+               .gp = IMX_GPIO_NR(1, 3)
+       },
+       .sda = {
+               .i2c_mode = MX6_PAD_GPIO_6__I2C3_SDA | PC,
+               .gpio_mode = MX6_PAD_GPIO_6__GPIO1_IO06 | PC,
+               .gp = IMX_GPIO_NR(1, 6)
+       }
+};
+
+/* MMC */
+iomux_v3_cfg_t const usdhc3_pads[] = {
+       MX6_PAD_SD3_CLK__SD3_CLK    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD3_CMD__SD3_CMD    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD3_DAT5__GPIO7_IO00  | MUX_PAD_CTRL(NO_PAD_CTRL), /* CD */
+};
+
+/* ENET */
+iomux_v3_cfg_t const enet_pads[] = {
+       MX6_PAD_ENET_MDIO__ENET_MDIO            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_ENET_MDC__ENET_MDC              | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_TXC__RGMII_TXC            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_TD0__RGMII_TD0            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_TD1__RGMII_TD1            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_TD2__RGMII_TD2            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_TD3__RGMII_TD3            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_TX_CTL__RGMII_TX_CTL      | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_ENET_REF_CLK__ENET_TX_CLK       | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_RXC__RGMII_RXC            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_RD0__RGMII_RD0            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_RD1__RGMII_RD1            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_RD2__RGMII_RD2            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_RD3__RGMII_RD3            | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL      | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       /* PHY nRST */
+       MX6_PAD_ENET_TXD0__GPIO1_IO30           | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+/* NAND */
+iomux_v3_cfg_t const nfc_pads[] = {
+       MX6_PAD_NANDF_CLE__NAND_CLE     | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_ALE__NAND_ALE     | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_WP_B__NAND_WP_B   | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_RB0__NAND_READY_B | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_CS0__NAND_CE0_B   | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_SD4_CMD__NAND_RE_B      | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_SD4_CLK__NAND_WE_B      | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_D0__NAND_DATA00   | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_D1__NAND_DATA01   | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_D2__NAND_DATA02   | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_D3__NAND_DATA03   | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_D4__NAND_DATA04   | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_D5__NAND_DATA05   | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_D6__NAND_DATA06   | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_NANDF_D7__NAND_DATA07   | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+#ifdef CONFIG_CMD_NAND
+static void setup_gpmi_nand(void)
+{
+       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+       /* config gpmi nand iomux */
+       imx_iomux_v3_setup_multiple_pads(nfc_pads, ARRAY_SIZE(nfc_pads));
+
+       /* config gpmi and bch clock to 100 MHz */
+       clrsetbits_le32(&mxc_ccm->cs2cdr,
+                       MXC_CCM_CS2CDR_ENFC_CLK_PODF_MASK |
+                       MXC_CCM_CS2CDR_ENFC_CLK_PRED_MASK |
+                       MXC_CCM_CS2CDR_ENFC_CLK_SEL_MASK,
+                       MXC_CCM_CS2CDR_ENFC_CLK_PODF(0) |
+                       MXC_CCM_CS2CDR_ENFC_CLK_PRED(3) |
+                       MXC_CCM_CS2CDR_ENFC_CLK_SEL(3));
+
+       /* enable gpmi and bch clock gating */
+       setbits_le32(&mxc_ccm->CCGR4,
+                    MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK |
+                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
+                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
+                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
+                    MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_OFFSET);
+
+       /* enable apbh clock gating */
+       setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK);
+}
+#endif
+
+static void setup_iomux_enet(void)
+{
+       imx_iomux_v3_setup_multiple_pads(enet_pads, ARRAY_SIZE(enet_pads));
+
+       /* toggle PHY_RST# */
+       gpio_direction_output(GP_PHY_RST, 0);
+       mdelay(2);
+       gpio_set_value(GP_PHY_RST, 1);
+}
+
+static void setup_iomux_uart(void)
+{
+       imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
+       imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads));
+}
+
+#ifdef CONFIG_USB_EHCI_MX6
+iomux_v3_cfg_t const usb_pads[] = {
+       MX6_PAD_GPIO_1__USB_OTG_ID   | MUX_PAD_CTRL(DIO_PAD_CTRL),
+       MX6_PAD_KEY_COL4__USB_OTG_OC | MUX_PAD_CTRL(DIO_PAD_CTRL),
+       MX6_PAD_EIM_D22__GPIO3_IO22  | MUX_PAD_CTRL(DIO_PAD_CTRL), /* OTG PWR */
+};
+
+int board_ehci_hcd_init(int port)
+{
+       struct ventana_board_info *info = &ventana_info;
+
+       imx_iomux_v3_setup_multiple_pads(usb_pads, ARRAY_SIZE(usb_pads));
+
+       /* Reset USB HUB (present on GW54xx/GW53xx) */
+       switch (info->model[3]) {
+       case '3': /* GW53xx */
+               imx_iomux_v3_setup_pad(MX6_PAD_GPIO_9__GPIO1_IO09|
+                                      MUX_PAD_CTRL(NO_PAD_CTRL));
+               gpio_direction_output(IMX_GPIO_NR(1, 9), 0);
+               mdelay(2);
+               gpio_set_value(IMX_GPIO_NR(1, 9), 1);
+               break;
+       case '4': /* GW54xx */
+               imx_iomux_v3_setup_pad(MX6_PAD_SD1_DAT0__GPIO1_IO16 |
+                                      MUX_PAD_CTRL(NO_PAD_CTRL));
+               gpio_direction_output(IMX_GPIO_NR(1, 16), 0);
+               mdelay(2);
+               gpio_set_value(IMX_GPIO_NR(1, 16), 1);
+               break;
+       }
+
+       return 0;
+}
+
+int board_ehci_power(int port, int on)
+{
+       if (port)
+               return 0;
+       gpio_set_value(GP_USB_OTG_PWR, on);
+       return 0;
+}
+#endif /* CONFIG_USB_EHCI_MX6 */
+
+#ifdef CONFIG_FSL_ESDHC
+struct fsl_esdhc_cfg usdhc_cfg = { USDHC3_BASE_ADDR };
+
+int board_mmc_getcd(struct mmc *mmc)
+{
+       /* Card Detect */
+       gpio_direction_input(GP_SD3_CD);
+       return !gpio_get_value(GP_SD3_CD);
+}
+
+int board_mmc_init(bd_t *bis)
+{
+       /* Only one USDHC controller on Ventana */
+       imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
+       usdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
+       usdhc_cfg.max_bus_width = 4;
+
+       return fsl_esdhc_initialize(bis, &usdhc_cfg);
+}
+#endif /* CONFIG_FSL_ESDHC */
+
+#ifdef CONFIG_MXC_SPI
+iomux_v3_cfg_t const ecspi1_pads[] = {
+       /* SS1 */
+       MX6_PAD_EIM_D19__GPIO3_IO19  | MUX_PAD_CTRL(SPI_PAD_CTRL),
+       MX6_PAD_EIM_D17__ECSPI1_MISO | MUX_PAD_CTRL(SPI_PAD_CTRL),
+       MX6_PAD_EIM_D18__ECSPI1_MOSI | MUX_PAD_CTRL(SPI_PAD_CTRL),
+       MX6_PAD_EIM_D16__ECSPI1_SCLK | MUX_PAD_CTRL(SPI_PAD_CTRL),
+};
+
+static void setup_spi(void)
+{
+       gpio_direction_output(CONFIG_SF_DEFAULT_CS, 1);
+       imx_iomux_v3_setup_multiple_pads(ecspi1_pads,
+                                        ARRAY_SIZE(ecspi1_pads));
+}
+#endif
+
+/* configure eth0 PHY board-specific LED behavior */
+int board_phy_config(struct phy_device *phydev)
+{
+       unsigned short val;
+
+       /* Marvel 88E1510 */
+       if (phydev->phy_id == 0x1410dd1) {
+               /*
+                * Page 3, Register 16: LED[2:0] Function Control Register
+                * LED[0] (SPD:Amber) R16_3.3:0 to 0111: on-GbE link
+                * LED[1] (LNK:Green) R16_3.7:4 to 0001: on-link, blink-activity
+                */
+               phy_write(phydev, MDIO_DEVAD_NONE, 22, 3);
+               val = phy_read(phydev, MDIO_DEVAD_NONE, 16);
+               val &= 0xff00;
+               val |= 0x0017;
+               phy_write(phydev, MDIO_DEVAD_NONE, 16, val);
+               phy_write(phydev, MDIO_DEVAD_NONE, 22, 0);
+       }
+
+       if (phydev->drv->config)
+               phydev->drv->config(phydev);
+
+       return 0;
+}
+
+int board_eth_init(bd_t *bis)
+{
+       setup_iomux_enet();
+
+#ifdef CONFIG_FEC_MXC
+       cpu_eth_init(bis);
+#endif
+
+#ifdef CONFIG_CI_UDC
+       /* For otg ethernet*/
+       usb_eth_initialize(bis);
+#endif
+
+       return 0;
+}
+
+/* read ventana EEPROM, check for validity, and return baseboard type */
+static int
+read_eeprom(void)
+{
+       int i;
+       int chksum;
+       char baseboard;
+       int type;
+       struct ventana_board_info *info = &ventana_info;
+       unsigned char *buf = (unsigned char *)&ventana_info;
+
+       memset(info, 0, sizeof(ventana_info));
+
+       /*
+        * On a board with a missing/depleted backup battery for GSC, the
+        * board may be ready to probe the GSC before its firmware is
+        * running.  We will wait here indefinately for the GSC/EEPROM.
+        */
+       while (1) {
+               if (0 == i2c_set_bus_num(I2C_GSC) &&
+                   0 == i2c_probe(GSC_EEPROM_ADDR))
+                       break;
+               mdelay(1);
+       }
+
+       /* read eeprom config section */
+       if (gsc_i2c_read(GSC_EEPROM_ADDR, 0x00, 1, buf, sizeof(ventana_info))) {
+               puts("EEPROM: Failed to read EEPROM\n");
+               info->model[0] = 0;
+               return GW_UNKNOWN;
+       }
+
+       /* sanity checks */
+       if (info->model[0] != 'G' || info->model[1] != 'W') {
+               puts("EEPROM: Invalid Model in EEPROM\n");
+               info->model[0] = 0;
+               return GW_UNKNOWN;
+       }
+
+       /* validate checksum */
+       for (chksum = 0, i = 0; i < sizeof(*info)-2; i++)
+               chksum += buf[i];
+       if ((info->chksum[0] != chksum>>8) ||
+           (info->chksum[1] != (chksum&0xff))) {
+               puts("EEPROM: Failed EEPROM checksum\n");
+               info->model[0] = 0;
+               return GW_UNKNOWN;
+       }
+
+       /* original GW5400-A prototype */
+       baseboard = info->model[3];
+       if (strncasecmp((const char *)info->model, "GW5400-A", 8) == 0)
+               baseboard = '0';
+
+       switch (baseboard) {
+       case '0': /* original GW5400-A prototype */
+               type = GW54proto;
+               break;
+       case '1':
+               type = GW51xx;
+               break;
+       case '2':
+               type = GW52xx;
+               break;
+       case '3':
+               type = GW53xx;
+               break;
+       case '4':
+               type = GW54xx;
+               break;
+       default:
+               printf("EEPROM: Unknown model in EEPROM: %s\n", info->model);
+               type = GW_UNKNOWN;
+               break;
+       }
+       return type;
+}
+
+/*
+ * Baseboard specific GPIO
+ */
+
+/* common to add baseboards */
+static iomux_v3_cfg_t const gw_gpio_pads[] = {
+       /* MSATA_EN */
+       MX6_PAD_SD4_DAT0__GPIO2_IO08 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* RS232_EN# */
+       MX6_PAD_SD4_DAT3__GPIO2_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+/* prototype */
+static iomux_v3_cfg_t const gwproto_gpio_pads[] = {
+       /* PANLEDG# */
+       MX6_PAD_KEY_COL0__GPIO4_IO06 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PANLEDR# */
+       MX6_PAD_KEY_ROW0__GPIO4_IO07 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* LOCLED# */
+       MX6_PAD_KEY_ROW4__GPIO4_IO15 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* RS485_EN */
+       MX6_PAD_SD3_DAT4__GPIO7_IO01 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* IOEXP_PWREN# */
+       MX6_PAD_EIM_A19__GPIO2_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* IOEXP_IRQ# */
+       MX6_PAD_EIM_A20__GPIO2_IO18 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* VID_EN */
+       MX6_PAD_EIM_D31__GPIO3_IO31 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* DIOI2C_DIS# */
+       MX6_PAD_GPIO_19__GPIO4_IO05 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PCICK_SSON */
+       MX6_PAD_SD1_CLK__GPIO1_IO20 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PCI_RST# */
+       MX6_PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+static iomux_v3_cfg_t const gw51xx_gpio_pads[] = {
+       /* PANLEDG# */
+       MX6_PAD_KEY_COL0__GPIO4_IO06 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PANLEDR# */
+       MX6_PAD_KEY_ROW0__GPIO4_IO07 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* IOEXP_PWREN# */
+       MX6_PAD_EIM_A19__GPIO2_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* IOEXP_IRQ# */
+       MX6_PAD_EIM_A20__GPIO2_IO18 | MUX_PAD_CTRL(NO_PAD_CTRL),
+
+       /* GPS_SHDN */
+       MX6_PAD_GPIO_2__GPIO1_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* VID_PWR */
+       MX6_PAD_CSI0_DATA_EN__GPIO5_IO20 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PCI_RST# */
+       MX6_PAD_GPIO_0__GPIO1_IO00 | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+static iomux_v3_cfg_t const gw52xx_gpio_pads[] = {
+       /* PANLEDG# */
+       MX6_PAD_KEY_COL0__GPIO4_IO06 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PANLEDR# */
+       MX6_PAD_KEY_ROW0__GPIO4_IO07 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* IOEXP_PWREN# */
+       MX6_PAD_EIM_A19__GPIO2_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* IOEXP_IRQ# */
+       MX6_PAD_EIM_A20__GPIO2_IO18 | MUX_PAD_CTRL(NO_PAD_CTRL),
+
+       /* MX6_LOCLED# */
+       MX6_PAD_KEY_ROW4__GPIO4_IO15 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* GPS_SHDN */
+       MX6_PAD_ENET_RXD0__GPIO1_IO27 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* USBOTG_SEL */
+       MX6_PAD_GPIO_2__GPIO1_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* VID_PWR */
+       MX6_PAD_EIM_D31__GPIO3_IO31 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PCI_RST# */
+       MX6_PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+static iomux_v3_cfg_t const gw53xx_gpio_pads[] = {
+       /* PANLEDG# */
+       MX6_PAD_KEY_COL0__GPIO4_IO06 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PANLEDR# */
+       MX6_PAD_KEY_ROW0__GPIO4_IO07 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* IOEXP_PWREN# */
+       MX6_PAD_EIM_A19__GPIO2_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* IOEXP_IRQ# */
+       MX6_PAD_EIM_A20__GPIO2_IO18 | MUX_PAD_CTRL(NO_PAD_CTRL),
+
+       /* MX6_LOCLED# */
+       MX6_PAD_KEY_ROW4__GPIO4_IO15 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* GPS_SHDN */
+       MX6_PAD_ENET_RXD0__GPIO1_IO27 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* VID_EN */
+       MX6_PAD_EIM_D31__GPIO3_IO31 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PCI_RST# */
+       MX6_PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+static iomux_v3_cfg_t const gw54xx_gpio_pads[] = {
+       /* PANLEDG# */
+       MX6_PAD_KEY_COL0__GPIO4_IO06 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PANLEDR# */
+       MX6_PAD_KEY_COL2__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* MX6_LOCLED# */
+       MX6_PAD_KEY_ROW4__GPIO4_IO15 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* MIPI_DIO */
+       MX6_PAD_SD1_DAT3__GPIO1_IO21 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* RS485_EN */
+       MX6_PAD_EIM_D24__GPIO3_IO24 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* IOEXP_PWREN# */
+       MX6_PAD_KEY_ROW0__GPIO4_IO07 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* IOEXP_IRQ# */
+       MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* DIOI2C_DIS# */
+       MX6_PAD_GPIO_19__GPIO4_IO05 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* DIOI2C_DIS# */
+       MX6_PAD_GPIO_19__GPIO4_IO05 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PCICK_SSON */
+       MX6_PAD_SD1_CLK__GPIO1_IO20 | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* PCI_RST# */
+       MX6_PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+/*
+ * each baseboard has 4 user configurable Digital IO lines which can
+ * be pinmuxed as a GPIO or in some cases a PWM
+ */
+struct dio_cfg {
+       iomux_v3_cfg_t gpio_padmux;
+       unsigned gpio_param;
+       iomux_v3_cfg_t pwm_padmux;
+       unsigned pwm_param;
+};
+
+struct ventana {
+       /* pinmux */
+       iomux_v3_cfg_t const *gpio_pads;
+       int num_pads;
+       /* DIO pinmux/val */
+       struct dio_cfg dio_cfg[4];
+       /* various gpios (0 if non-existent) */
+       int leds[3];
+       int pcie_rst;
+       int mezz_pwren;
+       int mezz_irq;
+       int rs485en;
+       int gps_shdn;
+       int vidin_en;
+       int dioi2c_en;
+       int pcie_sson;
+       int usb_sel;
+};
+
+struct ventana gpio_cfg[] = {
+       /* GW5400proto */
+       {
+               .gpio_pads = gw54xx_gpio_pads,
+               .num_pads = ARRAY_SIZE(gw54xx_gpio_pads),
+               .dio_cfg = {
+                       { MX6_PAD_GPIO_9__GPIO1_IO09, IMX_GPIO_NR(1, 9),
+                         MX6_PAD_GPIO_9__PWM1_OUT, 1 },
+                       { MX6_PAD_SD1_DAT2__GPIO1_IO19, IMX_GPIO_NR(1, 19),
+                         MX6_PAD_SD1_DAT2__PWM2_OUT, 2 },
+                       { MX6_PAD_SD4_DAT1__GPIO2_IO09, IMX_GPIO_NR(2, 9),
+                         MX6_PAD_SD4_DAT1__PWM3_OUT, 3 },
+                       { MX6_PAD_SD4_DAT2__GPIO2_IO10, IMX_GPIO_NR(2, 10),
+                         MX6_PAD_SD4_DAT2__PWM4_OUT, 4 },
+               },
+               .leds = {
+                       IMX_GPIO_NR(4, 6),
+                       IMX_GPIO_NR(4, 10),
+                       IMX_GPIO_NR(4, 15),
+               },
+               .pcie_rst = IMX_GPIO_NR(1, 29),
+               .mezz_pwren = IMX_GPIO_NR(4, 7),
+               .mezz_irq = IMX_GPIO_NR(4, 9),
+               .rs485en = IMX_GPIO_NR(3, 24),
+               .dioi2c_en = IMX_GPIO_NR(4,  5),
+               .pcie_sson = IMX_GPIO_NR(1, 20),
+       },
+
+       /* GW51xx */
+       {
+               .gpio_pads = gw51xx_gpio_pads,
+               .num_pads = ARRAY_SIZE(gw51xx_gpio_pads),
+               .dio_cfg = {
+                       { MX6_PAD_SD1_DAT0__GPIO1_IO16, IMX_GPIO_NR(1, 16),
+                         0, 0 },
+                       { MX6_PAD_SD1_DAT2__GPIO1_IO19, IMX_GPIO_NR(1, 19),
+                         MX6_PAD_SD1_DAT2__PWM2_OUT, 2 },
+                       { MX6_PAD_SD1_DAT1__GPIO1_IO17, IMX_GPIO_NR(1, 17),
+                         MX6_PAD_SD1_DAT1__PWM3_OUT, 3 },
+                       { MX6_PAD_SD1_CMD__GPIO1_IO18, IMX_GPIO_NR(1, 18),
+                         MX6_PAD_SD1_CMD__PWM4_OUT, 4 },
+               },
+               .leds = {
+                       IMX_GPIO_NR(4, 6),
+                       IMX_GPIO_NR(4, 10),
+               },
+               .pcie_rst = IMX_GPIO_NR(1, 0),
+               .mezz_pwren = IMX_GPIO_NR(2, 19),
+               .mezz_irq = IMX_GPIO_NR(2, 18),
+               .gps_shdn = IMX_GPIO_NR(1, 2),
+               .vidin_en = IMX_GPIO_NR(5, 20),
+       },
+
+       /* GW52xx */
+       {
+               .gpio_pads = gw52xx_gpio_pads,
+               .num_pads = ARRAY_SIZE(gw52xx_gpio_pads),
+               .dio_cfg = {
+                       { MX6_PAD_SD1_DAT0__GPIO1_IO16, IMX_GPIO_NR(1, 16),
+                         0, 0 },
+                       { MX6_PAD_SD1_DAT2__GPIO1_IO19, IMX_GPIO_NR(1, 19),
+                         MX6_PAD_SD1_DAT2__PWM2_OUT, 2 },
+                       { MX6_PAD_SD1_DAT1__GPIO1_IO17, IMX_GPIO_NR(1, 17),
+                         MX6_PAD_SD1_DAT1__PWM3_OUT, 3 },
+                       { MX6_PAD_SD1_CLK__GPIO1_IO20, IMX_GPIO_NR(1, 20),
+                         0, 0 },
+               },
+               .leds = {
+                       IMX_GPIO_NR(4, 6),
+                       IMX_GPIO_NR(4, 7),
+                       IMX_GPIO_NR(4, 15),
+               },
+               .pcie_rst = IMX_GPIO_NR(1, 29),
+               .mezz_pwren = IMX_GPIO_NR(2, 19),
+               .mezz_irq = IMX_GPIO_NR(2, 18),
+               .gps_shdn = IMX_GPIO_NR(1, 27),
+               .vidin_en = IMX_GPIO_NR(3, 31),
+               .usb_sel = IMX_GPIO_NR(1, 2),
+       },
+
+       /* GW53xx */
+       {
+               .gpio_pads = gw53xx_gpio_pads,
+               .num_pads = ARRAY_SIZE(gw53xx_gpio_pads),
+               .dio_cfg = {
+                       { MX6_PAD_SD1_DAT0__GPIO1_IO16, IMX_GPIO_NR(1, 16),
+                         0, 0 },
+                       { MX6_PAD_SD1_DAT2__GPIO1_IO19, IMX_GPIO_NR(1, 19),
+                         MX6_PAD_SD1_DAT2__PWM2_OUT, 2 },
+                       { MX6_PAD_SD1_DAT1__GPIO1_IO17, IMX_GPIO_NR(1, 17),
+                         MX6_PAD_SD1_DAT1__PWM3_OUT, 3 },
+                       { MX6_PAD_SD1_CLK__GPIO1_IO20, IMX_GPIO_NR(1, 20),
+                         0, 0 },
+               },
+               .leds = {
+                       IMX_GPIO_NR(4, 6),
+                       IMX_GPIO_NR(4, 7),
+                       IMX_GPIO_NR(4, 15),
+               },
+               .pcie_rst = IMX_GPIO_NR(1, 29),
+               .mezz_pwren = IMX_GPIO_NR(2, 19),
+               .mezz_irq = IMX_GPIO_NR(2, 18),
+               .gps_shdn = IMX_GPIO_NR(1, 27),
+               .vidin_en = IMX_GPIO_NR(3, 31),
+       },
+
+       /* GW54xx */
+       {
+               .gpio_pads = gw54xx_gpio_pads,
+               .num_pads = ARRAY_SIZE(gw54xx_gpio_pads),
+               .dio_cfg = {
+                       { MX6_PAD_GPIO_9__GPIO1_IO09, IMX_GPIO_NR(1, 9),
+                         MX6_PAD_GPIO_9__PWM1_OUT, 1 },
+                       { MX6_PAD_SD1_DAT2__GPIO1_IO19, IMX_GPIO_NR(1, 19),
+                         MX6_PAD_SD1_DAT2__PWM2_OUT, 2 },
+                       { MX6_PAD_SD4_DAT1__GPIO2_IO09, IMX_GPIO_NR(2, 9),
+                         MX6_PAD_SD4_DAT1__PWM3_OUT, 3 },
+                       { MX6_PAD_SD4_DAT2__GPIO2_IO10, IMX_GPIO_NR(2, 10),
+                         MX6_PAD_SD4_DAT2__PWM4_OUT, 4 },
+               },
+               .leds = {
+                       IMX_GPIO_NR(4, 6),
+                       IMX_GPIO_NR(4, 7),
+                       IMX_GPIO_NR(4, 15),
+               },
+               .pcie_rst = IMX_GPIO_NR(1, 29),
+               .mezz_pwren = IMX_GPIO_NR(2, 19),
+               .mezz_irq = IMX_GPIO_NR(2, 18),
+               .rs485en = IMX_GPIO_NR(7, 1),
+               .vidin_en = IMX_GPIO_NR(3, 31),
+               .dioi2c_en = IMX_GPIO_NR(4,  5),
+               .pcie_sson = IMX_GPIO_NR(1, 20),
+       },
+};
+
+/* setup GPIO pinmux and default configuration per baseboard */
+static void setup_board_gpio(int board)
+{
+       struct ventana_board_info *info = &ventana_info;
+       const char *s;
+       char arg[10];
+       size_t len;
+       int i;
+       int quiet = simple_strtol(getenv("quiet"), NULL, 10);
+
+       if (board >= GW_UNKNOWN)
+               return;
+
+       /* RS232_EN# */
+       gpio_direction_output(GP_RS232_EN, (hwconfig("rs232")) ? 0 : 1);
+
+       /* MSATA Enable */
+       if (is_cpu_type(MXC_CPU_MX6Q) &&
+           test_bit(EECONFIG_SATA, info->config)) {
+               gpio_direction_output(GP_MSATA_SEL,
+                                     (hwconfig("msata")) ?  1 : 0);
+       } else {
+               gpio_direction_output(GP_MSATA_SEL, 0);
+       }
+
+       /*
+        * assert PCI_RST# (released by OS when clock is valid)
+        * TODO: figure out why leaving this de-asserted from PCI scan on boot
+        *       causes linux pcie driver to hang during enumeration
+        */
+       gpio_direction_output(gpio_cfg[board].pcie_rst, 0);
+
+       /* turn off (active-high) user LED's */
+       for (i = 0; i < 4; i++) {
+               if (gpio_cfg[board].leds[i])
+                       gpio_direction_output(gpio_cfg[board].leds[i], 1);
+       }
+
+       /* Expansion Mezzanine IO */
+       gpio_direction_output(gpio_cfg[board].mezz_pwren, 0);
+       gpio_direction_input(gpio_cfg[board].mezz_irq);
+
+       /* RS485 Transmit Enable */
+       if (gpio_cfg[board].rs485en)
+               gpio_direction_output(gpio_cfg[board].rs485en, 0);
+
+       /* GPS_SHDN */
+       if (gpio_cfg[board].gps_shdn)
+               gpio_direction_output(gpio_cfg[board].gps_shdn, 1);
+
+       /* Analog video codec power enable */
+       if (gpio_cfg[board].vidin_en)
+               gpio_direction_output(gpio_cfg[board].vidin_en, 1);
+
+       /* DIOI2C_DIS# */
+       if (gpio_cfg[board].dioi2c_en)
+               gpio_direction_output(gpio_cfg[board].dioi2c_en, 0);
+
+       /* PCICK_SSON: disable spread-spectrum clock */
+       if (gpio_cfg[board].pcie_sson)
+               gpio_direction_output(gpio_cfg[board].pcie_sson, 0);
+
+       /* USBOTG Select (PCISKT or FrontPanel) */
+       if (gpio_cfg[board].usb_sel)
+               gpio_direction_output(gpio_cfg[board].usb_sel, 0);
+
+       /*
+        * Configure DIO pinmux/padctl registers
+        * see IMX6DQRM/IMX6SDLRM IOMUXC_SW_PAD_CTL_PAD_* register definitions
+        */
+       for (i = 0; i < 4; i++) {
+               struct dio_cfg *cfg = &gpio_cfg[board].dio_cfg[i];
+               unsigned ctrl = DIO_PAD_CTRL;
+
+               sprintf(arg, "dio%d", i);
+               if (!hwconfig(arg))
+                       continue;
+               s = hwconfig_subarg(arg, "padctrl", &len);
+               if (s)
+                       ctrl = simple_strtoul(s, NULL, 16) & 0x3ffff;
+               if (hwconfig_subarg_cmp(arg, "mode", "gpio")) {
+                       if (!quiet) {
+                               printf("DIO%d:  GPIO%d_IO%02d (gpio-%d)\n", i,
+                                      (cfg->gpio_param/32)+1,
+                                      cfg->gpio_param%32,
+                                      cfg->gpio_param);
+                       }
+                       imx_iomux_v3_setup_pad(cfg->gpio_padmux |
+                                              MUX_PAD_CTRL(ctrl));
+                       gpio_direction_input(cfg->gpio_param);
+               } else if (hwconfig_subarg_cmp("dio2", "mode", "pwm") &&
+                          cfg->pwm_padmux) {
+                       if (!quiet)
+                               printf("DIO%d:  pwm%d\n", i, cfg->pwm_param);
+                       imx_iomux_v3_setup_pad(cfg->pwm_padmux |
+                                              MUX_PAD_CTRL(ctrl));
+               }
+       }
+
+       if (!quiet) {
+               if (is_cpu_type(MXC_CPU_MX6Q) &&
+                   (test_bit(EECONFIG_SATA, info->config))) {
+                       printf("MSATA: %s\n", (hwconfig("msata") ?
+                              "enabled" : "disabled"));
+               }
+               printf("RS232: %s\n", (hwconfig("rs232")) ?
+                      "enabled" : "disabled");
+       }
+}
+
+#if defined(CONFIG_CMD_PCI)
+int imx6_pcie_toggle_reset(void)
+{
+       if (board_type < GW_UNKNOWN) {
+               gpio_direction_output(gpio_cfg[board_type].pcie_rst, 0);
+               mdelay(50);
+               gpio_direction_output(gpio_cfg[board_type].pcie_rst, 1);
+       }
+       return 0;
+}
+#endif /* CONFIG_CMD_PCI */
+
+#ifdef CONFIG_SERIAL_TAG
+/*
+ * called when setting up ATAGS before booting kernel
+ * populate serialnum from the following (in order of priority):
+ *   serial# env var
+ *   eeprom
+ */
+void get_board_serial(struct tag_serialnr *serialnr)
+{
+       char *serial = getenv("serial#");
+
+       if (serial) {
+               serialnr->high = 0;
+               serialnr->low = simple_strtoul(serial, NULL, 10);
+       } else if (ventana_info.model[0]) {
+               serialnr->high = 0;
+               serialnr->low = ventana_info.serial;
+       } else {
+               serialnr->high = 0;
+               serialnr->low = 0;
+       }
+}
+#endif
+
+/*
+ * Board Support
+ */
+
+int board_early_init_f(void)
+{
+       setup_iomux_uart();
+       gpio_direction_output(GP_USB_OTG_PWR, 0); /* OTG power off */
+
+       return 0;
+}
+
+int dram_init(void)
+{
+       gd->ram_size = get_ram_size((void *)PHYS_SDRAM,
+                                   CONFIG_DDR_MB*1024*1024);
+
+       return 0;
+}
+
+int board_init(void)
+{
+       struct iomuxc_base_regs *const iomuxc_regs
+               = (struct iomuxc_base_regs *)IOMUXC_BASE_ADDR;
+
+       clrsetbits_le32(&iomuxc_regs->gpr[1],
+                       IOMUXC_GPR1_OTG_ID_MASK,
+                       IOMUXC_GPR1_OTG_ID_GPIO1);
+
+       /* address of linux boot parameters */
+       gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+
+#ifdef CONFIG_CMD_NAND
+       setup_gpmi_nand();
+#endif
+#ifdef CONFIG_MXC_SPI
+       setup_spi();
+#endif
+       setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info0);
+       setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
+       setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info2);
+
+#ifdef CONFIG_CMD_SATA
+       setup_sata();
+#endif
+       /* read Gateworks EEPROM into global struct (used later) */
+       board_type = read_eeprom();
+
+       /* board-specifc GPIO iomux */
+       if (board_type < GW_UNKNOWN) {
+               imx_iomux_v3_setup_multiple_pads(gw_gpio_pads,
+                                                ARRAY_SIZE(gw_gpio_pads));
+               imx_iomux_v3_setup_multiple_pads(gpio_cfg[board_type].gpio_pads,
+                                                gpio_cfg[board_type].num_pads);
+       }
+
+       return 0;
+}
+
+#if defined(CONFIG_DISPLAY_BOARDINFO_LATE)
+/*
+ * called during late init (after relocation and after board_init())
+ * by virtue of CONFIG_DISPLAY_BOARDINFO_LATE as we needed i2c initialized and
+ * EEPROM read.
+ */
+int checkboard(void)
+{
+       struct ventana_board_info *info = &ventana_info;
+       unsigned char buf[4];
+       const char *p;
+       int quiet; /* Quiet or minimal output mode */
+
+       quiet = 0;
+       p = getenv("quiet");
+       if (p)
+               quiet = simple_strtol(p, NULL, 10);
+       else
+               setenv("quiet", "0");
+
+       puts("\nGateworks Corporation Copyright 2014\n");
+       if (info->model[0]) {
+               printf("Model: %s\n", info->model);
+               printf("MFGDate: %02x-%02x-%02x%02x\n",
+                      info->mfgdate[0], info->mfgdate[1],
+                      info->mfgdate[2], info->mfgdate[3]);
+               printf("Serial:%d\n", info->serial);
+       } else {
+               puts("Invalid EEPROM - board will not function fully\n");
+       }
+       if (quiet)
+               return 0;
+
+       /* Display GSC firmware revision/CRC/status */
+       i2c_set_bus_num(I2C_GSC);
+       if (!gsc_i2c_read(GSC_SC_ADDR, GSC_SC_FWVER, 1, buf, 1)) {
+               printf("GSC:   v%d", buf[0]);
+               if (!gsc_i2c_read(GSC_SC_ADDR, GSC_SC_STATUS, 1, buf, 4)) {
+                       printf(" 0x%04x", buf[2] | buf[3]<<8); /* CRC */
+                       printf(" 0x%02x", buf[0]); /* irq status */
+               }
+               puts("\n");
+       }
+       /* Display RTC */
+       if (!gsc_i2c_read(GSC_RTC_ADDR, 0x00, 1, buf, 4)) {
+               printf("RTC:   %d\n",
+                      buf[0] | buf[1]<<8 | buf[2]<<16 | buf[3]<<24);
+       }
+
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_CMD_BMODE
+/*
+ * BOOT_CFG1, BOOT_CFG2, BOOT_CFG3, BOOT_CFG4
+ * see Table 8-11 and Table 5-9
+ *  BOOT_CFG1[7] = 1 (boot from NAND)
+ *  BOOT_CFG1[5] = 0 - raw NAND
+ *  BOOT_CFG1[4] = 0 - default pad settings
+ *  BOOT_CFG1[3:2] = 00 - devices = 1
+ *  BOOT_CFG1[1:0] = 00 - Row Address Cycles = 3
+ *  BOOT_CFG2[4:3] = 00 - Boot Search Count = 2
+ *  BOOT_CFG2[2:1] = 01 - Pages In Block = 64
+ *  BOOT_CFG2[0] = 0 - Reset time 12ms
+ */
+static const struct boot_mode board_boot_modes[] = {
+       /* NAND: 64pages per block, 3 row addr cycles, 2 copies of FCB/DBBT */
+       { "nand", MAKE_CFGVAL(0x80, 0x02, 0x00, 0x00) },
+       { NULL, 0 },
+};
+#endif
+
+/* late init */
+int misc_init_r(void)
+{
+       struct ventana_board_info *info = &ventana_info;
+       unsigned char reg;
+
+       /* set env vars based on EEPROM data */
+       if (ventana_info.model[0]) {
+               char str[16], fdt[36];
+               char *p;
+               const char *cputype = "";
+               int i;
+
+               /*
+                * FDT name will be prefixed with CPU type.  Three versions
+                * will be created each increasingly generic and bootloader
+                * env scripts will try loading each from most specific to
+                * least.
+                */
+               if (is_cpu_type(MXC_CPU_MX6Q))
+                       cputype = "imx6q";
+               else if (is_cpu_type(MXC_CPU_MX6DL))
+                       cputype = "imx6dl";
+               memset(str, 0, sizeof(str));
+               for (i = 0; i < (sizeof(str)-1) && info->model[i]; i++)
+                       str[i] = tolower(info->model[i]);
+               if (!getenv("model"))
+                       setenv("model", str);
+               if (!getenv("fdt_file")) {
+                       sprintf(fdt, "%s-%s.dtb", cputype, str);
+                       setenv("fdt_file", fdt);
+               }
+               p = strchr(str, '-');
+               if (p) {
+                       *p++ = 0;
+
+                       setenv("model_base", str);
+                       if (!getenv("fdt_file1")) {
+                               sprintf(fdt, "%s-%s.dtb", cputype, str);
+                               setenv("fdt_file1", fdt);
+                       }
+                       str[4] = 'x';
+                       str[5] = 'x';
+                       str[6] = 0;
+                       if (!getenv("fdt_file2")) {
+                               sprintf(fdt, "%s-%s.dtb", cputype, str);
+                               setenv("fdt_file2", fdt);
+                       }
+               }
+
+               /* initialize env from EEPROM */
+               if (test_bit(EECONFIG_ETH0, info->config) &&
+                   !getenv("ethaddr")) {
+                       eth_setenv_enetaddr("ethaddr", info->mac0);
+               }
+               if (test_bit(EECONFIG_ETH1, info->config) &&
+                   !getenv("eth1addr")) {
+                       eth_setenv_enetaddr("eth1addr", info->mac1);
+               }
+
+               /* board serial-number */
+               sprintf(str, "%6d", info->serial);
+               setenv("serial#", str);
+       }
+
+       /* configure PFUZE100 PMIC (not used on all Ventana baseboards) */
+       if ((board_type == GW54xx || board_type == GW54proto) &&
+           !pmic_init(I2C_PMIC)) {
+               struct pmic *p = pmic_get("PFUZE100_PMIC");
+               u32 reg;
+               if (p && !pmic_probe(p)) {
+                       pmic_reg_read(p, PFUZE100_DEVICEID, &reg);
+                       printf("PMIC:  PFUZE100 ID=0x%02x\n", reg);
+
+                       /* Set VGEN1 to 1.5V and enable */
+                       pmic_reg_read(p, PFUZE100_VGEN1VOL, &reg);
+                       reg &= ~(LDO_VOL_MASK);
+                       reg |= (LDOA_1_50V | LDO_EN);
+                       pmic_reg_write(p, PFUZE100_VGEN1VOL, reg);
+
+                       /* Set SWBST to 5.0V and enable */
+                       pmic_reg_read(p, PFUZE100_SWBSTCON1, &reg);
+                       reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK);
+                       reg |= (SWBST_5_00V | SWBST_MODE_AUTO);
+                       pmic_reg_write(p, PFUZE100_SWBSTCON1, reg);
+               }
+       }
+
+       /* setup baseboard specific GPIO pinmux and config */
+       setup_board_gpio(board_type);
+
+#ifdef CONFIG_CMD_BMODE
+       add_board_boot_modes(board_boot_modes);
+#endif
+
+       /*
+        *  The Gateworks System Controller implements a boot
+        *  watchdog (always enabled) as a workaround for IMX6 boot related
+        *  errata such as:
+        *    ERR005768 - no fix
+        *    ERR006282 - fixed in silicon r1.3
+        *    ERR007117 - fixed in silicon r1.3
+        *    ERR007220 - fixed in silicon r1.3
+        *  see http://cache.freescale.com/files/32bit/doc/errata/IMX6DQCE.pdf
+        *
+        * Disable the boot watchdog and display/clear the timeout flag if set
+        */
+       i2c_set_bus_num(I2C_GSC);
+       if (!gsc_i2c_read(GSC_SC_ADDR, GSC_SC_CTRL1, 1, &reg, 1)) {
+               reg |= (1 << GSC_SC_CTRL1_WDDIS);
+               if (gsc_i2c_write(GSC_SC_ADDR, GSC_SC_CTRL1, 1, &reg, 1))
+                       puts("Error: could not disable GSC Watchdog\n");
+       } else {
+               puts("Error: could not disable GSC Watchdog\n");
+       }
+       if (!gsc_i2c_read(GSC_SC_ADDR, GSC_SC_STATUS, 1, &reg, 1)) {
+               if (reg & (1 << GSC_SC_IRQ_WATCHDOG)) { /* watchdog timeout */
+                       puts("GSC boot watchdog timeout detected");
+                       reg &= ~(1 << GSC_SC_IRQ_WATCHDOG); /* clear flag */
+                       gsc_i2c_write(GSC_SC_ADDR, GSC_SC_STATUS, 1, &reg, 1);
+               }
+       }
+
+       return 0;
+}
+
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+
+/* FDT aliases associated with EEPROM config bits */
+const char *fdt_aliases[] = {
+       "ethernet0",
+       "ethernet1",
+       "hdmi_out",
+       "ahci0",
+       "pcie",
+       "ssi0",
+       "ssi1",
+       "lcd0",
+       "lvds0",
+       "lvds1",
+       "usb0",
+       "usb1",
+       "mmc0",
+       "mmc1",
+       "mmc2",
+       "mmc3",
+       "uart0",
+       "uart1",
+       "uart2",
+       "uart3",
+       "uart4",
+       "ipu0",
+       "ipu1",
+       "can0",
+       "mipi_dsi",
+       "mipi_csi",
+       "tzasc0",
+       "tzasc1",
+       "i2c0",
+       "i2c1",
+       "i2c2",
+       "vpu",
+       "csi0",
+       "csi1",
+       "caam",
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       "spi0",
+       "spi1",
+       "spi2",
+       "spi3",
+       "spi4",
+       "spi5",
+       NULL,
+       NULL,
+       "pps",
+       NULL,
+       NULL,
+       NULL,
+       "hdmi_in",
+       "cvbs_out",
+       "cvbs_in",
+       "nand",
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+};
+
+/*
+ * called prior to booting kernel or by 'fdt boardsetup' command
+ *
+ * unless 'fdt_noauto' env var is set we will update the following in the DTB:
+ *  - mtd partitions based on mtdparts/mtdids env
+ *  - system-serial (board serial num from EEPROM)
+ *  - board (full model from EEPROM)
+ *  - peripherals removed from DTB if not loaded on board (per EEPROM config)
+ */
+void ft_board_setup(void *blob, bd_t *bd)
+{
+       int bit;
+       struct ventana_board_info *info = &ventana_info;
+       struct node_info nodes[] = {
+               { "sst,w25q256",          MTD_DEV_TYPE_NOR, },  /* SPI flash */
+               { "fsl,imx6q-gpmi-nand",  MTD_DEV_TYPE_NAND, }, /* NAND flash */
+       };
+       const char *model = getenv("model");
+
+       if (getenv("fdt_noauto")) {
+               puts("   Skiping ft_board_setup (fdt_noauto defined)\n");
+               return;
+       }
+
+       /* Update partition nodes using info from mtdparts env var */
+       puts("   Updating MTD partitions...\n");
+       fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
+
+       if (!model) {
+               puts("invalid board info: Leaving FDT fully enabled\n");
+               return;
+       }
+       printf("   Adjusting FDT per EEPROM for %s...\n", model);
+
+       /* board serial number */
+       fdt_setprop(blob, 0, "system-serial", getenv("serial#"),
+                   strlen(getenv("serial#") + 1));
+
+       /* board (model contains model from device-tree) */
+       fdt_setprop(blob, 0, "board", info->model,
+                   strlen((const char *)info->model) + 1);
+
+       /*
+        * Peripheral Config:
+        *  remove nodes by alias path if EEPROM config tells us the
+        *  peripheral is not loaded on the board.
+        */
+       for (bit = 0; bit < 64; bit++) {
+               if (!test_bit(bit, info->config))
+                       fdt_del_node_and_alias(blob, fdt_aliases[bit]);
+       }
+}
+#endif /* defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) */
+
diff --git a/board/gateworks/gw_ventana/gw_ventana.cfg b/board/gateworks/gw_ventana/gw_ventana.cfg
new file mode 100644 (file)
index 0000000..27f0974
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2013 Gateworks Corporation
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * Refer doc/README.imximage for more details about how-to configure
+ * and create imximage boot image
+ *
+ * The syntax is taken as close as possible with the kwbimage
+ */
+
+/* image version */
+IMAGE_VERSION 2
+
+/*
+ * Boot Device : one of
+ * spi, sd, nand, sata
+ */
+#ifdef CONFIG_SPI_FLASH
+BOOT_FROM      spi
+#else
+BOOT_FROM      nand
+#endif
+
+#define __ASSEMBLY__
+#include <config.h>
+#include "asm/arch/mx6-ddr.h"
+#include "asm/arch/iomux.h"
+#include "asm/arch/crm_regs.h"
+
+/* Memory configuration (size is overridden via eeprom config) */
+#include "../../boundary/nitrogen6x/ddr-setup.cfg"
+#if defined(CONFIG_MX6Q) && CONFIG_DDR_MB == 1024
+  #include "../../boundary/nitrogen6x/1066mhz_4x128mx16.cfg"
+#elif defined(CONFIG_MX6DL) && CONFIG_DDR_MB == 1024
+  #include "../../boundary/nitrogen6x/800mhz_4x128mx16.cfg"
+#elif defined(CONFIG_MX6DL) && CONFIG_DDR_MB == 512
+  #include "../../boundary/nitrogen6x/800mhz_2x128mx16.cfg"
+#elif defined(CONFIG_MX6Q) && CONFIG_DDR_MB == 512
+  #include "../../boundary/nitrogen6x/800mhz_2x128mx16.cfg"
+#else
+  #error "Unsupported CPU/Memory configuration"
+#endif
+#include "clocks.cfg"
diff --git a/board/gateworks/gw_ventana/ventana_eeprom.h b/board/gateworks/gw_ventana/ventana_eeprom.h
new file mode 100644 (file)
index 0000000..d310bfd
--- /dev/null
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2013 Gateworks Corporation
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef _VENTANA_EEPROM_
+#define _VENTANA_EEPROM_
+
+struct ventana_board_info {
+       u8 mac0[6];          /* 0x00: MAC1 */
+       u8 mac1[6];          /* 0x06: MAC2 */
+       u8 res0[12];         /* 0x0C: reserved */
+       u32 serial;          /* 0x18: Serial Number (read only) */
+       u8 res1[4];          /* 0x1C: reserved */
+       u8 mfgdate[4];       /* 0x20: MFG date (read only) */
+       u8 res2[7];          /* 0x24 */
+       /* sdram config */
+       u8 sdram_size;       /* 0x2B: enum (512,1024,2048) MB */
+       u8 sdram_speed;      /* 0x2C: enum (100,133,166,200,267,333,400) MHz */
+       u8 sdram_width;      /* 0x2D: enum (32,64) bit */
+       /* cpu config */
+       u8 cpu_speed;        /* 0x2E: enum (800,1000,1200) MHz */
+       u8 cpu_type;         /* 0x2F: enum (imx6q,imx6d,imx6dl,imx6s) */
+       u8 model[16];        /* 0x30: model string */
+       /* FLASH config */
+       u8 nand_flash_size;  /* 0x40: enum (4,8,16,32,64,128) MB */
+       u8 spi_flash_size;   /* 0x41: enum (4,8,16,32,64,128) MB */
+
+       /* Config1: SoC Peripherals */
+       u8 config[8];        /* 0x42: loading options */
+
+       u8 res3[4];          /* 0x4A */
+
+       u8 chksum[2];        /* 0x4E */
+};
+
+/* config bits */
+enum {
+       EECONFIG_ETH0,
+       EECONFIG_ETH1,
+       EECONFIG_HDMI_OUT,
+       EECONFIG_SATA,
+       EECONFIG_PCIE,
+       EECONFIG_SSI0,
+       EECONFIG_SSI1,
+       EECONFIG_LCD,
+       EECONFIG_LVDS0,
+       EECONFIG_LVDS1,
+       EECONFIG_USB0,
+       EECONFIG_USB1,
+       EECONFIG_SD0,
+       EECONFIG_SD1,
+       EECONFIG_SD2,
+       EECONFIG_SD3,
+       EECONFIG_UART0,
+       EECONFIG_UART1,
+       EECONFIG_UART2,
+       EECONFIG_UART3,
+       EECONFIG_UART4,
+       EECONFIG_IPU0,
+       EECONFIG_IPU1,
+       EECONFIG_FLEXCAN,
+       EECONFIG_MIPI_DSI,
+       EECONFIG_MIPI_CSI,
+       EECONFIG_TZASC0,
+       EECONFIG_TZASC1,
+       EECONFIG_I2C0,
+       EECONFIG_I2C1,
+       EECONFIG_I2C2,
+       EECONFIG_VPU,
+       EECONFIG_CSI0,
+       EECONFIG_CSI1,
+       EECONFIG_CAAM,
+       EECONFIG_MEZZ,
+       EECONFIG_RES1,
+       EECONFIG_RES2,
+       EECONFIG_RES3,
+       EECONFIG_RES4,
+       EECONFIG_ESPCI0,
+       EECONFIG_ESPCI1,
+       EECONFIG_ESPCI2,
+       EECONFIG_ESPCI3,
+       EECONFIG_ESPCI4,
+       EECONFIG_ESPCI5,
+       EECONFIG_RES5,
+       EECONFIG_RES6,
+       EECONFIG_GPS,
+       EECONFIG_SPIFL0,
+       EECONFIG_SPIFL1,
+       EECONFIG_GSPBATT,
+       EECONFIG_HDMI_IN,
+       EECONFIG_VID_OUT,
+       EECONFIG_VID_IN,
+       EECONFIG_NAND,
+       EECONFIG_RES8,
+       EECONFIG_RES9,
+       EECONFIG_RES10,
+       EECONFIG_RES11,
+       EECONFIG_RES12,
+       EECONFIG_RES13,
+       EECONFIG_RES14,
+       EECONFIG_RES15,
+};
+
+#endif
index 217237900e36bd47baa46a400fed8862f168176f..38ac93d79573eeb4fde953a71b3cbfe59499d0a3 100644 (file)
@@ -232,13 +232,6 @@ int board_eth_init(bd_t *bis)
 
        factoryset_setenv();
 
-       /* Reset SMSC LAN9303 switch for default configuration */
-       gpio_request(GPIO_LAN9303_NRST, "nRST");
-       gpio_direction_output(GPIO_LAN9303_NRST, 0);
-       /* assert active low reset for 200us */
-       udelay(200);
-       gpio_set_value(GPIO_LAN9303_NRST, 1);
-
        /* Set rgmii mode and enable rmii clock to be sourced from chip */
        writel((RMII_MODE_ENABLE | RMII_CHIPCKL_ENABLE), &cdev->miisel);
 
@@ -249,6 +242,25 @@ int board_eth_init(bd_t *bis)
                n += rv;
        return n;
 }
+
+static int do_switch_reset(cmd_tbl_t *cmdtp, int flag, int argc,
+                          char *const argv[])
+{
+       /* Reset SMSC LAN9303 switch for default configuration */
+       gpio_request(GPIO_LAN9303_NRST, "nRST");
+       gpio_direction_output(GPIO_LAN9303_NRST, 0);
+       /* assert active low reset for 200us */
+       udelay(200);
+       gpio_set_value(GPIO_LAN9303_NRST, 1);
+
+       return 0;
+};
+
+U_BOOT_CMD(
+       switch_rst, CONFIG_SYS_MAXARGS, 1,      do_switch_reset,
+       "Reset LAN9303 switch via its reset pin",
+       ""
+);
 #endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */
 #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */
 
index 050845777d22bc042cf74b28ec465b03fc304f33..f1951dc5ef0a3f0ed2e5c1b39de6b4c1331278a7 100644 (file)
@@ -25,6 +25,8 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <linux/fb.h>
+#include <phy.h>
+#include <input.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -55,7 +57,7 @@ static iomux_v3_cfg_t const uart1_pads[] = {
        MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
 };
 
-iomux_v3_cfg_t const usdhc1_pads[] = {
+static iomux_v3_cfg_t const usdhc1_pads[] = {
        MX6_PAD_SD1_CLK__SD1_CLK   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
        MX6_PAD_SD1_CMD__SD1_CMD   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
        MX6_PAD_SD1_DAT0__SD1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
index a32f46bc4e45ca1d4e86a0e622ec9e7be65920f8..f02fb36d871274aacdc8e506c1a2f5f7d3fa6513 100644 (file)
@@ -322,6 +322,11 @@ Active  arm         armv7          mx6         freescale       mx6qsabreauto
 Active  arm         armv7          mx6         freescale       mx6sabresd          mx6dlsabresd                         mx6sabresd:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL                                                             Fabio Estevam <fabio.estevam@freescale.com>
 Active  arm         armv7          mx6         freescale       mx6sabresd          mx6qsabresd                          mx6sabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q                                                           Fabio Estevam <fabio.estevam@freescale.com>
 Active  arm         armv7          mx6         freescale       mx6slevk            mx6slevk                             mx6slevk:IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL                                                                   Fabio Estevam <fabio.estevam@freescale.com>
+Active  arm         armv7          mx6         gateworks       gw_ventana          gwventanadl                          gw_ventana:IMX_CONFIG=board/gateworks/gw_ventana/gw_ventana.cfg,MX6DL,DDR_MB=512                                                  Tim Harvey <tharvey@gateworks.com>
+Active  arm         armv7          mx6         gateworks       gw_ventana          gwventanadl1g                        gw_ventana:IMX_CONFIG=board/gateworks/gw_ventana/gw_ventana.cfg,MX6DL,DDR_MB=1024                                                 Tim Harvey <tharvey@gateworks.com>
+Active  arm         armv7          mx6         gateworks       gw_ventana          gwventanaq                           gw_ventana:IMX_CONFIG=board/gateworks/gw_ventana/gw_ventana.cfg,MX6Q,DDR_MB=512                                                   Tim Harvey <tharvey@gateworks.com>
+Active  arm         armv7          mx6         gateworks       gw_ventana          gwventanaq1g                         gw_ventana:IMX_CONFIG=board/gateworks/gw_ventana/gw_ventana.cfg,MX6Q,DDR_MB=1024                                                  Tim Harvey <tharvey@gateworks.com>
+Active  arm         armv7          mx6         gateworks       gw_ventana          gwventanaq1gspi                      gw_ventana:IMX_CONFIG=board/gateworks/gw_ventana/gw_ventana.cfg,MX6Q,DDR_MB=1024,SPI_FLASH                                        Tim Harvey <tharvey@gateworks.com>
 Active  arm         armv7          mx6         solidrun        hummingboard        hummingboard_solo                    hummingboard:IMX_CONFIG=board/solidrun/hummingboard/solo.cfg,MX6S,DDR_MB=512                                                      Jon Nettleton <jon.nettleton@gmail.com>
 Active  arm         armv7          omap3       -               overo               omap3_overo                          -                                                                                                                                 Steve Sakoman <sakoman@gmail.com>
 Active  arm         armv7          omap3       -               pandora             omap3_pandora                        -                                                                                                                                 Grazvydas Ignotas <notasas@gmail.com>
index dd6c26a7fb3af4916f4bba73275c40c03e19c08b..bd5fba21cee5651ef3c8d9bb830fab2f6475ef3d 100644 (file)
@@ -941,11 +941,7 @@ static int cpsw_phy_init(struct eth_device *dev, struct cpsw_slave *slave)
 {
        struct cpsw_priv *priv = (struct cpsw_priv *)dev->priv;
        struct phy_device *phydev;
-       u32 supported = (SUPPORTED_10baseT_Half |
-                       SUPPORTED_10baseT_Full |
-                       SUPPORTED_100baseT_Half |
-                       SUPPORTED_100baseT_Full |
-                       SUPPORTED_1000baseT_Full);
+       u32 supported = PHY_GBIT_FEATURES;
 
        phydev = phy_connect(priv->bus,
                        slave->data->phy_addr,
index 0b45ffad672f940bcf4d45a27db65d0853b0a73f..4129bdabfbef945c22fe50f1c0a72ed93a39fdd2 100644 (file)
@@ -9,5 +9,6 @@ obj-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
 obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
 obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
 obj-$(CONFIG_POWER_MAX77686) += pmic_max77686.o
+obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
 obj-$(CONFIG_POWER_TPS65217) += pmic_tps65217.o
 obj-$(CONFIG_POWER_TPS65910) += pmic_tps65910.o
diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c
new file mode 100644 (file)
index 0000000..22c1f15
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2014 Gateworks Corporation
+ * Tim Harvey <tharvey@gateworks.com>
+ *
+ * SPDX-License-Identifier:      GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <i2c.h>
+#include <power/pmic.h>
+#include <power/pfuze100_pmic.h>
+
+int pmic_init(unsigned char bus)
+{
+       static const char name[] = "PFUZE100_PMIC";
+       struct pmic *p = pmic_alloc();
+
+       if (!p) {
+               printf("%s: POWER allocation error!\n", __func__);
+               return -ENOMEM;
+       }
+
+       p->name = name;
+       p->interface = PMIC_I2C;
+       p->number_of_regs = PMIC_NUM_OF_REGS;
+       p->hw.i2c.addr = CONFIG_POWER_PFUZE100_I2C_ADDR;
+       p->hw.i2c.tx_num = 1;
+       p->bus = bus;
+
+       return 0;
+}
index a3ad056473c8844ac9100c4153167e668cbeeab3..651e46e4bd20b345b83dcd9a87d89a5196c583bf 100644 (file)
@@ -260,8 +260,9 @@ int omap3_spi_write(struct spi_slave *slave, unsigned int len, const void *txp,
        }
 
        /* wait to finish of transfer */
-       while (!(readl(&ds->regs->channel[ds->slave.cs].chstat) &
-                        OMAP3_MCSPI_CHSTAT_EOT));
+       while ((readl(&ds->regs->channel[ds->slave.cs].chstat) &
+                        (OMAP3_MCSPI_CHSTAT_EOT | OMAP3_MCSPI_CHSTAT_TXS)) !=
+                        (OMAP3_MCSPI_CHSTAT_EOT | OMAP3_MCSPI_CHSTAT_TXS));
 
        /* Disable the channel otherwise the next immediate RX will get affected */
        omap3_spi_set_enable(ds,OMAP3_MCSPI_CHCTRL_DIS);
index 2020e7f8143745220364a76ae20ab141d9e5556f..fd6f52c6b105f381a68a28bb37bf2493211a9dbe 100644 (file)
 #define CONFIG_SYS_FLASH_BASE          (0x08000000)
 #define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
+/* Reduce SPL size by removing unlikey targets */
+#undef CONFIG_SPL_SPI_SUPPORT
 #ifdef CONFIG_NOR_BOOT
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE           (128 << 10)     /* 128 KiB */
index cfc4f9bb8ebb2856c6508ca1e0c304d876453cfb..aae05e0333039c2647fc1571ed04d38f80d61888 100644 (file)
                                                        /* CS0 */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1               /* Max number of NAND */
                                                        /* devices */
+#define GPMC_NAND_ECC_LP_x8_LAYOUT
+
 /* Environment information */
 #define CONFIG_BOOTDELAY               3
 #define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
new file mode 100644 (file)
index 0000000..3398390
--- /dev/null
@@ -0,0 +1,425 @@
+/*
+ * Copyright (C) 2013 Gateworks Corporation
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include "mx6_common.h"
+#define CONFIG_MX6
+#define CONFIG_DISPLAY_CPUINFO         /* display cpu info */
+#define CONFIG_DISPLAY_BOARDINFO_LATE  /* display board info (after reloc) */
+
+#define CONFIG_MACH_TYPE       4520   /* Gateworks Ventana Platform */
+
+#include <asm/arch/imx-regs.h>
+#include <asm/imx-common/gpio.h>
+
+/* ATAGs */
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+#define CONFIG_SERIAL_TAG
+#define CONFIG_REVISION_TAG
+
+/* Size of malloc() pool */
+#define CONFIG_SYS_MALLOC_LEN          (10 * 1024 * 1024)
+
+/* Init Functions */
+#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_MISC_INIT_R
+
+/* GPIO */
+#define CONFIG_MXC_GPIO
+
+/* Serial */
+#define CONFIG_MXC_UART
+#define CONFIG_MXC_UART_BASE          UART2_BASE
+
+#ifdef CONFIG_SPI_FLASH
+
+/* SPI */
+#define CONFIG_CMD_SF
+#ifdef CONFIG_CMD_SF
+  #define CONFIG_MXC_SPI
+  #define CONFIG_SPI_FLASH_MTD
+  #define CONFIG_SPI_FLASH_BAR
+  #define CONFIG_SPI_FLASH_WINBOND
+  #define CONFIG_SF_DEFAULT_BUS              0
+  #define CONFIG_SF_DEFAULT_CS               (0|(IMX_GPIO_NR(3, 19)<<8))
+                                            /* GPIO 3-19 (21248) */
+  #define CONFIG_SF_DEFAULT_SPEED            30000000
+  #define CONFIG_SF_DEFAULT_MODE             (SPI_MODE_0)
+#endif
+
+#else
+/* Enable NAND support */
+#define CONFIG_CMD_TIME
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_NAND_TRIMFFS
+#ifdef CONFIG_CMD_NAND
+  #define CONFIG_NAND_MXS
+  #define CONFIG_SYS_MAX_NAND_DEVICE   1
+  #define CONFIG_SYS_NAND_BASE         0x40000000
+  #define CONFIG_SYS_NAND_5_ADDR_CYCLE
+  #define CONFIG_SYS_NAND_ONFI_DETECTION
+
+  /* DMA stuff, needed for GPMI/MXS NAND support */
+  #define CONFIG_APBH_DMA
+  #define CONFIG_APBH_DMA_BURST
+  #define CONFIG_APBH_DMA_BURST8
+#endif
+
+#endif /* CONFIG_SPI_FLASH */
+
+/* Flattened Image Tree Suport */
+#define CONFIG_FIT
+#define CONFIG_FIT_VERBOSE
+
+/* I2C Configs */
+#define CONFIG_CMD_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_SPEED             100000
+
+/* MMC Configs */
+#define CONFIG_FSL_ESDHC
+#define CONFIG_FSL_USDHC
+#define CONFIG_SYS_FSL_ESDHC_ADDR      0
+#define CONFIG_SYS_FSL_USDHC_NUM       1
+#define CONFIG_MMC
+#define CONFIG_CMD_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_BOUNCE_BUFFER
+
+/* Filesystem support */
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_UBIFS
+#define CONFIG_DOS_PARTITION
+
+/* Network config - Allow larger/faster download for TFTP/NFS */
+#define CONFIG_IP_DEFRAG
+#define CONFIG_TFTP_BLOCKSIZE 4096
+#define CONFIG_NFS_READ_SIZE  4096
+
+/*
+ * SATA Configs
+ */
+#define CONFIG_CMD_SATA
+#ifdef CONFIG_CMD_SATA
+  #define CONFIG_DWC_AHSATA
+  #define CONFIG_SYS_SATA_MAX_DEVICE   1
+  #define CONFIG_DWC_AHSATA_PORT_ID    0
+  #define CONFIG_DWC_AHSATA_BASE_ADDR  SATA_ARB_BASE_ADDR
+  #define CONFIG_LBA48
+  #define CONFIG_LIBATA
+#endif
+
+/*
+ * PCI express
+ */
+#define CONFIG_CMD_PCI
+#ifdef CONFIG_CMD_PCI
+#define CONFIG_PCI
+#define CONFIG_PCI_PNP
+#define CONFIG_PCI_SCAN_SHOW
+#define CONFIG_PCIE_IMX
+#endif
+
+/*
+ * PMIC
+ */
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_PFUZE100
+#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
+
+/* Various command support */
+#include <config_cmd_default.h>
+#undef CONFIG_CMD_IMLS
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_BMODE         /* set eFUSE shadow for a boot dev and reset */
+#define CONFIG_CMD_HDMIDETECT    /* detect HDMI output device */
+#define CONFIG_CMD_SETEXPR
+#define CONFIG_CMD_BOOTZ
+#define CONFIG_CMD_GSC
+#define CONFIG_CMD_UBI
+#define CONFIG_RBTREE
+#define CONFIG_LZO
+#define CONFIG_CMD_FUSE          /* eFUSE read/write support */
+#ifdef CONFIG_CMD_FUSE
+#define CONFIG_MXC_OCOTP
+#endif
+
+
+/* Ethernet support */
+#define CONFIG_FEC_MXC
+#define CONFIG_MII
+#define IMX_FEC_BASE             ENET_BASE_ADDR
+#define CONFIG_FEC_XCV_TYPE      RGMII
+#define CONFIG_ETHPRIME          "FEC"
+#define CONFIG_FEC_MXC_PHYADDR   0
+#define CONFIG_PHYLIB
+#define CONFIG_ARP_TIMEOUT       200UL
+
+/* USB Configs */
+#define CONFIG_CMD_USB
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_MX6
+#define CONFIG_USB_STORAGE
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_ETHER_SMSC95XX
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET  /* For OTG port */
+#define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CONFIG_MXC_USB_FLAGS      0
+#define CONFIG_USB_KEYBOARD
+#define CONFIG_CI_UDC
+#define CONFIG_USBD_HS
+#define CONFIG_USB_GADGET_DUALSPEED
+#define CONFIG_USB_ETHER
+#define CONFIG_USB_ETH_CDC
+#define CONFIG_NETCONSOLE
+#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
+#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 1200
+
+/* serial console (ttymxc1,115200) */
+#define CONFIG_CONS_INDEX              1
+#define CONFIG_BAUDRATE                115200
+
+/* Miscellaneous configurable options */
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_PROMPT                   "Ventana > "
+#define CONFIG_SYS_CBSIZE                   1024
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_HWCONFIG
+
+/* Print Buffer Size */
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_MAXARGS                16
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+
+/* Memory configuration */
+#define CONFIG_SYS_MEMTEST_START       0x10000000
+#define CONFIG_SYS_MEMTEST_END        0x10010000
+#define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
+#define CONFIG_SYS_TEXT_BASE            0x17800000
+#define CONFIG_SYS_LOAD_ADDR           0x12000000
+
+/* Physical Memory Map */
+#define CONFIG_NR_DRAM_BANKS           1
+#define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
+#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+
+#define CONFIG_SYS_INIT_SP_OFFSET \
+       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR \
+       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+
+/* FLASH and environment organization */
+#define CONFIG_SYS_NO_FLASH  /* no NOR flash */
+
+/*
+ * MTD Command for mtdparts
+ */
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#ifdef CONFIG_SPI_FLASH
+#define MTDIDS_DEFAULT    "nor0=nor"
+#define MTDPARTS_DEFAULT  \
+       "mtdparts=nor:512k(uboot),64k(env),2m(kernel),-(rootfs)"
+#else
+#define MTDIDS_DEFAULT    "nand0=nand"
+#define MTDPARTS_DEFAULT  "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
+#endif
+
+/* Persistent Environment Config */
+#define CONFIG_ENV_OVERWRITE    /* allow to overwrite serial and ethaddr */
+#ifdef CONFIG_SPI_FLASH
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#else
+#define CONFIG_ENV_IS_IN_NAND
+#endif
+#if defined(CONFIG_ENV_IS_IN_MMC)
+  #define CONFIG_ENV_OFFSET              (6 * 64 * 1024)
+  #define CONFIG_ENV_SIZE                (8 * 1024)
+  #define CONFIG_SYS_MMC_ENV_DEV         0
+#elif defined(CONFIG_ENV_IS_IN_NAND)
+  #define CONFIG_ENV_OFFSET              (16 << 20)
+  #define CONFIG_ENV_SECT_SIZE           (128 << 10)
+  #define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
+  #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + (512 << 10))
+  #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
+#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
+  #define CONFIG_ENV_OFFSET              (512 * 1024)
+  #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
+  #define CONFIG_ENV_SIZE                (8 * 1024)
+  #define CONFIG_ENV_SPI_BUS             CONFIG_SF_DEFAULT_BUS
+  #define CONFIG_ENV_SPI_CS              CONFIG_SF_DEFAULT_CS
+  #define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
+  #define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
+#endif
+
+/* Environment */
+#define CONFIG_BOOTDELAY          3
+#define CONFIG_LOADADDR           CONFIG_SYS_LOAD_ADDR
+#define CONFIG_IPADDR             192.168.1.1
+#define CONFIG_SERVERIP           192.168.1.146
+#define HWCONFIG_DEFAULT \
+       "hwconfig=rs232;" \
+       "dio0:mode=gpio;dio1:mode=gpio;dio2:mode=gpio;dio3:mode=gpio\0" \
+
+#define CONFIG_EXTRA_ENV_SETTINGS_COMMON \
+       "console=ttymxc1\0" \
+       "bootdevs=usb mmc sata flash\0" \
+       HWCONFIG_DEFAULT \
+       "video=\0" \
+       \
+       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" MTDIDS_DEFAULT "\0" \
+       \
+       "fdt_high=0xffffffff\0" \
+       "fdt_addr=0x18000000\0" \
+       "loadfdt=" \
+               "if ${fsload} ${fdt_addr} boot/${fdt_file}; then " \
+                       "echo Loaded DTB from boot/${fdt_file}; " \
+               "elif ${fsload} ${fdt_addr} boot/${fdt_file1}; then " \
+                       "echo Loaded DTB from boot/${fdt_file1}; " \
+               "elif ${fsload} ${fdt_addr} boot/${fdt_file2}; then " \
+                               "echo Loaded DTB from boot/${fdt_file2}; " \
+               "fi\0" \
+       \
+       "script=boot/6x_bootscript-ventana\0" \
+       "loadscript=" \
+               "if ${fsload} ${loadaddr} ${script}; then " \
+                       "source; " \
+               "fi\0" \
+       \
+       "uimage=boot/uImage\0" \
+       "mmc_root=/dev/mmcblk0p1 rootfstype=ext4 rootwait rw\0" \
+       "mmc_boot=" \
+               "setenv fsload 'ext2load mmc 0:1'; " \
+               "mmc dev 0 && mmc rescan && " \
+               "run loadscript; " \
+               "if ${fsload} ${loadaddr} ${uimage}; then " \
+                       "setenv bootargs console=${console},${baudrate} " \
+                               "root=/dev/mmcblk0p1 rootfstype=ext4 " \
+                               "rootwait rw ${video} ${extra}; " \
+                       "if run loadfdt && fdt addr ${fdt_addr}; then " \
+                               "bootm ${loadaddr} - ${fdt_addr}; " \
+                       "else " \
+                               "bootm; " \
+                       "fi; " \
+               "fi\0" \
+       \
+       "sata_boot=" \
+               "setenv fsload 'ext2load sata 0:1'; sata init && " \
+               "run loadscript; " \
+               "if ${fsload} ${loadaddr} ${uimage}; then " \
+                       "setenv bootargs console=${console},${baudrate} " \
+                               "root=/dev/sda1 rootfstype=ext4 " \
+                               "rootwait rw ${video} ${extra}; " \
+                       "if run loadfdt && fdt addr ${fdt_addr}; then " \
+                               "bootm ${loadaddr} - ${fdt_addr}; " \
+                       "else " \
+                               "bootm; " \
+                       "fi; " \
+               "fi\0" \
+       "usb_boot=" \
+               "setenv fsload 'ext2load usb 0:1'; usb start && usb dev 0 && " \
+               "run loadscript; " \
+               "if ${fsload} ${loadaddr} ${uimage}; then " \
+                       "setenv bootargs console=${console},${baudrate} " \
+                               "root=/dev/sda1 rootfstype=ext4 " \
+                               "rootwait rw ${video} ${extra}; " \
+                       "if run loadfdt && fdt addr ${fdt_addr}; then " \
+                               "bootm ${loadaddr} - ${fdt_addr}; " \
+                       "else " \
+                               "bootm; " \
+                       "fi; " \
+               "fi\0"
+
+#ifdef CONFIG_SPI_FLASH
+       #define CONFIG_EXTRA_ENV_SETTINGS \
+       CONFIG_EXTRA_ENV_SETTINGS_COMMON \
+       "image_os=ventana/openwrt-imx6-imx6q-gw5400-a-squashfs.bin\0" \
+       "image_uboot=ventana/u-boot_spi.imx\0" \
+       \
+       "spi_koffset=0x90000\0" \
+       "spi_klen=0x200000\0" \
+       \
+       "spi_updateuboot=echo Updating uboot from " \
+               "${serverip}:${image_uboot}...; " \
+               "tftpboot ${loadaddr} ${image_uboot} && " \
+               "sf probe && sf erase 0 80000 && " \
+                       "sf write ${loadaddr} 400 ${filesize}\0" \
+       "spi_update=echo Updating OS from ${serverip}:${image_os} " \
+               "to ${spi_koffset} ...; " \
+               "tftp ${loadaddr} ${image_os} && " \
+               "sf probe && " \
+               "sf update ${loadaddr} ${spi_koffset} ${filesize}\0" \
+       \
+       "flash_boot=" \
+               "if sf probe && " \
+               "sf read ${loadaddr} ${spi_koffset} ${spi_klen}; then " \
+                       "setenv bootargs console=${console},${baudrate} " \
+                               "root=/dev/mtdblock3 " \
+                               "rootfstype=squashfs,jffs2 " \
+                               "${video} ${extra}; " \
+                       "bootm; " \
+               "fi\0"
+#else
+       #define CONFIG_EXTRA_ENV_SETTINGS \
+       CONFIG_EXTRA_ENV_SETTINGS_COMMON \
+       "image_rootfs=openwrt-imx6-ventana-rootfs.ubi\0" \
+       \
+       "nand_update=echo Updating NAND from ${serverip}:${image_rootfs}...; " \
+               "tftp ${loadaddr} ${image_rootfs} && " \
+               "nand erase.part rootfs && " \
+               "nand write ${loadaddr} rootfs ${filesize}\0" \
+       \
+       "flash_boot=" \
+               "setenv fsload 'ubifsload'; " \
+               "ubi part rootfs && ubifsmount ubi0:rootfs; " \
+               "run loadscript; " \
+               "if ${fsload} ${loadaddr} ${uimage}; then " \
+                       "setenv bootargs console=${console},${baudrate} " \
+                               "root=ubi0:rootfs ubi.mtd=2 " \
+                               "rootfstype=ubifs ${video} ${extra}; " \
+                       "if run loadfdt && fdt addr ${fdt_addr}; then " \
+                               "ubifsumount; " \
+                               "bootm ${loadaddr} - ${fdt_addr}; " \
+                       "else " \
+                               "ubifsumount; bootm; " \
+                       "fi; " \
+               "fi\0"
+#endif
+
+#define CONFIG_BOOTCOMMAND \
+       "for btype in ${bootdevs}; do " \
+               "echo; echo Attempting ${btype} boot...; " \
+               "if run ${btype}_boot; then; fi; " \
+       "done"
+
+/* Device Tree Support */
+#define CONFIG_OF_BOARD_SETUP
+#define CONFIG_OF_LIBFDT
+#define CONFIG_FDT_FIXUP_PARTITIONS
+
+#ifndef CONFIG_SYS_DCACHE_OFF
+  #define CONFIG_CMD_CACHE
+#endif
+
+#endif                        /* __CONFIG_H */
index af6aafaf1c6257a3287c57579b780777232095ba..aff2419f852593ee5ed1c9832b93f2640d58c9f2 100644 (file)
@@ -62,6 +62,7 @@
 /* No NOR flash present */
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE        (8 * 1024)
+#define CONFIG_SYS_MMC_ENV_DEV         0
 
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_IS_IN_MMC
@@ -69,7 +70,7 @@
 
 /* U-Boot general configuration */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE      256     /* Console I/O Buffer Size  */
+#define CONFIG_SYS_CBSIZE      1024    /* Console I/O Buffer Size  */
 /* Print buffer sz */
 #define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \
                sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_LOADADDR                0x81000000      /* loadaddr env var */
 #define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
 
+#define CONFIG_DEFAULT_FDT_FILE                "imx25-pdk.dtb"
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
-       "uimage=uImage\0" \
-       "netargs=setenv bootargs console=ttymxc0,${baudrate} " \
+       "image=zImage\0" \
+       "console=ttymxc0\0" \
+       "splashpos=m,m\0" \
+       "fdt_high=0xffffffff\0" \
+       "initrd_high=0xffffffff\0" \
+       "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+       "fdt_addr=0x82000000\0" \
+       "boot_fdt=try\0" \
+       "ip_dyn=yes\0" \
+       "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+       "mmcpart=1\0" \
+       "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+       "update_sd_firmware_filename=u-boot.imx\0" \
+       "update_sd_firmware=" \
+               "if test ${ip_dyn} = yes; then " \
+                       "setenv get_cmd dhcp; " \
+               "else " \
+                       "setenv get_cmd tftp; " \
+               "fi; " \
+               "if mmc dev ${mmcdev}; then "   \
+                       "if ${get_cmd} ${update_sd_firmware_filename}; then " \
+                               "setexpr fw_sz ${filesize} / 0x200; " \
+                               "setexpr fw_sz ${fw_sz} + 1; "  \
+                               "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
+                       "fi; "  \
+               "fi\0" \
+       "mmcargs=setenv bootargs console=${console},${baudrate} " \
+               "root=${mmcroot}\0" \
+       "loadbootscript=" \
+               "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+       "bootscript=echo Running bootscript from mmc ...; " \
+               "source\0" \
+       "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
+       "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+       "mmcboot=echo Booting from mmc ...; " \
+               "run mmcargs; " \
+               "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+                       "if run loadfdt; then " \
+                               "bootz ${loadaddr} - ${fdt_addr}; " \
+                       "else " \
+                               "if test ${boot_fdt} = try; then " \
+                                       "bootz; " \
+                               "else " \
+                                       "echo WARN: Cannot load the DT; " \
+                               "fi; " \
+                       "fi; " \
+               "else " \
+                       "bootz; " \
+               "fi;\0" \
+       "netargs=setenv bootargs console=${console},${baudrate} " \
                "root=/dev/nfs " \
-               "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-       "bootcmd=run netargs; dhcp ${uimage}; bootm\0" \
+       "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+               "netboot=echo Booting from net ...; " \
+               "run netargs; " \
+               "if test ${ip_dyn} = yes; then " \
+                       "setenv get_cmd dhcp; " \
+               "else " \
+                       "setenv get_cmd tftp; " \
+               "fi; " \
+               "${get_cmd} ${image}; " \
+               "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+                       "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+                               "bootz ${loadaddr} - ${fdt_addr}; " \
+                       "else " \
+                               "if test ${boot_fdt} = try; then " \
+                                       "bootz; " \
+                               "else " \
+                                       "echo WARN: Cannot load the DT; " \
+                               "fi; " \
+                       "fi; " \
+               "else " \
+                       "bootz; " \
+               "fi;\0"
+
+#define CONFIG_BOOTCOMMAND \
+          "mmc dev ${mmcdev}; if mmc rescan; then " \
+                  "if run loadbootscript; then " \
+                          "run bootscript; " \
+                  "else " \
+                          "if run loadimage; then " \
+                                  "run mmcboot; " \
+                          "else run netboot; " \
+                          "fi; " \
+                  "fi; " \
+          "else run netboot; fi"
+
+/* Miscellaneous configurable options */
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_AUTO_COMPLETE
+
+/* Print Buffer Size */
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_MAXARGS            16
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
 #endif /* __CONFIG_H */
index 111372c9fd08f9d0817a84e95fdae9b84fcda208..652cf3bab707fbf952f597489cfb516031ef59c8 100644 (file)
@@ -612,6 +612,8 @@ struct fb_videomode {
        u32 flag;
 };
 
+int board_video_skip(void);
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_FB_H */
index e95a2376d20001ff71e667daf4505e92afc688a7..b65ad9e41e95e11f0bbfbb58f615d21b6599f098 100644 (file)
@@ -354,4 +354,6 @@ struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode);
 int mmc_legacy_init(int verbose);
 #endif
 
+int board_mmc_init(bd_t *bis);
+
 #endif /* _MMC_H_ */
index 1f22fa180c6247ee162b554e88780d516b6bba3a..d3ecd6378b3b97b718748ad06a8346a8dc409f03 100644 (file)
@@ -234,6 +234,8 @@ int phy_smsc_init(void);
 int phy_teranetics_init(void);
 int phy_vitesse_init(void);
 
+int board_phy_config(struct phy_device *phydev);
+
 /* PHY UIDs for various PHYs that are referenced in external code */
 #define PHY_UID_TN2020 0x00a19410
 
diff --git a/include/power/pfuze100_pmic.h b/include/power/pfuze100_pmic.h
new file mode 100644 (file)
index 0000000..2a9032a
--- /dev/null
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (C) 2014 Gateworks Corporation
+ *  Tim Harvey <tharvey@gateworks.com>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef __PFUZE100_PMIC_H_
+#define __PFUZE100_PMIC_H_
+
+/* PFUZE100 registers */
+enum {
+       PFUZE100_DEVICEID       = 0x00,
+       PFUZE100_REVID          = 0x03,
+       PFUZE100_FABID          = 0x04,
+
+       PFUZE100_SW1ABVOL       = 0x20,
+       PFUZE100_SW1CVOL        = 0x2e,
+       PFUZE100_SW2VOL         = 0x35,
+       PFUZE100_SW3AVOL        = 0x3c,
+       PFUZE100_SW3BVOL        = 0x43,
+       PFUZE100_SW4VOL         = 0x4a,
+       PFUZE100_SWBSTCON1      = 0x66,
+       PFUZE100_VREFDDRCON     = 0x6a,
+       PFUZE100_VSNVSVOL       = 0x6b,
+       PFUZE100_VGEN1VOL       = 0x6c,
+       PFUZE100_VGEN2VOL       = 0x6d,
+       PFUZE100_VGEN3VOL       = 0x6e,
+       PFUZE100_VGEN4VOL       = 0x6f,
+       PFUZE100_VGEN5VOL       = 0x70,
+       PFUZE100_VGEN6VOL       = 0x71,
+
+       PMIC_NUM_OF_REGS        = 0x7f,
+};
+
+/*
+ * LDO Configuration
+ */
+
+/* VGEN1/2 Voltage Configuration */
+#define LDOA_0_80V     0
+#define LDOA_0_85V     1
+#define LDOA_0_90V     2
+#define LDOA_0_95V     3
+#define LDOA_1_00V     4
+#define LDOA_1_05V     5
+#define LDOA_1_10V     6
+#define LDOA_1_15V     7
+#define LDOA_1_20V     8
+#define LDOA_1_25V     9
+#define LDOA_1_30V     10
+#define LDOA_1_35V     11
+#define LDOA_1_40V     12
+#define LDOA_1_45V     13
+#define LDOA_1_50V     14
+#define LDOA_1_55V     15
+
+/* VGEN3/4/5/6 Voltage Configuration */
+#define LDOB_1_80V     0
+#define LDOB_1_90V     1
+#define LDOB_2_00V     2
+#define LDOB_2_10V     3
+#define LDOB_2_20V     4
+#define LDOB_2_30V     5
+#define LDOB_2_40V     6
+#define LDOB_2_50V     7
+#define LDOB_2_60V     8
+#define LDOB_2_70V     9
+#define LDOB_2_80V     10
+#define LDOB_2_90V     11
+#define LDOB_3_00V     12
+#define LDOB_3_10V     13
+#define LDOB_3_20V     14
+#define LDOB_3_30V     15
+
+#define LDO_VOL_MASK   0xf
+#define LDO_EN         4
+
+/*
+ * Boost Regulator
+ */
+
+/* SWBST Output Voltage */
+#define SWBST_5_00V    0
+#define SWBST_5_05V    1
+#define SWBST_5_10V    2
+#define SWBST_5_15V    3
+
+#define SWBST_VOL_MASK 0x3
+#define SWBST_MODE_MASK        0x6
+#define SWBST_MODE_OFF (2 << 0)
+#define SWBST_MODE_PFM (2 << 1)
+#define SWBST_MODE_AUTO        (2 << 2)
+#define SWBST_MODE_APS (2 << 3)
+
+#endif