]> git.sur5r.net Git - u-boot/commitdiff
igep00x0: merge igep0020 and igep0030 defconfigs to igep00x0_defconfig
authorPau Pajuelo <ppajuel@gmail.com>
Thu, 17 Aug 2017 01:09:14 +0000 (03:09 +0200)
committerTom Rini <trini@konsulko.com>
Sat, 26 Aug 2017 18:56:12 +0000 (14:56 -0400)
Update igep00x0 code with the following features:
- Add board and revision detection for the boards:
  - IGEP0020-RF
  - IGEP0020-RC
  - IGEP0030-RG
  - IGEP0030-RE
- Merge IGEP0020 and IGEP0030 mux tables
- Add suport to use GPIO_126, GPIO_127 and GPIO_129
- board_name and board_rev environment variables display board and
  revision informations
- Move dtb name selection from code to boot script

Signed-off-by: Pau Pajuelo <ppajuel@gmail.com>
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Tested-by: Pau Pajuelo <ppajuel@gmail.com>
board/isee/igep00x0/MAINTAINERS
board/isee/igep00x0/common.c
board/isee/igep00x0/igep00x0.c
board/isee/igep00x0/igep00x0.h
configs/igep0020_defconfig [deleted file]
configs/igep0030_defconfig [deleted file]
configs/igep00x0_defconfig [new file with mode: 0644]
include/configs/omap3_igep00x0.h

index 720ef2aa6955f25e4aec29a6b82a0a2298fb6753..d75d400eed0285099fe2159bf6dca25323d63226 100644 (file)
@@ -3,6 +3,5 @@ M:      Enric Balletbo i Serra <eballetbo@gmail.com>
 S:     Maintained
 F:     board/isee/igep00x0/
 F:     include/configs/omap3_igep00x0.h
-F:     configs/igep0020_defconfig
-F:     configs/igep0030_defconfig
+F:     configs/igep00x0_defconfig
 F:     configs/igep0032_defconfig
index b8f1c14f6a5b2b9c3ae284c373917f7d1410a683..e59516f6123bd378aa2fcbf85ff22c3d575809b3 100644 (file)
@@ -22,14 +22,6 @@ DECLARE_GLOBAL_DATA_PTR;
 void set_muxconf_regs(void)
 {
        MUX_DEFAULT();
-
-#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020)
-       MUX_IGEP0020();
-#endif
-
-#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030)
-       MUX_IGEP0030();
-#endif
 }
 
 /*
@@ -60,10 +52,6 @@ int board_init(void)
        /* boot param addr */
        gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
 
-#if defined(CONFIG_LED_STATUS) && defined(CONFIG_LED_STATUS_BOOT_ENABLE)
-       status_led_set(CONFIG_LED_STATUS_BOOT, CONFIG_LED_STATUS_ON);
-#endif
-
        return 0;
 }
 
index 74f9bab093406b09bdf0176be5ae2b121c8cff6a..5c7f2567118a1e17bdb6f76f29a7161628776bf7 100644 (file)
@@ -17,7 +17,6 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/mach-types.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/onenand.h>
@@ -38,6 +37,43 @@ U_BOOT_DEVICE(igep_uart) = {
        &igep_serial
 };
 
+/*
+ * Routine: get_board_revision
+ * Description: GPIO_28 and GPIO_129 are used to read board and revision from
+ * IGEP00x0 boards. First of all, it is necessary to reset USB transceiver from
+ * IGEP0030 in order to read GPIO_IGEP00X0_BOARD_DETECTION correctly, because
+ * this functionality is shared by USB HOST.
+ * Once USB reset is applied, U-boot configures these pins as input pullup to
+ * detect board and revision:
+ * IGEP0020-RF = 0b00
+ * IGEP0020-RC = 0b01
+ * IGEP0030-RG = 0b10
+ * IGEP0030-RE = 0b11
+ */
+static int get_board_revision(void)
+{
+       int revision;
+
+       gpio_request(IGEP0030_USB_TRANSCEIVER_RESET,
+                               "igep0030_usb_transceiver_reset");
+       gpio_direction_output(IGEP0030_USB_TRANSCEIVER_RESET, 0);
+
+       gpio_request(GPIO_IGEP00X0_BOARD_DETECTION, "igep00x0_board_detection");
+       gpio_direction_input(GPIO_IGEP00X0_BOARD_DETECTION);
+       revision = 2 * gpio_get_value(GPIO_IGEP00X0_BOARD_DETECTION);
+       gpio_free(GPIO_IGEP00X0_BOARD_DETECTION);
+
+       gpio_request(GPIO_IGEP00X0_REVISION_DETECTION,
+                               "igep00x0_revision_detection");
+       gpio_direction_input(GPIO_IGEP00X0_REVISION_DETECTION);
+       revision = revision + gpio_get_value(GPIO_IGEP00X0_REVISION_DETECTION);
+       gpio_free(GPIO_IGEP00X0_REVISION_DETECTION);
+
+       gpio_free(IGEP0030_USB_TRANSCEIVER_RESET);
+
+       return revision;
+}
+
 int onenand_board_init(struct mtd_info *mtd)
 {
        if (gpmc_cs0_flash == MTD_DEV_TYPE_ONENAND) {
@@ -138,31 +174,69 @@ int ft_board_setup(void *blob, bd_t *bd)
 }
 #endif
 
-void set_fdt(void)
+void set_led(void)
 {
-       switch (gd->bd->bi_arch_number) {
-       case MACH_TYPE_IGEP0020:
-               env_set("fdtfile", "omap3-igep0020.dtb");
+       switch (get_board_revision()) {
+       case 0:
+       case 1:
+               gpio_request(IGEP0020_GPIO_LED, "igep0020_gpio_led");
+               gpio_direction_output(IGEP0020_GPIO_LED, 1);
                break;
-       case MACH_TYPE_IGEP0030:
-               env_set("fdtfile", "omap3-igep0030.dtb");
+       case 2:
+       case 3:
+               gpio_request(IGEP0030_GPIO_LED, "igep0030_gpio_led");
+               gpio_direction_output(IGEP0030_GPIO_LED, 0);
+               break;
+       default:
+               /* Should not happen... */
                break;
        }
 }
 
+void set_boardname(void)
+{
+       char rev[5] = { 'F','C','G','E', };
+       int i = get_board_revision();
+
+       rev[i+1] = 0;
+       env_set("board_rev", rev + i);
+       env_set("board_name", i < 2 ? "igep0020" : "igep0030");
+}
+
 /*
  * Routine: misc_init_r
  * Description: Configure board specific parts
  */
 int misc_init_r(void)
 {
+       t2_t *t2_base = (t2_t *)T2_BASE;
+       u32 pbias_lite;
+
        twl4030_power_init();
 
+       /* set VSIM to 1.8V */
+       twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VSIM_DEDICATED,
+                               TWL4030_PM_RECEIVER_VSIM_VSEL_18,
+                               TWL4030_PM_RECEIVER_VSIM_DEV_GRP,
+                               TWL4030_PM_RECEIVER_DEV_GRP_P1);
+
+       /* set up dual-voltage GPIOs to 1.8V */
+       pbias_lite = readl(&t2_base->pbias_lite);
+       pbias_lite &= ~PBIASLITEVMODE1;
+       pbias_lite |= PBIASLITEPWRDNZ1;
+       writel(pbias_lite, &t2_base->pbias_lite);
+       if (get_cpu_family() == CPU_OMAP36XX)
+               writel(readl(OMAP34XX_CTRL_WKUP_CTRL) |
+                                        OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ,
+                                        OMAP34XX_CTRL_WKUP_CTRL);
+
        setup_net_chip();
 
        omap_die_id_display();
 
-       set_fdt();
+       set_led();
+
+       set_boardname();
 
        return 0;
 }
index 5698efab5d7f9cba7bbbbd5237c9495b0f7fa4c1..1cbe7c94d98a0f3f2a565f70560d3bbb219ab475 100644 (file)
        MUX_VAL(CP(MMC1_DAT1),      (IEN  | PTU | EN  | M0)) /* MMC1_DAT1 */\
        MUX_VAL(CP(MMC1_DAT2),      (IEN  | PTU | EN  | M0)) /* MMC1_DAT2 */\
        MUX_VAL(CP(MMC1_DAT3),      (IEN  | PTU | EN  | M0)) /* MMC1_DAT3 */\
+       MUX_VAL(CP(UART1_TX),       (IDIS | PTD | DIS | M0)) /* UART1_TX */\
+       MUX_VAL(CP(UART1_RX),       (IEN  | PTD | DIS | M0)) /* UART1_RX */\
        MUX_VAL(CP(UART3_TX_IRTX),  (IDIS | PTD | DIS | M0)) /* UART3_TX */\
        MUX_VAL(CP(UART3_RX_IRRX),  (IEN  | PTD | DIS | M0)) /* UART3_RX */\
        MUX_VAL(CP(I2C1_SCL),       (IEN  | PTU | EN  | M0)) /* I2C1_SCL */\
        MUX_VAL(CP(SYS_BOOT4),      (IEN  | PTD | DIS | M4)) /* GPIO_6 */\
        MUX_VAL(CP(SYS_BOOT5),      (IEN  | PTD | DIS | M4)) /* GPIO_7 */\
        MUX_VAL(CP(SYS_BOOT6),      (IEN  | PTD | DIS | M4)) /* GPIO_8 */\
+       MUX_VAL(CP(ETK_D14_ES2),    (IEN  | PTU | EN  | M4)) /* GPIO_28 */\
+       MUX_VAL(CP(GPMC_NCS3),      (IDIS | PTD | DIS | M4)) /* GPIO_54 */\
+       MUX_VAL(CP(GPMC_WAIT2),     (IEN  | PTU | DIS | M4)) /* GPIO_64 */\
+       MUX_VAL(CP(GPIO129),        (IEN  | PTU | EN  | M4)) /* GPIO_129 */\
        MUX_VAL(CP(SDRC_CKE0),      (IDIS | PTU | EN  | M0)) /* SDRC_CKE0 */\
        MUX_VAL(CP(SDRC_CKE1),      (IDIS | PTU | EN  | M0)) /* SDRC_CKE1 */
 #endif
-
-#define MUX_IGEP0020() \
-       MUX_VAL(CP(GPMC_WAIT2),     (IEN  | PTU | DIS | M4)) /* GPIO_64-ETH_NRST */\
-
-#define MUX_IGEP0030() \
-       MUX_VAL(CP(UART1_TX),       (IDIS | PTD | DIS | M0)) /* UART1_TX */\
-       MUX_VAL(CP(UART1_RX),       (IEN  | PTD | DIS | M0)) /* UART1_RX */
diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
deleted file mode 100644 (file)
index 600434a..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_TARGET_OMAP3_IGEP00X0=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020"
-CONFIG_ENV_IS_NOWHERE=y
-CONFIG_BOOTDELAY=3
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_VERSION_VARIABLE=y
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL=y
-# CONFIG_SPL_EXT_SUPPORT is not set
-CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_SPL_ONENAND_SUPPORT=y
-CONFIG_SPL_OS_BOOT=y
-# CONFIG_CMD_IMLS is not set
-CONFIG_CMD_SPL=y
-CONFIG_CMD_ASKENV=y
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_NAND=y
-CONFIG_CMD_ONENAND=y
-CONFIG_CMD_SPI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_UBI=y
-# CONFIG_CMD_UBIFS is not set
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_LED_STATUS=y
-CONFIG_LED_STATUS_GPIO=y
-CONFIG_LED_STATUS0=y
-CONFIG_LED_STATUS_BIT=27
-CONFIG_LED_STATUS_STATE=2
-CONFIG_LED_STATUS_BOOT_ENABLE=y
-CONFIG_LED_STATUS_BOOT=0
-CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
-CONFIG_MTD_UBI_FASTMAP=y
-CONFIG_SYS_NS16550=y
-CONFIG_OMAP3_SPI=y
-CONFIG_FAT_WRITE=y
-CONFIG_OF_LIBFDT=y
-CONFIG_FDT_FIXUP_PARTITIONS=y
diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig
deleted file mode 100644 (file)
index abf83c2..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_TARGET_OMAP3_IGEP00X0=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030"
-CONFIG_ENV_IS_NOWHERE=y
-CONFIG_BOOTDELAY=3
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_VERSION_VARIABLE=y
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL=y
-# CONFIG_SPL_EXT_SUPPORT is not set
-CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_SPL_ONENAND_SUPPORT=y
-CONFIG_SPL_OS_BOOT=y
-# CONFIG_CMD_IMLS is not set
-CONFIG_CMD_SPL=y
-CONFIG_CMD_ASKENV=y
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_NAND=y
-CONFIG_CMD_ONENAND=y
-CONFIG_CMD_SPI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_UBI=y
-# CONFIG_CMD_UBIFS is not set
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_LED_STATUS=y
-CONFIG_LED_STATUS_GPIO=y
-CONFIG_LED_STATUS0=y
-CONFIG_LED_STATUS_BIT=16
-CONFIG_LED_STATUS_STATE=2
-CONFIG_LED_STATUS_BOOT_ENABLE=y
-CONFIG_LED_STATUS_BOOT=0
-CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
-CONFIG_SYS_NS16550=y
-CONFIG_OMAP3_SPI=y
-CONFIG_FAT_WRITE=y
-CONFIG_OF_LIBFDT=y
-CONFIG_FDT_FIXUP_PARTITIONS=y
diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
new file mode 100644 (file)
index 0000000..1cdc73d
--- /dev/null
@@ -0,0 +1,40 @@
+CONFIG_ARM=y
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_TARGET_OMAP3_IGEP00X0=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_ENV_IS_NOWHERE=y
+CONFIG_BOOTDELAY=3
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_VERSION_VARIABLE=y
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_SPL=y
+# CONFIG_SPL_EXT_SUPPORT is not set
+CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_ONENAND_SUPPORT=y
+CONFIG_SPL_OS_BOOT=y
+# CONFIG_CMD_IMLS is not set
+CONFIG_CMD_SPL=y
+CONFIG_CMD_ASKENV=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_ONENAND=y
+CONFIG_CMD_SPI=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_UBI=y
+# CONFIG_CMD_UBIFS is not set
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_MMC_OMAP_HS=y
+CONFIG_NAND=y
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_SYS_NS16550=y
+CONFIG_OMAP3_SPI=y
+CONFIG_FAT_WRITE=y
+CONFIG_OF_LIBFDT=y
+CONFIG_FDT_FIXUP_PARTITIONS=y
index a029b54804d730f897254d8c2743f3da271f4ff4..dc137dbd41a9b6d6ef2768340f6245f629a24a5b 100644 (file)
@@ -13,7 +13,6 @@
 #define CONFIG_NR_DRAM_BANKS            2
 
 #include <configs/ti_omap3_common.h>
-#include <asm/mach-types.h>
 
 /*
  * We are only ever GP parts and will utilize all of the "downloaded image"
 
 #define CONFIG_REVISION_TAG            1
 
-/* Status LED available for IGEP0020 and IGEP0030 but not IGEP0032 */
-#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020) || \
-                      (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030)
-#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020)
-#define RED_LED_GPIO 27
-#elif (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030)
-#define RED_LED_GPIO 16
-#endif
-#endif
+/* GPIO banks */
+#define CONFIG_OMAP3_GPIO_2            /* GPIO32..63   is in GPIO bank 2 */
+#define CONFIG_OMAP3_GPIO_4            /* GPIO96..127  is in GPIO bank 4 */
+
+/* TPS65950 */
+#define PBIASLITEVMODE1                        (1 << 8)
+
+/* LED */
+#define IGEP0020_GPIO_LED              27
+#define IGEP0030_GPIO_LED              16
+
+/* Board and revision detection GPIOs */
+#define IGEP0030_USB_TRANSCEIVER_RESET         54
+#define GPIO_IGEP00X0_BOARD_DETECTION          28
+#define GPIO_IGEP00X0_REVISION_DETECTION       129
 
 /* USB */
 #define CONFIG_USB_MUSB_UDC            1
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0)
 
+#define CONFIG_BOOTCOMMAND \
+       "run findfdt; " \
+       "run distro_bootcmd"
+
 #include <config_distro_bootcmd.h>
 
+#define ENV_FINDFDT \
+       "findfdt="\
+               "if test ${board_name} = igep0020; then " \
+                       "if test ${board_rev} = F; then " \
+                               "setenv fdtfile omap3-igep0020-rev-f.dtb; " \
+                       "else " \
+                               "setenv fdtfile omap3-igep0020.dtb; fi; fi; " \
+               "if test ${board_name} = igep0030; then " \
+                       "if test ${board_rev} = G; then " \
+                               "setenv fdtfile omap3-igep0030-rev-g.dtb; " \
+                       "else " \
+                               "setenv fdtfile omap3-igep0030.dtb; fi; fi; " \
+               "if test ${fdtfile} = ''; then " \
+                       "echo WARNING: Could not determine device tree to use; fi; \0"
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       ENV_FINDFDT \
        ENV_DEVICE_SETTINGS \
        MEM_LAYOUT_SETTINGS \
        BOOTENV