ARM: imx: Rename VINING|2000
authorMarek Vasut <marex@denx.de>
Fri, 17 May 2019 20:25:21 +0000 (22:25 +0200)
committerStefano Babic <sbabic@denx.de>
Tue, 11 Jun 2019 08:42:48 +0000 (10:42 +0200)
The company Samtec was merged into Softing, migrate the board over to
the new name and update copyright headers.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Silvio Fricke <silvio.fricke@softing.com>
Cc: Stefano Babic <sbabic@denx.de>
12 files changed:
arch/arm/mach-imx/mx6/Kconfig
board/samtec/vining_2000/Kconfig [deleted file]
board/samtec/vining_2000/MAINTAINERS [deleted file]
board/samtec/vining_2000/Makefile [deleted file]
board/samtec/vining_2000/imximage.cfg [deleted file]
board/samtec/vining_2000/vining_2000.c [deleted file]
board/softing/vining_2000/Kconfig [new file with mode: 0644]
board/softing/vining_2000/MAINTAINERS [new file with mode: 0644]
board/softing/vining_2000/Makefile [new file with mode: 0644]
board/softing/vining_2000/imximage.cfg [new file with mode: 0644]
board/softing/vining_2000/vining_2000.c [new file with mode: 0644]
configs/vining_2000_defconfig

index baccc0b7a2cb8cc3c5b3b195752097f304279e1c..fe5991e7c6db7b264b5edeea3d3f65e46262af4f 100644 (file)
@@ -510,8 +510,8 @@ config TARGET_UDOO_NEO
        select SUPPORT_SPL
        imply CMD_DM
 
-config TARGET_SAMTEC_VINING_2000
-       bool "samtec VIN|ING 2000"
+config TARGET_SOFTING_VINING_2000
+       bool "Softing VIN|ING 2000"
        select BOARD_LATE_INIT
        select DM
        select DM_THERMAL
@@ -592,7 +592,7 @@ source "board/phytec/pfla02/Kconfig"
 source "board/phytec/pcl063/Kconfig"
 source "board/gateworks/gw_ventana/Kconfig"
 source "board/kosagi/novena/Kconfig"
-source "board/samtec/vining_2000/Kconfig"
+source "board/softing/vining_2000/Kconfig"
 source "board/liebherr/display5/Kconfig"
 source "board/liebherr/mccmon6/Kconfig"
 source "board/logicpd/imx6/Kconfig"
diff --git a/board/samtec/vining_2000/Kconfig b/board/samtec/vining_2000/Kconfig
deleted file mode 100644 (file)
index 3447c27..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_SAMTEC_VINING_2000
-
-config SYS_BOARD
-       default "vining_2000"
-
-config SYS_VENDOR
-       default "samtec"
-
-config SYS_CONFIG_NAME
-       default "vining_2000"
-
-endif
diff --git a/board/samtec/vining_2000/MAINTAINERS b/board/samtec/vining_2000/MAINTAINERS
deleted file mode 100644 (file)
index 027e527..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-VINING_2000 BOARD
-M:     Ingo Schroeck <open-source@samtec.de>
-S:     Maintained
-F:     board/samtec/vining_2000/
-F:     include/configs/vining_2000.h
-F:     configs/vining_2000_defconfig
diff --git a/board/samtec/vining_2000/Makefile b/board/samtec/vining_2000/Makefile
deleted file mode 100644 (file)
index 9650da7..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-# (C) Copyright 2016 samtec automotive software & electronics gmbh
-
-obj-y  := vining_2000.o
diff --git a/board/samtec/vining_2000/imximage.cfg b/board/samtec/vining_2000/imximage.cfg
deleted file mode 100644 (file)
index 3e4fcad..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2016 samtec automotive software & electronics gmbh
- */
-
-#define __ASSEMBLY__
-#include <config.h>
-
-/* image version */
-
-IMAGE_VERSION 2
-
-/*
- * Boot Device : one of
- * spi/sd/nand/onenand, qspi/nor
- */
-
-BOOT_FROM      sd
-
-/*
- * 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
- */
-
-/* Enable all clocks */
-DATA 4 0x020c4068 0xffffffff
-DATA 4 0x020c406c 0xffffffff
-DATA 4 0x020c4070 0xffffffff
-DATA 4 0x020c4074 0xffffffff
-DATA 4 0x020c4078 0xffffffff
-DATA 4 0x020c407c 0xffffffff
-DATA 4 0x020c4080 0xffffffff
-DATA 4 0x020c4084 0xffffffff
-
-/* IOMUX - DDR IO Type */
-DATA 4 0x020e0618 0x000c0000
-DATA 4 0x020e05fc 0x00000000
-
-/* Clock */
-DATA 4 0x020e032c 0x00000030
-
-/* Address */
-DATA 4 0x020e0300 0x00000028
-DATA 4 0x020e02fc 0x00000028
-DATA 4 0x020e05f4 0x00000028
-
-/* Control */
-DATA 4 0x020e0340 0x00000028
-
-DATA 4 0x020e0320 0x00000000
-DATA 4 0x020e0310 0x00000028
-DATA 4 0x020e0314 0x00000028
-DATA 4 0x020e0614 0x00000028
-
-/* Data Strobe */
-DATA 4 0x020e05f8 0x00020000
-DATA 4 0x020e0330 0x00000028
-DATA 4 0x020e0334 0x00000028
-DATA 4 0x020e0338 0x00000028
-DATA 4 0x020e033c 0x00000028
-
-/* Data */
-DATA 4 0x020e0608 0x00020000
-DATA 4 0x020e060c 0x00000028
-DATA 4 0x020e0610 0x00000028
-DATA 4 0x020e061c 0x00000028
-DATA 4 0x020e0620 0x00000028
-DATA 4 0x020e02ec 0x00000028
-DATA 4 0x020e02f0 0x00000028
-DATA 4 0x020e02f4 0x00000028
-DATA 4 0x020e02f8 0x00000028
-
-/* Calibrations - ZQ */
-DATA 4 0x021b0800 0xa1390003
-
-/* Write leveling */
-DATA 4 0x021b080c 0x00290025
-DATA 4 0x021b0810 0x00210022
-
-/* DQS Read Gate */
-DATA 4 0x021b083c 0x4142013a
-DATA 4 0x021b0840 0x012e0123
-
-/* Read/Write Delay */
-DATA 4 0x021b0848 0x43474949
-DATA 4 0x021b0850 0x38383c38
-
-/* Read data bit delay */
-DATA 4 0x021b081c 0x33333333
-DATA 4 0x021b0820 0x33333333
-DATA 4 0x021b0824 0x33333333
-DATA 4 0x021b0828 0x33333333
-
-/* Complete calibration by forced measurement */
-DATA 4 0x021b08b8 0x00000800
-
-/* MMDC init - DDR3, 64-bit mode, only MMDC0 is initiated */
-DATA 4 0x021b0004 0x0002002d
-DATA 4 0x021b0008 0x00333040
-DATA 4 0x021b000c 0x676b52f2
-DATA 4 0x021b0010 0x926e8b63
-DATA 4 0x021b0014 0x01ff00db
-DATA 4 0x021b0018 0x00011740
-DATA 4 0x021b001c 0x00008000
-DATA 4 0x021b002c 0x000026d2
-DATA 4 0x021b0030 0x006b1023
-DATA 4 0x021b0040 0x0000005f
-DATA 4 0x021b0000 0x84190000
-
-/* Initialize MT41K256M16HA-125 - MR2 */
-DATA 4 0x021b001c 0x02008032
-/* MR3 */
-DATA 4 0x021b001c 0x00008033
-/* MR1 */
-DATA 4 0x021b001c 0x00048031
-/* MR0 */
-DATA 4 0x021b001c 0x15108030
-/* DDR device ZQ calibration */
-DATA 4 0x021b001c 0x04008040
-
-/* Final DDR setup, before operation start */
-DATA 4 0x021b0020 0x00007800
-DATA 4 0x021b0818 0x00022227
-DATA 4 0x021b001c 0x00000000
diff --git a/board/samtec/vining_2000/vining_2000.c b/board/samtec/vining_2000/vining_2000.c
deleted file mode 100644 (file)
index d82b3ae..0000000
+++ /dev/null
@@ -1,521 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2016 samtec automotive software & electronics gmbh
- *
- * Author: Christoph Fritz <chf.fritz@googlemail.com>
- */
-
-#include <asm/arch/clock.h>
-#include <asm/arch/crm_regs.h>
-#include <asm/arch/iomux.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/mx6-pins.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/gpio.h>
-#include <asm/mach-imx/iomux-v3.h>
-#include <asm/io.h>
-#include <asm/mach-imx/mxc_i2c.h>
-#include <linux/sizes.h>
-#include <common.h>
-#include <environment.h>
-#include <fsl_esdhc.h>
-#include <mmc.h>
-#include <i2c.h>
-#include <miiphy.h>
-#include <netdev.h>
-#include <power/pmic.h>
-#include <power/pfuze100_pmic.h>
-#include <usb.h>
-#include <usb/ehci-ci.h>
-#include <pwm.h>
-#include <wait_bit.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define UART_PAD_CTRL  (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP |    \
-       PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |   \
-       PAD_CTL_SRE_FAST)
-
-#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP | PAD_CTL_PKE |    \
-       PAD_CTL_SPEED_HIGH | PAD_CTL_DSE_48ohm |                \
-       PAD_CTL_SRE_FAST)
-
-#define ENET_CLK_PAD_CTRL  PAD_CTL_DSE_34ohm
-
-#define ENET_RX_PAD_CTRL  (PAD_CTL_PKE |                       \
-       PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_HIGH |            \
-       PAD_CTL_SRE_FAST)
-
-#define I2C_PAD_CTRL  (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP |     \
-       PAD_CTL_PKE | PAD_CTL_ODE | PAD_CTL_SPEED_MED |         \
-       PAD_CTL_DSE_40ohm)
-
-#define USDHC_CLK_PAD_CTRL  (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
-       PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST)
-
-#define USDHC_PAD_CTRL  (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP |    \
-       PAD_CTL_PKE |  PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm |  \
-       PAD_CTL_SRE_FAST)
-
-#define USDHC_RESET_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP |   \
-       PAD_CTL_PKE |  PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm)
-
-#define GPIO_PAD_CTRL  (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP |    \
-       PAD_CTL_PKE)
-
-int dram_init(void)
-{
-       gd->ram_size = imx_ddr_size();
-
-       return 0;
-}
-
-static iomux_v3_cfg_t const uart1_pads[] = {
-       MX6_PAD_GPIO1_IO04__UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
-       MX6_PAD_GPIO1_IO05__UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const usdhc2_pads[] = {
-       MX6_PAD_SD2_CLK__USDHC2_CLK | MUX_PAD_CTRL(USDHC_CLK_PAD_CTRL),
-       MX6_PAD_SD2_CMD__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD2_DATA0__USDHC2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD2_DATA1__USDHC2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD2_DATA2__USDHC2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD2_DATA3__USDHC2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_LCD1_VSYNC__GPIO3_IO_28 | MUX_PAD_CTRL(GPIO_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const usdhc4_pads[] = {
-       MX6_PAD_SD4_CLK__USDHC4_CLK | MUX_PAD_CTRL(USDHC_CLK_PAD_CTRL),
-       MX6_PAD_SD4_CMD__USDHC4_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD4_DATA0__USDHC4_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD4_DATA1__USDHC4_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD4_DATA2__USDHC4_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD4_DATA3__USDHC4_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD4_DATA4__USDHC4_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD4_DATA5__USDHC4_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD4_DATA6__USDHC4_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD4_DATA7__USDHC4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD4_RESET_B__USDHC4_RESET_B | MUX_PAD_CTRL(USDHC_RESET_CTRL),
-};
-
-static iomux_v3_cfg_t const fec1_pads[] = {
-       MX6_PAD_ENET1_MDC__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
-       MX6_PAD_ENET1_MDIO__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL),
-       MX6_PAD_RGMII1_RD0__ENET1_RX_DATA_0 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
-       MX6_PAD_RGMII1_RD1__ENET1_RX_DATA_1 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
-       MX6_PAD_RGMII1_TD0__ENET1_TX_DATA_0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-       MX6_PAD_RGMII1_TD1__ENET1_TX_DATA_1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-       MX6_PAD_RGMII1_RX_CTL__ENET1_RX_EN | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
-       MX6_PAD_RGMII1_TX_CTL__ENET1_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
-       MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL) |
-               MUX_MODE_SION,
-       /* LAN8720 PHY Reset */
-       MX6_PAD_RGMII1_TD3__GPIO5_IO_9 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const pwm_led_pads[] = {
-       MX6_PAD_RGMII2_RD2__PWM2_OUT | MUX_PAD_CTRL(NO_PAD_CTRL), /* green */
-       MX6_PAD_RGMII2_TD2__PWM6_OUT | MUX_PAD_CTRL(NO_PAD_CTRL), /* red */
-       MX6_PAD_RGMII2_RD3__PWM1_OUT | MUX_PAD_CTRL(NO_PAD_CTRL), /* blue */
-};
-
-static void setup_iomux_uart(void)
-{
-       imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
-}
-
-#define PHY_RESET IMX_GPIO_NR(5, 9)
-
-int board_eth_init(bd_t *bis)
-{
-       struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
-       int ret;
-       unsigned char eth1addr[6];
-
-       /* just to get secound mac address */
-       imx_get_mac_from_fuse(1, eth1addr);
-       if (!env_get("eth1addr") && is_valid_ethaddr(eth1addr))
-               eth_env_set_enetaddr("eth1addr", eth1addr);
-
-       imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
-
-       /*
-        * Generate phy reference clock via pin IOMUX ENET_REF_CLK1/2 by erasing
-        * ENET1/2_TX_CLK_DIR gpr1[14:13], so that reference clock is driven by
-        * ref_enetpll0/1 and enable ENET1/2_TX_CLK output driver.
-        */
-       clrsetbits_le32(&iomuxc_regs->gpr[1],
-                       IOMUX_GPR1_FEC1_CLOCK_MUX2_SEL_MASK |
-                       IOMUX_GPR1_FEC2_CLOCK_MUX2_SEL_MASK,
-                       IOMUX_GPR1_FEC1_CLOCK_MUX1_SEL_MASK |
-                       IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK);
-
-       ret = enable_fec_anatop_clock(0, ENET_50MHZ);
-       if (ret)
-               goto eth_fail;
-
-       /* reset phy */
-       gpio_direction_output(PHY_RESET, 0);
-       mdelay(16);
-       gpio_set_value(PHY_RESET, 1);
-       mdelay(1);
-
-       ret = fecmxc_initialize_multi(bis, 0, CONFIG_FEC_MXC_PHYADDR,
-                                       IMX_FEC_BASE);
-       if (ret)
-               goto eth_fail;
-
-       return ret;
-
-eth_fail:
-       printf("FEC MXC: %s:failed (%i)\n", __func__, ret);
-       gpio_set_value(PHY_RESET, 0);
-       return ret;
-}
-
-#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
-/* I2C1 for PMIC */
-static struct i2c_pads_info i2c_pad_info1 = {
-       .scl = {
-               .i2c_mode = MX6_PAD_GPIO1_IO00__I2C1_SCL | PC,
-               .gpio_mode = MX6_PAD_GPIO1_IO00__GPIO1_IO_0 | PC,
-               .gp = IMX_GPIO_NR(1, 0),
-       },
-       .sda = {
-               .i2c_mode = MX6_PAD_GPIO1_IO01__I2C1_SDA | PC,
-               .gpio_mode = MX6_PAD_GPIO1_IO01__GPIO1_IO_1 | PC,
-               .gp = IMX_GPIO_NR(1, 1),
-       },
-};
-
-static struct pmic *pfuze_init(unsigned char i2cbus)
-{
-       struct pmic *p;
-       int ret;
-       u32 reg;
-
-       ret = power_pfuze100_init(i2cbus);
-       if (ret)
-               return NULL;
-
-       p = pmic_get("PFUZE100");
-       ret = pmic_probe(p);
-       if (ret)
-               return NULL;
-
-       pmic_reg_read(p, PFUZE100_DEVICEID, &reg);
-       printf("PMIC:  PFUZE100 ID=0x%02x\n", reg);
-
-       /* Set SW1AB stanby volage to 0.975V */
-       pmic_reg_read(p, PFUZE100_SW1ABSTBY, &reg);
-       reg &= ~SW1x_STBY_MASK;
-       reg |= SW1x_0_975V;
-       pmic_reg_write(p, PFUZE100_SW1ABSTBY, reg);
-
-       /* Set SW1AB/VDDARM step ramp up time from 16us to 4us/25mV */
-       pmic_reg_read(p, PFUZE100_SW1ABCONF, &reg);
-       reg &= ~SW1xCONF_DVSSPEED_MASK;
-       reg |= SW1xCONF_DVSSPEED_4US;
-       pmic_reg_write(p, PFUZE100_SW1ABCONF, reg);
-
-       /* Set SW1C standby voltage to 0.975V */
-       pmic_reg_read(p, PFUZE100_SW1CSTBY, &reg);
-       reg &= ~SW1x_STBY_MASK;
-       reg |= SW1x_0_975V;
-       pmic_reg_write(p, PFUZE100_SW1CSTBY, reg);
-
-       /* Set SW1C/VDDSOC step ramp up time from 16us to 4us/25mV */
-       pmic_reg_read(p, PFUZE100_SW1CCONF, &reg);
-       reg &= ~SW1xCONF_DVSSPEED_MASK;
-       reg |= SW1xCONF_DVSSPEED_4US;
-       pmic_reg_write(p, PFUZE100_SW1CCONF, reg);
-
-       return p;
-}
-
-static int pfuze_mode_init(struct pmic *p, u32 mode)
-{
-       unsigned char offset, i, switch_num;
-       u32 id;
-       int ret;
-
-       pmic_reg_read(p, PFUZE100_DEVICEID, &id);
-       id = id & 0xf;
-
-       if (id == 0) {
-               switch_num = 6;
-               offset = PFUZE100_SW1CMODE;
-       } else if (id == 1) {
-               switch_num = 4;
-               offset = PFUZE100_SW2MODE;
-       } else {
-               printf("Not supported, id=%d\n", id);
-               return -EINVAL;
-       }
-
-       ret = pmic_reg_write(p, PFUZE100_SW1ABMODE, mode);
-       if (ret < 0) {
-               printf("Set SW1AB mode error!\n");
-               return ret;
-       }
-
-       for (i = 0; i < switch_num - 1; i++) {
-               ret = pmic_reg_write(p, offset + i * SWITCH_SIZE, mode);
-               if (ret < 0) {
-                       printf("Set switch 0x%x mode error!\n",
-                              offset + i * SWITCH_SIZE);
-                       return ret;
-               }
-       }
-
-       return ret;
-}
-
-int power_init_board(void)
-{
-       struct pmic *p;
-       int ret;
-
-       p = pfuze_init(I2C_PMIC);
-       if (!p)
-               return -ENODEV;
-
-       ret = pfuze_mode_init(p, APS_PFM);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
-
-#ifdef CONFIG_USB_EHCI_MX6
-static iomux_v3_cfg_t const usb_otg_pads[] = {
-       /* OGT1 */
-       MX6_PAD_GPIO1_IO09__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
-       MX6_PAD_GPIO1_IO10__ANATOP_OTG1_ID | MUX_PAD_CTRL(NO_PAD_CTRL),
-       /* OTG2 */
-       MX6_PAD_GPIO1_IO12__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL)
-};
-
-static void setup_iomux_usb(void)
-{
-       imx_iomux_v3_setup_multiple_pads(usb_otg_pads,
-                                        ARRAY_SIZE(usb_otg_pads));
-}
-
-int board_usb_phy_mode(int port)
-{
-       if (port == 1)
-               return USB_INIT_HOST;
-       else
-               return usb_phy_mode(port);
-}
-#endif
-
-#ifdef CONFIG_PWM_IMX
-static int set_pwm_leds(void)
-{
-       int ret;
-
-       imx_iomux_v3_setup_multiple_pads(pwm_led_pads,
-                                        ARRAY_SIZE(pwm_led_pads));
-       /* enable backlight PWM 2, green LED */
-       ret = pwm_init(1, 0, 0);
-       if (ret)
-               goto error;
-       /* duty cycle 200ns, period: 8000ns */
-       ret = pwm_config(1, 200, 8000);
-       if (ret)
-               goto error;
-       ret = pwm_enable(1);
-       if (ret)
-               goto error;
-
-       /* enable backlight PWM 1, blue LED */
-       ret = pwm_init(0, 0, 0);
-       if (ret)
-               goto error;
-       /* duty cycle 200ns, period: 8000ns */
-       ret = pwm_config(0, 200, 8000);
-       if (ret)
-               goto error;
-       ret = pwm_enable(0);
-       if (ret)
-               goto error;
-
-       /* enable backlight PWM 6, red LED */
-       ret = pwm_init(5, 0, 0);
-       if (ret)
-               goto error;
-       /* duty cycle 200ns, period: 8000ns */
-       ret = pwm_config(5, 200, 8000);
-       if (ret)
-               goto error;
-       ret = pwm_enable(5);
-
-error:
-       return ret;
-}
-#else
-static int set_pwm_leds(void)
-{
-       return 0;
-}
-#endif
-
-#define ADCx_HC0        0x00
-#define ADCx_HS         0x08
-#define ADCx_HS_C0      BIT(0)
-#define ADCx_R0         0x0c
-#define ADCx_CFG        0x14
-#define ADCx_CFG_SWMODE 0x308
-#define ADCx_GC         0x18
-#define ADCx_GC_CAL     BIT(7)
-
-static int read_adc(u32 *val)
-{
-       int ret;
-       void __iomem *b = map_physmem(ADC1_BASE_ADDR, 0x100, MAP_NOCACHE);
-
-       /* use software mode */
-       writel(ADCx_CFG_SWMODE, b + ADCx_CFG);
-
-       /* start auto calibration */
-       setbits_le32(b + ADCx_GC, ADCx_GC_CAL);
-       ret = wait_for_bit_le32(b + ADCx_GC, ADCx_GC_CAL, ADCx_GC_CAL, 10, 0);
-       if (ret)
-               goto adc_exit;
-
-       /* start conversion */
-       writel(0, b + ADCx_HC0);
-
-       /* wait for conversion */
-       ret = wait_for_bit_le32(b + ADCx_HS, ADCx_HS_C0, ADCx_HS_C0, 10, 0);
-       if (ret)
-               goto adc_exit;
-
-       /* read result */
-       *val = readl(b + ADCx_R0);
-
-adc_exit:
-       if (ret)
-               printf("ADC failure (ret=%i)\n", ret);
-       unmap_physmem(b, MAP_NOCACHE);
-       return ret;
-}
-
-#define VAL_UPPER      2498
-#define VAL_LOWER      1550
-
-static int set_pin_state(void)
-{
-       u32 val;
-       int ret;
-
-       ret = read_adc(&val);
-       if (ret)
-               return ret;
-
-       if (val >= VAL_UPPER)
-               env_set("pin_state", "connected");
-       else if (val < VAL_UPPER && val > VAL_LOWER)
-               env_set("pin_state", "open");
-       else
-               env_set("pin_state", "button");
-
-       return ret;
-}
-
-int board_late_init(void)
-{
-       int ret;
-
-       ret = set_pwm_leds();
-       if (ret)
-               return ret;
-
-       ret = set_pin_state();
-
-       return ret;
-}
-
-int board_early_init_f(void)
-{
-       setup_iomux_uart();
-
-       setup_iomux_usb();
-
-       return 0;
-}
-
-static struct fsl_esdhc_cfg usdhc_cfg[2] = {
-       {USDHC4_BASE_ADDR, 0, 8},
-       {USDHC2_BASE_ADDR, 0, 4},
-};
-
-#define USDHC2_CD_GPIO IMX_GPIO_NR(3, 28)
-
-int board_mmc_getcd(struct mmc *mmc)
-{
-       struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
-
-       if (cfg->esdhc_base == USDHC4_BASE_ADDR)
-               return 1;
-       if (cfg->esdhc_base == USDHC2_BASE_ADDR)
-               return !gpio_get_value(USDHC2_CD_GPIO);
-
-       return -EINVAL;
-}
-
-int board_mmc_init(bd_t *bis)
-{
-       int ret;
-
-       /*
-        * According to the board_mmc_init() the following map is done:
-        * (U-Boot device node)    (Physical Port)
-        * mmc0                    USDHC4
-        * mmc1                    USDHC2
-        */
-       imx_iomux_v3_setup_multiple_pads(
-               usdhc4_pads, ARRAY_SIZE(usdhc4_pads));
-       usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
-
-       imx_iomux_v3_setup_multiple_pads(
-               usdhc2_pads, ARRAY_SIZE(usdhc2_pads));
-       gpio_direction_input(USDHC2_CD_GPIO);
-       usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
-
-       ret = fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
-       if (ret) {
-               printf("Warning: failed to initialize USDHC4\n");
-               return ret;
-       }
-
-       ret = fsl_esdhc_initialize(bis, &usdhc_cfg[1]);
-       if (ret) {
-               printf("Warning: failed to initialize USDHC2\n");
-               return ret;
-       }
-
-       return 0;
-}
-
-int board_init(void)
-{
-       /* Address of boot parameters */
-       gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-
-#ifdef CONFIG_SYS_I2C_MXC
-       setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
-#endif
-
-       return 0;
-}
-
-int checkboard(void)
-{
-       puts("Board: VIN|ING 2000\n");
-
-       return 0;
-}
diff --git a/board/softing/vining_2000/Kconfig b/board/softing/vining_2000/Kconfig
new file mode 100644 (file)
index 0000000..90d45a7
--- /dev/null
@@ -0,0 +1,12 @@
+if TARGET_SOFTING_VINING_2000
+
+config SYS_BOARD
+       default "vining_2000"
+
+config SYS_VENDOR
+       default "softing"
+
+config SYS_CONFIG_NAME
+       default "vining_2000"
+
+endif
diff --git a/board/softing/vining_2000/MAINTAINERS b/board/softing/vining_2000/MAINTAINERS
new file mode 100644 (file)
index 0000000..0df78c6
--- /dev/null
@@ -0,0 +1,6 @@
+VINING_2000 BOARD
+M:     Silvio Fricke <open-source@softing.de>
+S:     Maintained
+F:     board/softing/vining_2000/
+F:     include/configs/vining_2000.h
+F:     configs/vining_2000_defconfig
diff --git a/board/softing/vining_2000/Makefile b/board/softing/vining_2000/Makefile
new file mode 100644 (file)
index 0000000..84f66a6
--- /dev/null
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+# (C) Copyright 2016 samtec automotive software & electronics gmbh
+# Copyright (C) 2017-2019 softing automotive electronics gmbH
+
+obj-y  := vining_2000.o
diff --git a/board/softing/vining_2000/imximage.cfg b/board/softing/vining_2000/imximage.cfg
new file mode 100644 (file)
index 0000000..f6f59dd
--- /dev/null
@@ -0,0 +1,132 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2016 samtec automotive software & electronics gmbh
+ * Copyright (C) 2017-2019 softing automotive electronics gmbH
+ */
+
+#define __ASSEMBLY__
+#include <config.h>
+
+/* image version */
+
+IMAGE_VERSION 2
+
+/*
+ * Boot Device : one of
+ * spi/sd/nand/onenand, qspi/nor
+ */
+
+BOOT_FROM      sd
+
+/*
+ * 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
+ */
+
+/* Enable all clocks */
+DATA 4 0x020c4068 0xffffffff
+DATA 4 0x020c406c 0xffffffff
+DATA 4 0x020c4070 0xffffffff
+DATA 4 0x020c4074 0xffffffff
+DATA 4 0x020c4078 0xffffffff
+DATA 4 0x020c407c 0xffffffff
+DATA 4 0x020c4080 0xffffffff
+DATA 4 0x020c4084 0xffffffff
+
+/* IOMUX - DDR IO Type */
+DATA 4 0x020e0618 0x000c0000
+DATA 4 0x020e05fc 0x00000000
+
+/* Clock */
+DATA 4 0x020e032c 0x00000030
+
+/* Address */
+DATA 4 0x020e0300 0x00000028
+DATA 4 0x020e02fc 0x00000028
+DATA 4 0x020e05f4 0x00000028
+
+/* Control */
+DATA 4 0x020e0340 0x00000028
+
+DATA 4 0x020e0320 0x00000000
+DATA 4 0x020e0310 0x00000028
+DATA 4 0x020e0314 0x00000028
+DATA 4 0x020e0614 0x00000028
+
+/* Data Strobe */
+DATA 4 0x020e05f8 0x00020000
+DATA 4 0x020e0330 0x00000028
+DATA 4 0x020e0334 0x00000028
+DATA 4 0x020e0338 0x00000028
+DATA 4 0x020e033c 0x00000028
+
+/* Data */
+DATA 4 0x020e0608 0x00020000
+DATA 4 0x020e060c 0x00000028
+DATA 4 0x020e0610 0x00000028
+DATA 4 0x020e061c 0x00000028
+DATA 4 0x020e0620 0x00000028
+DATA 4 0x020e02ec 0x00000028
+DATA 4 0x020e02f0 0x00000028
+DATA 4 0x020e02f4 0x00000028
+DATA 4 0x020e02f8 0x00000028
+
+/* Calibrations - ZQ */
+DATA 4 0x021b0800 0xa1390003
+
+/* Write leveling */
+DATA 4 0x021b080c 0x00290025
+DATA 4 0x021b0810 0x00210022
+
+/* DQS Read Gate */
+DATA 4 0x021b083c 0x4142013a
+DATA 4 0x021b0840 0x012e0123
+
+/* Read/Write Delay */
+DATA 4 0x021b0848 0x43474949
+DATA 4 0x021b0850 0x38383c38
+
+/* Read data bit delay */
+DATA 4 0x021b081c 0x33333333
+DATA 4 0x021b0820 0x33333333
+DATA 4 0x021b0824 0x33333333
+DATA 4 0x021b0828 0x33333333
+
+/* Complete calibration by forced measurement */
+DATA 4 0x021b08b8 0x00000800
+
+/* MMDC init - DDR3, 64-bit mode, only MMDC0 is initiated */
+DATA 4 0x021b0004 0x0002002d
+DATA 4 0x021b0008 0x00333040
+DATA 4 0x021b000c 0x676b52f2
+DATA 4 0x021b0010 0x926e8b63
+DATA 4 0x021b0014 0x01ff00db
+DATA 4 0x021b0018 0x00011740
+DATA 4 0x021b001c 0x00008000
+DATA 4 0x021b002c 0x000026d2
+DATA 4 0x021b0030 0x006b1023
+DATA 4 0x021b0040 0x0000005f
+DATA 4 0x021b0000 0x84190000
+
+/* Initialize MT41K256M16HA-125 - MR2 */
+DATA 4 0x021b001c 0x02008032
+/* MR3 */
+DATA 4 0x021b001c 0x00008033
+/* MR1 */
+DATA 4 0x021b001c 0x00048031
+/* MR0 */
+DATA 4 0x021b001c 0x15108030
+/* DDR device ZQ calibration */
+DATA 4 0x021b001c 0x04008040
+
+/* Final DDR setup, before operation start */
+DATA 4 0x021b0020 0x00007800
+DATA 4 0x021b0818 0x00022227
+DATA 4 0x021b001c 0x00000000
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
new file mode 100644 (file)
index 0000000..f0313b0
--- /dev/null
@@ -0,0 +1,522 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2016 samtec automotive software & electronics gmbh
+ * Copyright (C) 2017-2019 softing automotive electronics gmbH
+ *
+ * Author: Christoph Fritz <chf.fritz@googlemail.com>
+ */
+
+#include <asm/arch/clock.h>
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/iomux.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/mx6-pins.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/gpio.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/io.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <linux/sizes.h>
+#include <common.h>
+#include <environment.h>
+#include <fsl_esdhc.h>
+#include <mmc.h>
+#include <i2c.h>
+#include <miiphy.h>
+#include <netdev.h>
+#include <power/pmic.h>
+#include <power/pfuze100_pmic.h>
+#include <usb.h>
+#include <usb/ehci-ci.h>
+#include <pwm.h>
+#include <wait_bit.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define UART_PAD_CTRL  (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP |    \
+       PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |   \
+       PAD_CTL_SRE_FAST)
+
+#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP | PAD_CTL_PKE |    \
+       PAD_CTL_SPEED_HIGH | PAD_CTL_DSE_48ohm |                \
+       PAD_CTL_SRE_FAST)
+
+#define ENET_CLK_PAD_CTRL  PAD_CTL_DSE_34ohm
+
+#define ENET_RX_PAD_CTRL  (PAD_CTL_PKE |                       \
+       PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_HIGH |            \
+       PAD_CTL_SRE_FAST)
+
+#define I2C_PAD_CTRL  (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP |     \
+       PAD_CTL_PKE | PAD_CTL_ODE | PAD_CTL_SPEED_MED |         \
+       PAD_CTL_DSE_40ohm)
+
+#define USDHC_CLK_PAD_CTRL  (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
+       PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST)
+
+#define USDHC_PAD_CTRL  (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP |    \
+       PAD_CTL_PKE |  PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm |  \
+       PAD_CTL_SRE_FAST)
+
+#define USDHC_RESET_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP |   \
+       PAD_CTL_PKE |  PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm)
+
+#define GPIO_PAD_CTRL  (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP |    \
+       PAD_CTL_PKE)
+
+int dram_init(void)
+{
+       gd->ram_size = imx_ddr_size();
+
+       return 0;
+}
+
+static iomux_v3_cfg_t const uart1_pads[] = {
+       MX6_PAD_GPIO1_IO04__UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
+       MX6_PAD_GPIO1_IO05__UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
+};
+
+static iomux_v3_cfg_t const usdhc2_pads[] = {
+       MX6_PAD_SD2_CLK__USDHC2_CLK | MUX_PAD_CTRL(USDHC_CLK_PAD_CTRL),
+       MX6_PAD_SD2_CMD__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD2_DATA0__USDHC2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD2_DATA1__USDHC2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD2_DATA2__USDHC2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD2_DATA3__USDHC2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_LCD1_VSYNC__GPIO3_IO_28 | MUX_PAD_CTRL(GPIO_PAD_CTRL),
+};
+
+static iomux_v3_cfg_t const usdhc4_pads[] = {
+       MX6_PAD_SD4_CLK__USDHC4_CLK | MUX_PAD_CTRL(USDHC_CLK_PAD_CTRL),
+       MX6_PAD_SD4_CMD__USDHC4_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD4_DATA0__USDHC4_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD4_DATA1__USDHC4_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD4_DATA2__USDHC4_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD4_DATA3__USDHC4_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD4_DATA4__USDHC4_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD4_DATA5__USDHC4_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD4_DATA6__USDHC4_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD4_DATA7__USDHC4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD4_RESET_B__USDHC4_RESET_B | MUX_PAD_CTRL(USDHC_RESET_CTRL),
+};
+
+static iomux_v3_cfg_t const fec1_pads[] = {
+       MX6_PAD_ENET1_MDC__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_ENET1_MDIO__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII1_RD0__ENET1_RX_DATA_0 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
+       MX6_PAD_RGMII1_RD1__ENET1_RX_DATA_1 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
+       MX6_PAD_RGMII1_TD0__ENET1_TX_DATA_0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII1_TD1__ENET1_TX_DATA_1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_RGMII1_RX_CTL__ENET1_RX_EN | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
+       MX6_PAD_RGMII1_TX_CTL__ENET1_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
+       MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL) |
+               MUX_MODE_SION,
+       /* LAN8720 PHY Reset */
+       MX6_PAD_RGMII1_TD3__GPIO5_IO_9 | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+static iomux_v3_cfg_t const pwm_led_pads[] = {
+       MX6_PAD_RGMII2_RD2__PWM2_OUT | MUX_PAD_CTRL(NO_PAD_CTRL), /* green */
+       MX6_PAD_RGMII2_TD2__PWM6_OUT | MUX_PAD_CTRL(NO_PAD_CTRL), /* red */
+       MX6_PAD_RGMII2_RD3__PWM1_OUT | MUX_PAD_CTRL(NO_PAD_CTRL), /* blue */
+};
+
+static void setup_iomux_uart(void)
+{
+       imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
+}
+
+#define PHY_RESET IMX_GPIO_NR(5, 9)
+
+int board_eth_init(bd_t *bis)
+{
+       struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
+       int ret;
+       unsigned char eth1addr[6];
+
+       /* just to get secound mac address */
+       imx_get_mac_from_fuse(1, eth1addr);
+       if (!env_get("eth1addr") && is_valid_ethaddr(eth1addr))
+               eth_env_set_enetaddr("eth1addr", eth1addr);
+
+       imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
+
+       /*
+        * Generate phy reference clock via pin IOMUX ENET_REF_CLK1/2 by erasing
+        * ENET1/2_TX_CLK_DIR gpr1[14:13], so that reference clock is driven by
+        * ref_enetpll0/1 and enable ENET1/2_TX_CLK output driver.
+        */
+       clrsetbits_le32(&iomuxc_regs->gpr[1],
+                       IOMUX_GPR1_FEC1_CLOCK_MUX2_SEL_MASK |
+                       IOMUX_GPR1_FEC2_CLOCK_MUX2_SEL_MASK,
+                       IOMUX_GPR1_FEC1_CLOCK_MUX1_SEL_MASK |
+                       IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK);
+
+       ret = enable_fec_anatop_clock(0, ENET_50MHZ);
+       if (ret)
+               goto eth_fail;
+
+       /* reset phy */
+       gpio_direction_output(PHY_RESET, 0);
+       mdelay(16);
+       gpio_set_value(PHY_RESET, 1);
+       mdelay(1);
+
+       ret = fecmxc_initialize_multi(bis, 0, CONFIG_FEC_MXC_PHYADDR,
+                                       IMX_FEC_BASE);
+       if (ret)
+               goto eth_fail;
+
+       return ret;
+
+eth_fail:
+       printf("FEC MXC: %s:failed (%i)\n", __func__, ret);
+       gpio_set_value(PHY_RESET, 0);
+       return ret;
+}
+
+#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
+/* I2C1 for PMIC */
+static struct i2c_pads_info i2c_pad_info1 = {
+       .scl = {
+               .i2c_mode = MX6_PAD_GPIO1_IO00__I2C1_SCL | PC,
+               .gpio_mode = MX6_PAD_GPIO1_IO00__GPIO1_IO_0 | PC,
+               .gp = IMX_GPIO_NR(1, 0),
+       },
+       .sda = {
+               .i2c_mode = MX6_PAD_GPIO1_IO01__I2C1_SDA | PC,
+               .gpio_mode = MX6_PAD_GPIO1_IO01__GPIO1_IO_1 | PC,
+               .gp = IMX_GPIO_NR(1, 1),
+       },
+};
+
+static struct pmic *pfuze_init(unsigned char i2cbus)
+{
+       struct pmic *p;
+       int ret;
+       u32 reg;
+
+       ret = power_pfuze100_init(i2cbus);
+       if (ret)
+               return NULL;
+
+       p = pmic_get("PFUZE100");
+       ret = pmic_probe(p);
+       if (ret)
+               return NULL;
+
+       pmic_reg_read(p, PFUZE100_DEVICEID, &reg);
+       printf("PMIC:  PFUZE100 ID=0x%02x\n", reg);
+
+       /* Set SW1AB stanby volage to 0.975V */
+       pmic_reg_read(p, PFUZE100_SW1ABSTBY, &reg);
+       reg &= ~SW1x_STBY_MASK;
+       reg |= SW1x_0_975V;
+       pmic_reg_write(p, PFUZE100_SW1ABSTBY, reg);
+
+       /* Set SW1AB/VDDARM step ramp up time from 16us to 4us/25mV */
+       pmic_reg_read(p, PFUZE100_SW1ABCONF, &reg);
+       reg &= ~SW1xCONF_DVSSPEED_MASK;
+       reg |= SW1xCONF_DVSSPEED_4US;
+       pmic_reg_write(p, PFUZE100_SW1ABCONF, reg);
+
+       /* Set SW1C standby voltage to 0.975V */
+       pmic_reg_read(p, PFUZE100_SW1CSTBY, &reg);
+       reg &= ~SW1x_STBY_MASK;
+       reg |= SW1x_0_975V;
+       pmic_reg_write(p, PFUZE100_SW1CSTBY, reg);
+
+       /* Set SW1C/VDDSOC step ramp up time from 16us to 4us/25mV */
+       pmic_reg_read(p, PFUZE100_SW1CCONF, &reg);
+       reg &= ~SW1xCONF_DVSSPEED_MASK;
+       reg |= SW1xCONF_DVSSPEED_4US;
+       pmic_reg_write(p, PFUZE100_SW1CCONF, reg);
+
+       return p;
+}
+
+static int pfuze_mode_init(struct pmic *p, u32 mode)
+{
+       unsigned char offset, i, switch_num;
+       u32 id;
+       int ret;
+
+       pmic_reg_read(p, PFUZE100_DEVICEID, &id);
+       id = id & 0xf;
+
+       if (id == 0) {
+               switch_num = 6;
+               offset = PFUZE100_SW1CMODE;
+       } else if (id == 1) {
+               switch_num = 4;
+               offset = PFUZE100_SW2MODE;
+       } else {
+               printf("Not supported, id=%d\n", id);
+               return -EINVAL;
+       }
+
+       ret = pmic_reg_write(p, PFUZE100_SW1ABMODE, mode);
+       if (ret < 0) {
+               printf("Set SW1AB mode error!\n");
+               return ret;
+       }
+
+       for (i = 0; i < switch_num - 1; i++) {
+               ret = pmic_reg_write(p, offset + i * SWITCH_SIZE, mode);
+               if (ret < 0) {
+                       printf("Set switch 0x%x mode error!\n",
+                              offset + i * SWITCH_SIZE);
+                       return ret;
+               }
+       }
+
+       return ret;
+}
+
+int power_init_board(void)
+{
+       struct pmic *p;
+       int ret;
+
+       p = pfuze_init(I2C_PMIC);
+       if (!p)
+               return -ENODEV;
+
+       ret = pfuze_mode_init(p, APS_PFM);
+       if (ret < 0)
+               return ret;
+
+       return 0;
+}
+
+#ifdef CONFIG_USB_EHCI_MX6
+static iomux_v3_cfg_t const usb_otg_pads[] = {
+       /* OGT1 */
+       MX6_PAD_GPIO1_IO09__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
+       MX6_PAD_GPIO1_IO10__ANATOP_OTG1_ID | MUX_PAD_CTRL(NO_PAD_CTRL),
+       /* OTG2 */
+       MX6_PAD_GPIO1_IO12__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL)
+};
+
+static void setup_iomux_usb(void)
+{
+       imx_iomux_v3_setup_multiple_pads(usb_otg_pads,
+                                        ARRAY_SIZE(usb_otg_pads));
+}
+
+int board_usb_phy_mode(int port)
+{
+       if (port == 1)
+               return USB_INIT_HOST;
+       else
+               return usb_phy_mode(port);
+}
+#endif
+
+#ifdef CONFIG_PWM_IMX
+static int set_pwm_leds(void)
+{
+       int ret;
+
+       imx_iomux_v3_setup_multiple_pads(pwm_led_pads,
+                                        ARRAY_SIZE(pwm_led_pads));
+       /* enable backlight PWM 2, green LED */
+       ret = pwm_init(1, 0, 0);
+       if (ret)
+               goto error;
+       /* duty cycle 200ns, period: 8000ns */
+       ret = pwm_config(1, 200, 8000);
+       if (ret)
+               goto error;
+       ret = pwm_enable(1);
+       if (ret)
+               goto error;
+
+       /* enable backlight PWM 1, blue LED */
+       ret = pwm_init(0, 0, 0);
+       if (ret)
+               goto error;
+       /* duty cycle 200ns, period: 8000ns */
+       ret = pwm_config(0, 200, 8000);
+       if (ret)
+               goto error;
+       ret = pwm_enable(0);
+       if (ret)
+               goto error;
+
+       /* enable backlight PWM 6, red LED */
+       ret = pwm_init(5, 0, 0);
+       if (ret)
+               goto error;
+       /* duty cycle 200ns, period: 8000ns */
+       ret = pwm_config(5, 200, 8000);
+       if (ret)
+               goto error;
+       ret = pwm_enable(5);
+
+error:
+       return ret;
+}
+#else
+static int set_pwm_leds(void)
+{
+       return 0;
+}
+#endif
+
+#define ADCx_HC0        0x00
+#define ADCx_HS         0x08
+#define ADCx_HS_C0      BIT(0)
+#define ADCx_R0         0x0c
+#define ADCx_CFG        0x14
+#define ADCx_CFG_SWMODE 0x308
+#define ADCx_GC         0x18
+#define ADCx_GC_CAL     BIT(7)
+
+static int read_adc(u32 *val)
+{
+       int ret;
+       void __iomem *b = map_physmem(ADC1_BASE_ADDR, 0x100, MAP_NOCACHE);
+
+       /* use software mode */
+       writel(ADCx_CFG_SWMODE, b + ADCx_CFG);
+
+       /* start auto calibration */
+       setbits_le32(b + ADCx_GC, ADCx_GC_CAL);
+       ret = wait_for_bit_le32(b + ADCx_GC, ADCx_GC_CAL, ADCx_GC_CAL, 10, 0);
+       if (ret)
+               goto adc_exit;
+
+       /* start conversion */
+       writel(0, b + ADCx_HC0);
+
+       /* wait for conversion */
+       ret = wait_for_bit_le32(b + ADCx_HS, ADCx_HS_C0, ADCx_HS_C0, 10, 0);
+       if (ret)
+               goto adc_exit;
+
+       /* read result */
+       *val = readl(b + ADCx_R0);
+
+adc_exit:
+       if (ret)
+               printf("ADC failure (ret=%i)\n", ret);
+       unmap_physmem(b, MAP_NOCACHE);
+       return ret;
+}
+
+#define VAL_UPPER      2498
+#define VAL_LOWER      1550
+
+static int set_pin_state(void)
+{
+       u32 val;
+       int ret;
+
+       ret = read_adc(&val);
+       if (ret)
+               return ret;
+
+       if (val >= VAL_UPPER)
+               env_set("pin_state", "connected");
+       else if (val < VAL_UPPER && val > VAL_LOWER)
+               env_set("pin_state", "open");
+       else
+               env_set("pin_state", "button");
+
+       return ret;
+}
+
+int board_late_init(void)
+{
+       int ret;
+
+       ret = set_pwm_leds();
+       if (ret)
+               return ret;
+
+       ret = set_pin_state();
+
+       return ret;
+}
+
+int board_early_init_f(void)
+{
+       setup_iomux_uart();
+
+       setup_iomux_usb();
+
+       return 0;
+}
+
+static struct fsl_esdhc_cfg usdhc_cfg[2] = {
+       {USDHC4_BASE_ADDR, 0, 8},
+       {USDHC2_BASE_ADDR, 0, 4},
+};
+
+#define USDHC2_CD_GPIO IMX_GPIO_NR(3, 28)
+
+int board_mmc_getcd(struct mmc *mmc)
+{
+       struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
+
+       if (cfg->esdhc_base == USDHC4_BASE_ADDR)
+               return 1;
+       if (cfg->esdhc_base == USDHC2_BASE_ADDR)
+               return !gpio_get_value(USDHC2_CD_GPIO);
+
+       return -EINVAL;
+}
+
+int board_mmc_init(bd_t *bis)
+{
+       int ret;
+
+       /*
+        * According to the board_mmc_init() the following map is done:
+        * (U-Boot device node)    (Physical Port)
+        * mmc0                    USDHC4
+        * mmc1                    USDHC2
+        */
+       imx_iomux_v3_setup_multiple_pads(
+               usdhc4_pads, ARRAY_SIZE(usdhc4_pads));
+       usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
+
+       imx_iomux_v3_setup_multiple_pads(
+               usdhc2_pads, ARRAY_SIZE(usdhc2_pads));
+       gpio_direction_input(USDHC2_CD_GPIO);
+       usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
+
+       ret = fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
+       if (ret) {
+               printf("Warning: failed to initialize USDHC4\n");
+               return ret;
+       }
+
+       ret = fsl_esdhc_initialize(bis, &usdhc_cfg[1]);
+       if (ret) {
+               printf("Warning: failed to initialize USDHC2\n");
+               return ret;
+       }
+
+       return 0;
+}
+
+int board_init(void)
+{
+       /* Address of boot parameters */
+       gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+
+#ifdef CONFIG_SYS_I2C_MXC
+       setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
+#endif
+
+       return 0;
+}
+
+int checkboard(void)
+{
+       puts("Board: VIN|ING 2000\n");
+
+       return 0;
+}
index 073ff4832968e9fd07b3105ff9822272ce0fdd77..0f9069381ec0e29cebcc7f0edfd83102ab0b2222 100644 (file)
@@ -1,10 +1,10 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x87800000
-CONFIG_TARGET_SAMTEC_VINING_2000=y
+CONFIG_TARGET_SOFTING_VINING_2000=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_CMD_BMODE is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/samtec/vining_2000/imximage.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/softing/vining_2000/imximage.cfg"
 CONFIG_BOOTDELAY=0
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SUPPORT_RAW_INITRD=y