public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board
@ 2013-10-21 23:34 Otavio Salvador
  2013-10-21 23:34 ` [U-Boot] [PATCH 1/4] mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin Otavio Salvador
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Otavio Salvador @ 2013-10-21 23:34 UTC (permalink / raw)
  To: u-boot

This patchset adds support for the Future Eletronics 7" WVGA LCD
extension board and implements its auto-detection using i2c to check
for it's touch controller presence.

The IOMUXC change is included here as it makes both SoC type MUX
settings in line to each other and took a while to figure out why it
worked with one and failed with another SoC.


Otavio Salvador (4):
  mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin
  wandboard: add Future Eletronics 7" WVGA LCD extension board
  wandboard: Use '0' as bootdelay but interruptable
  wandboard: Pass 'quiet' bootparam by default

 arch/arm/include/asm/arch-mx6/mx6dl_pins.h |   2 +-
 board/wandboard/wandboard.c                | 238 ++++++++++++++++++++++++++---
 include/configs/wandboard.h                |  38 ++++-
 3 files changed, 254 insertions(+), 24 deletions(-)

-- 
1.8.4.rc3

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 1/4] mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin
  2013-10-21 23:34 [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board Otavio Salvador
@ 2013-10-21 23:34 ` Otavio Salvador
  2013-10-31 17:01   ` Stefano Babic
  2013-10-21 23:34 ` [U-Boot] [PATCH 2/4] wandboard: add Future Eletronics 7" WVGA LCD extension board Otavio Salvador
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 9+ messages in thread
From: Otavio Salvador @ 2013-10-21 23:34 UTC (permalink / raw)
  To: u-boot

This removes the PAD_CTL_DSE_120ohm as done for i.MX6Q's IPU1_DI0_PIN4
pin definition and makes it aligned with 3.0.35-4.1.0 and 3.12
mainline kernel.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/arch-mx6/mx6dl_pins.h b/arch/arm/include/asm/arch-mx6/mx6dl_pins.h
index b5df68a..7373407 100644
--- a/arch/arm/include/asm/arch-mx6/mx6dl_pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6dl_pins.h
@@ -210,7 +210,7 @@ enum {
 	MX6_PAD_DI0_PIN3__MMDC_MMDC_DEBUG_3	= IOMUX_PAD(0x03BC, 0x00A8, 6, 0x0000, 0, 0),
 	MX6_PAD_DI0_PIN3__PL301_SIM_MX6DL_PER1_HADDR_10	= IOMUX_PAD(0x03BC, 0x00A8, 7, 0x0000, 0, 0),
 	MX6_PAD_DI0_PIN3__LCDIF_CS		= IOMUX_PAD(0x03BC, 0x00A8, 8, 0x0000, 0, 0),
-	MX6_PAD_DI0_PIN4__IPU1_DI0_PIN4		= IOMUX_PAD(0x03C0, 0x00AC, 0, 0x0000, 0, PAD_CTL_DSE_120ohm),
+	MX6_PAD_DI0_PIN4__IPU1_DI0_PIN4		= IOMUX_PAD(0x03C0, 0x00AC, 0, 0x0000, 0, 0),
 	MX6_PAD_DI0_PIN4__LCDIF_BUSY		= IOMUX_PAD(0x03C0, 0x00AC, 1, 0x08D8, 1, 0),
 	MX6_PAD_DI0_PIN4__AUDMUX_AUD6_RXD	= IOMUX_PAD(0x03C0, 0x00AC, 2, 0x0000, 0, 0),
 	MX6_PAD_DI0_PIN4__USDHC1_WP		= IOMUX_PAD(0x03C0, 0x00AC, 3, 0x092C, 0, 0),
-- 
1.8.4.rc3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/4] wandboard: add Future Eletronics 7" WVGA LCD extension board
  2013-10-21 23:34 [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board Otavio Salvador
  2013-10-21 23:34 ` [U-Boot] [PATCH 1/4] mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin Otavio Salvador
@ 2013-10-21 23:34 ` Otavio Salvador
  2013-10-22 10:20   ` Tapani Utriainen
  2013-10-21 23:34 ` [U-Boot] [PATCH 3/4] wandboard: Use '0' as bootdelay but interruptable Otavio Salvador
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 9+ messages in thread
From: Otavio Salvador @ 2013-10-21 23:34 UTC (permalink / raw)
  To: u-boot

This adds support for the 7" WVGA produced by Future Eletronics and
make it dynamically detect if it is connected or not based on the
touchscreen controller.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 board/wandboard/wandboard.c | 238 ++++++++++++++++++++++++++++++++++++++++----
 include/configs/wandboard.h |  35 ++++++-
 2 files changed, 251 insertions(+), 22 deletions(-)

diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 23a78c1..b2a27c0 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -15,6 +15,7 @@
 #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/io.h>
 #include <asm/sizes.h>
@@ -25,6 +26,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <linux/fb.h>
+#include <i2c.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -39,6 +41,10 @@ DECLARE_GLOBAL_DATA_PTR;
 #define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
 	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
 
+#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)
+
 #define USDHC1_CD_GPIO		IMX_GPIO_NR(1, 2)
 #define USDHC3_CD_GPIO		IMX_GPIO_NR(3, 9)
 #define ETH_PHY_RESET		IMX_GPIO_NR(3, 29)
@@ -208,48 +214,236 @@ int board_phy_config(struct phy_device *phydev)
 }
 
 #if defined(CONFIG_VIDEO_IPUV3)
-static struct fb_videomode const hdmi = {
-	.name           = "HDMI",
-	.refresh        = 60,
-	.xres           = 1024,
-	.yres           = 768,
-	.pixclock       = 15385,
-	.left_margin    = 220,
-	.right_margin   = 40,
-	.upper_margin   = 21,
-	.lower_margin   = 7,
-	.hsync_len      = 60,
-	.vsync_len      = 10,
-	.sync           = FB_SYNC_EXT,
-	.vmode          = FB_VMODE_NONINTERLACED
+struct i2c_pads_info i2c_pad_info = {
+	.scl = {
+		.i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL
+			| MUX_PAD_CTRL(I2C_PAD_CTRL),
+		.gpio_mode = MX6_PAD_KEY_COL3__GPIO_4_12
+			| MUX_PAD_CTRL(I2C_PAD_CTRL),
+		.gp = IMX_GPIO_NR(4, 12)
+	},
+	.sda = {
+		.i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA
+			| MUX_PAD_CTRL(I2C_PAD_CTRL),
+		.gpio_mode = MX6_PAD_KEY_ROW3__GPIO_4_13
+			| MUX_PAD_CTRL(I2C_PAD_CTRL),
+		.gp = IMX_GPIO_NR(4, 13)
+	}
 };
 
-int board_video_skip(void)
-{
-	int ret;
+static iomux_v3_cfg_t const fwadapt_7wvga_pads[] = {
+	MX6_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK,
+	MX6_PAD_DI0_PIN2__IPU1_DI0_PIN2, /* HSync */
+	MX6_PAD_DI0_PIN3__IPU1_DI0_PIN3, /* VSync */
+	MX6_PAD_DI0_PIN4__IPU1_DI0_PIN4
+		| MUX_PAD_CTRL(PAD_CTL_DSE_120ohm), /* Contrast */
+	MX6_PAD_DI0_PIN15__IPU1_DI0_PIN15, /* DISP0_DRDY */
+
+	MX6_PAD_DISP0_DAT0__IPU1_DISP0_DAT_0,
+	MX6_PAD_DISP0_DAT1__IPU1_DISP0_DAT_1,
+	MX6_PAD_DISP0_DAT2__IPU1_DISP0_DAT_2,
+	MX6_PAD_DISP0_DAT3__IPU1_DISP0_DAT_3,
+	MX6_PAD_DISP0_DAT4__IPU1_DISP0_DAT_4,
+	MX6_PAD_DISP0_DAT5__IPU1_DISP0_DAT_5,
+	MX6_PAD_DISP0_DAT6__IPU1_DISP0_DAT_6,
+	MX6_PAD_DISP0_DAT7__IPU1_DISP0_DAT_7,
+	MX6_PAD_DISP0_DAT8__IPU1_DISP0_DAT_8,
+	MX6_PAD_DISP0_DAT9__IPU1_DISP0_DAT_9,
+	MX6_PAD_DISP0_DAT10__IPU1_DISP0_DAT_10,
+	MX6_PAD_DISP0_DAT11__IPU1_DISP0_DAT_11,
+	MX6_PAD_DISP0_DAT12__IPU1_DISP0_DAT_12,
+	MX6_PAD_DISP0_DAT13__IPU1_DISP0_DAT_13,
+	MX6_PAD_DISP0_DAT14__IPU1_DISP0_DAT_14,
+	MX6_PAD_DISP0_DAT15__IPU1_DISP0_DAT_15,
+	MX6_PAD_DISP0_DAT16__IPU1_DISP0_DAT_16,
+	MX6_PAD_DISP0_DAT17__IPU1_DISP0_DAT_17,
+
+	MX6_PAD_SD4_DAT2__GPIO_2_10
+		| MUX_PAD_CTRL(NO_PAD_CTRL), /* DISP0_BKLEN */
+	MX6_PAD_SD4_DAT3__GPIO_2_11
+		| MUX_PAD_CTRL(NO_PAD_CTRL), /* DISP0_VDDEN */
+};
 
-	ret = ipuv3_fb_init(&hdmi, 0, IPU_PIX_FMT_RGB24);
+struct display_info_t {
+	int	bus;
+	int	addr;
+	int	pixfmt;
+	int	(*detect)(struct display_info_t const *dev);
+	void	(*enable)(struct display_info_t const *dev);
+	struct	fb_videomode mode;
+};
 
-	if (ret)
-		printf("HDMI cannot be configured: %d\n", ret);
+static int detect_hdmi(struct display_info_t const *dev)
+{
+	struct hdmi_regs *hdmi	= (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
+	return readb(&hdmi->phy_stat0) & HDMI_DVI_STAT;
+}
 
+static void do_enable_hdmi(struct display_info_t const *dev)
+{
 	imx_enable_hdmi_phy();
+}
 
-	return ret;
+static int detect_i2c(struct display_info_t const *dev)
+{
+	return ((0 == i2c_set_bus_num(dev->bus)) &&
+			(0 == i2c_probe(dev->addr)));
+}
+
+static void enable_fwadapt_7wvga(struct display_info_t const *dev)
+{
+	imx_iomux_v3_setup_multiple_pads(
+		fwadapt_7wvga_pads,
+		ARRAY_SIZE(fwadapt_7wvga_pads));
+
+	gpio_direction_output(IMX_GPIO_NR(2, 10), 1);
+	gpio_direction_output(IMX_GPIO_NR(2, 11), 1);
+}
+
+static struct display_info_t const displays[] = {{
+	.bus	= -1,
+	.addr	= 0,
+	.pixfmt	= IPU_PIX_FMT_RGB24,
+	.detect	= detect_hdmi,
+	.enable	= do_enable_hdmi,
+	.mode	= {
+		.name           = "HDMI",
+		.refresh        = 60,
+		.xres           = 1024,
+		.yres           = 768,
+		.pixclock       = 15385,
+		.left_margin    = 220,
+		.right_margin   = 40,
+		.upper_margin   = 21,
+		.lower_margin   = 7,
+		.hsync_len      = 60,
+		.vsync_len      = 10,
+		.sync           = FB_SYNC_EXT,
+		.vmode          = FB_VMODE_NONINTERLACED
+} }, {
+	.bus	= 0,
+	.addr	= 0x10,
+	.pixfmt	= IPU_PIX_FMT_RGB666,
+	.detect	= detect_i2c,
+	.enable	= enable_fwadapt_7wvga,
+	.mode	= {
+		.name           = "FWBADAPT-LCD-F07A-0102",
+		.refresh        = 60,
+		.xres           = 800,
+		.yres           = 480,
+		.pixclock       = 33260,
+		.left_margin    = 128,
+		.right_margin   = 128,
+		.upper_margin   = 22,
+		.lower_margin   = 22,
+		.hsync_len      = 1,
+		.vsync_len      = 1,
+		.sync           = 0,
+		.vmode          = FB_VMODE_NONINTERLACED
+} } };
+
+int board_video_skip(void)
+{
+	int i;
+	int ret;
+	int detected = 0;
+	char const *panel = getenv("panel");
+	if (!panel) {
+		for (i = 0; i < ARRAY_SIZE(displays); i++) {
+			struct display_info_t const *dev = displays+i;
+			if (dev->detect && dev->detect(dev)) {
+				panel = dev->mode.name;
+				detected = 1;
+				break;
+			}
+		}
+		if (!panel) {
+			panel = displays[0].mode.name;
+			printf("No panel detected: default to %s\n", panel);
+			i = 0;
+		}
+	} else {
+		for (i = 0; i < ARRAY_SIZE(displays); i++) {
+			if (!strcmp(panel, displays[i].mode.name))
+				break;
+		}
+	}
+	if (i < ARRAY_SIZE(displays)) {
+		ret = ipuv3_fb_init(&displays[i].mode, 0,
+				    displays[i].pixfmt);
+
+		if (!ret) {
+			displays[i].enable(displays+i);
+			printf("Display: %s (%ux%u) %s\n",
+			       displays[i].mode.name,
+			       displays[i].mode.xres,
+			       displays[i].mode.yres,
+			       (detected ? "[auto]" : ""));
+		} else
+			printf("LCD %s cannot be configured: %d\n",
+			       displays[i].mode.name, ret);
+	} else {
+		printf("unsupported panel %s\n", panel);
+		return -EINVAL;
+	}
+
+	return 0;
 }
 
 static void setup_display(void)
 {
 	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+	struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
 	int reg;
 
 	enable_ipu_clock();
 	imx_setup_hdmi();
 
+	/* Turn on LDB0, LDB1, IPU,IPU DI0 clocks */
+	reg = __raw_readl(&mxc_ccm->CCGR3);
+	reg |=  MXC_CCM_CCGR3_LDB_DI0_MASK | MXC_CCM_CCGR3_LDB_DI1_MASK;
+	writel(reg, &mxc_ccm->CCGR3);
+
+	/* set LDB0, LDB1 clk select to 011/011 */
+	reg = readl(&mxc_ccm->cs2cdr);
+	reg &= ~(MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_MASK
+		 | MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_MASK);
+	reg |= (3 << MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET)
+	      | (3 << MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET);
+	writel(reg, &mxc_ccm->cs2cdr);
+
+	reg = readl(&mxc_ccm->cscmr2);
+	reg |= MXC_CCM_CSCMR2_LDB_DI0_IPU_DIV | MXC_CCM_CSCMR2_LDB_DI1_IPU_DIV;
+	writel(reg, &mxc_ccm->cscmr2);
+
 	reg = readl(&mxc_ccm->chsccdr);
 	reg |= (CHSCCDR_CLK_SEL_LDB_DI0
 		<< MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET);
+	reg |= (CHSCCDR_CLK_SEL_LDB_DI0
+		<< MXC_CCM_CHSCCDR_IPU1_DI1_CLK_SEL_OFFSET);
 	writel(reg, &mxc_ccm->chsccdr);
+
+	reg = IOMUXC_GPR2_BGREF_RRMODE_EXTERNAL_RES
+	     | IOMUXC_GPR2_DI1_VS_POLARITY_ACTIVE_LOW
+	     | IOMUXC_GPR2_DI0_VS_POLARITY_ACTIVE_LOW
+	     | IOMUXC_GPR2_BIT_MAPPING_CH1_SPWG
+	     | IOMUXC_GPR2_DATA_WIDTH_CH1_18BIT
+	     | IOMUXC_GPR2_BIT_MAPPING_CH0_SPWG
+	     | IOMUXC_GPR2_DATA_WIDTH_CH0_18BIT
+	     | IOMUXC_GPR2_LVDS_CH0_MODE_DISABLED
+	     | IOMUXC_GPR2_LVDS_CH1_MODE_ENABLED_DI0;
+	writel(reg, &iomux->gpr[2]);
+
+	reg = readl(&iomux->gpr[3]);
+	reg = (reg & ~(IOMUXC_GPR3_LVDS1_MUX_CTL_MASK
+			| IOMUXC_GPR3_HDMI_MUX_CTL_MASK))
+	    | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0
+	       << IOMUXC_GPR3_LVDS1_MUX_CTL_OFFSET);
+	writel(reg, &iomux->gpr[3]);
+
+	/* Disable LCD backlight */
+	imx_iomux_v3_setup_pad(MX6_PAD_DI0_PIN4__GPIO_4_20);
+	gpio_direction_input(IMX_GPIO_NR(4, 20));
 }
 #endif /* CONFIG_VIDEO_IPUV3 */
 
@@ -307,6 +501,8 @@ int board_init(void)
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
+	setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info);
+
 	return 0;
 }
 
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 442a984..dff515e 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -55,6 +55,12 @@
 #define CONFIG_LOADADDR			0x12000000
 #define CONFIG_SYS_TEXT_BASE		0x17800000
 
+/* I2C Configs */
+#define CONFIG_CMD_I2C
+#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_I2C_MXC
+#define CONFIG_SYS_I2C_SPEED		100000
+
 /* MMC Configuration */
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC
@@ -97,6 +103,7 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IPUV3_CLK 260000000
+#define CONFIG_CMD_HDMIDETECT
 #define CONFIG_IMX_HDMI
 
 #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
@@ -134,7 +141,33 @@
 			"fi; "	\
 		"fi\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-		"root=${mmcroot}\0" \
+		"root=${mmcroot}; run videoargs\0" \
+	"videoargs=" \
+		"setenv nextcon 0; " \
+		"if hdmidet; then " \
+			"setenv bootargs ${bootargs} " \
+				"video=mxcfb${nextcon}:dev=hdmi,1280x720M at 60," \
+					"if=RGB24; " \
+			"setenv fbmen fbmem=28M; " \
+			"setexpr nextcon ${nextcon} + 1; " \
+		"else " \
+			"echo - no HDMI monitor;" \
+		"fi; " \
+		"i2c dev 0; " \
+		"if i2c probe 0x10; then " \
+			"setenv bootargs ${bootargs} " \
+				"video=mxcfb${nextcon}:dev=lcd,800x480 at 60," \
+					"if=RGB666; " \
+			"if test 0 -eq ${nextcon}; then " \
+				"setenv fbmem fbmem=10M; " \
+			"else " \
+				"setenv fbmem ${fbmem},10M; " \
+			"fi; " \
+			"setexpr nextcon ${nextcon} + 1; " \
+		"else " \
+			"echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \
+		"fi; " \
+		"setenv bootargs ${bootargs} ${fbmem}\0" \
 	"loadbootscript=" \
 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
-- 
1.8.4.rc3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 3/4] wandboard: Use '0' as bootdelay but interruptable
  2013-10-21 23:34 [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board Otavio Salvador
  2013-10-21 23:34 ` [U-Boot] [PATCH 1/4] mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin Otavio Salvador
  2013-10-21 23:34 ` [U-Boot] [PATCH 2/4] wandboard: add Future Eletronics 7" WVGA LCD extension board Otavio Salvador
@ 2013-10-21 23:34 ` Otavio Salvador
  2013-10-21 23:35 ` [U-Boot] [PATCH 4/4] wandboard: Pass 'quiet' bootparam by default Otavio Salvador
  2013-11-21  9:23 ` [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board Stefano Babic
  4 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2013-10-21 23:34 UTC (permalink / raw)
  To: u-boot

The '0' as bootdelay reduces a lot the boot time while we still allow
the boot to be interruptable if need.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 include/configs/wandboard.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index dff515e..bffac9a 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -48,7 +48,8 @@
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_SETEXPR
 
-#define CONFIG_BOOTDELAY		5
+#define CONFIG_BOOTDELAY		0
+#define CONFIG_ZERO_BOOTDELAY_CHECK
 
 #define CONFIG_SYS_MEMTEST_START	0x10000000
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-- 
1.8.4.rc3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 4/4] wandboard: Pass 'quiet' bootparam by default
  2013-10-21 23:34 [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board Otavio Salvador
                   ` (2 preceding siblings ...)
  2013-10-21 23:34 ` [U-Boot] [PATCH 3/4] wandboard: Use '0' as bootdelay but interruptable Otavio Salvador
@ 2013-10-21 23:35 ` Otavio Salvador
  2013-11-21  9:23 ` [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board Stefano Babic
  4 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2013-10-21 23:35 UTC (permalink / raw)
  To: u-boot

This reduces the boot time and makes easier to spot important images.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 include/configs/wandboard.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index bffac9a..75a456c 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -142,7 +142,7 @@
 			"fi; "	\
 		"fi\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-		"root=${mmcroot}; run videoargs\0" \
+		"root=${mmcroot} quiet; run videoargs\0" \
 	"videoargs=" \
 		"setenv nextcon 0; " \
 		"if hdmidet; then " \
-- 
1.8.4.rc3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/4] wandboard: add Future Eletronics 7" WVGA LCD extension board
  2013-10-21 23:34 ` [U-Boot] [PATCH 2/4] wandboard: add Future Eletronics 7" WVGA LCD extension board Otavio Salvador
@ 2013-10-22 10:20   ` Tapani Utriainen
  0 siblings, 0 replies; 9+ messages in thread
From: Tapani Utriainen @ 2013-10-22 10:20 UTC (permalink / raw)
  To: u-boot

On Mon, 21 Oct 2013 21:34:58 -0200
Otavio Salvador <otavio@ossystems.com.br> wrote:

> This adds support for the 7" WVGA produced by Future Eletronics and
> make it dynamically detect if it is connected or not based on the
> touchscreen controller.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Nice!

Tested-by: Tapani Utriainen <tapani@technexion.com>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 1/4] mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin
  2013-10-21 23:34 ` [U-Boot] [PATCH 1/4] mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin Otavio Salvador
@ 2013-10-31 17:01   ` Stefano Babic
  0 siblings, 0 replies; 9+ messages in thread
From: Stefano Babic @ 2013-10-31 17:01 UTC (permalink / raw)
  To: u-boot

On 22/10/2013 01:34, Otavio Salvador wrote:
> This removes the PAD_CTL_DSE_120ohm as done for i.MX6Q's IPU1_DI0_PIN4
> pin definition and makes it aligned with 3.0.35-4.1.0 and 3.12
> mainline kernel.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic


-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board
  2013-10-21 23:34 [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board Otavio Salvador
                   ` (3 preceding siblings ...)
  2013-10-21 23:35 ` [U-Boot] [PATCH 4/4] wandboard: Pass 'quiet' bootparam by default Otavio Salvador
@ 2013-11-21  9:23 ` Stefano Babic
  2013-11-21 13:02   ` Otavio Salvador
  4 siblings, 1 reply; 9+ messages in thread
From: Stefano Babic @ 2013-11-21  9:23 UTC (permalink / raw)
  To: u-boot

Hi Otavio,

On 22/10/2013 01:34, Otavio Salvador wrote:
> This patchset adds support for the Future Eletronics 7" WVGA LCD
> extension board and implements its auto-detection using i2c to check
> for it's touch controller presence.
> 
> The IOMUXC change is included here as it makes both SoC type MUX
> settings in line to each other and took a while to figure out why it
> worked with one and failed with another SoC.
> 
> 
> Otavio Salvador (4):
>   mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin
>   wandboard: add Future Eletronics 7" WVGA LCD extension board
>   wandboard: Use '0' as bootdelay but interruptable
>   wandboard: Pass 'quiet' bootparam by default
> 
>  arch/arm/include/asm/arch-mx6/mx6dl_pins.h |   2 +-
>  board/wandboard/wandboard.c                | 238 ++++++++++++++++++++++++++---
>  include/configs/wandboard.h                |  38 ++++-
>  3 files changed, 254 insertions(+), 24 deletions(-)

I confess that I hoped that Simon's patches to extract the env from the
board configuration file could be merged very soon into mainline, but
they are not yet merged, and I am blocking some patches, mostly
Otavio's. Again, there is also patches adding new feature as this one
for the Future Electronics display, that contains also many additions to
CONFIG_EXTRA_ENV_SETTINGS.

I will apply the patch for Future's display - it is much more as only a
change to default environment - but I am still confident that we can do
in the right way once and I will let the other patches in my queue.

Otavio, this regards your patches:
	http://patchwork.ozlabs.org/patch/285295/
	http://patchwork.ozlabs.org/patch/285296/
	http://patchwork.ozlabs.org/patch/285294/

Best regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board
  2013-11-21  9:23 ` [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board Stefano Babic
@ 2013-11-21 13:02   ` Otavio Salvador
  0 siblings, 0 replies; 9+ messages in thread
From: Otavio Salvador @ 2013-11-21 13:02 UTC (permalink / raw)
  To: u-boot

On Thu, Nov 21, 2013 at 7:23 AM, Stefano Babic <sbabic@denx.de> wrote:
> Hi Otavio,
>
> On 22/10/2013 01:34, Otavio Salvador wrote:
>> This patchset adds support for the Future Eletronics 7" WVGA LCD
>> extension board and implements its auto-detection using i2c to check
>> for it's touch controller presence.
>>
>> The IOMUXC change is included here as it makes both SoC type MUX
>> settings in line to each other and took a while to figure out why it
>> worked with one and failed with another SoC.
>>
>>
>> Otavio Salvador (4):
>>   mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin
>>   wandboard: add Future Eletronics 7" WVGA LCD extension board
>>   wandboard: Use '0' as bootdelay but interruptable
>>   wandboard: Pass 'quiet' bootparam by default
>>
>>  arch/arm/include/asm/arch-mx6/mx6dl_pins.h |   2 +-
>>  board/wandboard/wandboard.c                | 238 ++++++++++++++++++++++++++---
>>  include/configs/wandboard.h                |  38 ++++-
>>  3 files changed, 254 insertions(+), 24 deletions(-)
>
> I confess that I hoped that Simon's patches to extract the env from the
> board configuration file could be merged very soon into mainline, but
> they are not yet merged, and I am blocking some patches, mostly
> Otavio's. Again, there is also patches adding new feature as this one
> for the Future Electronics display, that contains also many additions to
> CONFIG_EXTRA_ENV_SETTINGS.
>
> I will apply the patch for Future's display - it is much more as only a
> change to default environment - but I am still confident that we can do
> in the right way once and I will let the other patches in my queue.
>
> Otavio, this regards your patches:
>         http://patchwork.ozlabs.org/patch/285295/
>         http://patchwork.ozlabs.org/patch/285296/
>         http://patchwork.ozlabs.org/patch/285294/

I think all those should go; As I already said I will rework the
environments when Simon's changes are included but holding the
development due it is wrong in my point of view.

In fact I stopped sending patches as they are not applied for a
while... and this is unfortunate.

Anyway, not my call...

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2013-11-21 13:02 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-21 23:34 [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board Otavio Salvador
2013-10-21 23:34 ` [U-Boot] [PATCH 1/4] mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin Otavio Salvador
2013-10-31 17:01   ` Stefano Babic
2013-10-21 23:34 ` [U-Boot] [PATCH 2/4] wandboard: add Future Eletronics 7" WVGA LCD extension board Otavio Salvador
2013-10-22 10:20   ` Tapani Utriainen
2013-10-21 23:34 ` [U-Boot] [PATCH 3/4] wandboard: Use '0' as bootdelay but interruptable Otavio Salvador
2013-10-21 23:35 ` [U-Boot] [PATCH 4/4] wandboard: Pass 'quiet' bootparam by default Otavio Salvador
2013-11-21  9:23 ` [U-Boot] [PATCH 0/4] Wandboard support for Future Eletronics 7" WVGA LCD extension board Stefano Babic
2013-11-21 13:02   ` Otavio Salvador

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox