[PATCH 01/11] imx: ventana: remove USB_KEYBOARD support
For some time now having USB_KEYBOARD support has caused usb to be initialized on boot. To allow for a quicker bootup we don't want this for Ventana and don't really need USB keyboard support so remove it.
Signed-off-by: Tim Harvey tharvey@gateworks.com --- configs/gwventana_emmc_defconfig | 1 - configs/gwventana_gw5904_defconfig | 1 - configs/gwventana_nand_defconfig | 1 - 3 files changed, 3 deletions(-)
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 6e3aebbf1b..db0b214033 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -108,7 +108,6 @@ CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Gateworks" diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 77e65f2236..0927ab5b23 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -112,7 +112,6 @@ CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Gateworks" diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index db31d97f3d..e746728cf8 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -114,7 +114,6 @@ CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y -CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Gateworks"
remove unnecessary includes
Signed-off-by: Tim Harvey tharvey@gateworks.com --- board/gateworks/gw_ventana/gw_ventana.c | 14 -------------- 1 file changed, 14 deletions(-)
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 1ed9c1a39f..4a6b1dc461 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -6,37 +6,23 @@ */
#include <common.h> -#include <init.h> -#include <log.h> -#include <net.h> #include <asm/arch/clock.h> #include <asm/arch/crm_regs.h> -#include <asm/arch/iomux.h> #include <asm/arch/mx6-pins.h> #include <asm/arch/mxc_hdmi.h> #include <asm/arch/sys_proto.h> #include <asm/global_data.h> #include <asm/gpio.h> #include <asm/mach-imx/boot_mode.h> -#include <asm/mach-imx/sata.h> #include <asm/mach-imx/video.h> -#include <asm/io.h> #include <asm/setup.h> -#include <dm.h> #include <env.h> #include <hwconfig.h> -#include <i2c.h> -#include <fdt_support.h> -#include <jffs2/load_kernel.h> #include <linux/ctype.h> #include <miiphy.h> #include <mtd_node.h> -#include <pci.h> #include <linux/delay.h> -#include <linux/libfdt.h> #include <power/pmic.h> -#include <power/ltc3676_pmic.h> -#include <power/pfuze100_pmic.h> #include <fdt_support.h> #include <jffs2/load_kernel.h>
remove unnecessary includes Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
remove unnecessary includes Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Increase SYS_BOOM_LEN from the default 16M in imx6_common to 64M.
Signed-off-by: Tim Harvey tharvey@gateworks.com --- include/configs/gw_ventana.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 4f2f323b77..f80a3094a1 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -38,6 +38,9 @@ /* NAND */ #define CONFIG_SYS_MAX_NAND_DEVICE 1
+#undef CONFIG_SYS_BOOTM_LEN +#define CONFIG_SYS_BOOTM_LEN (64 << 20) + /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC
Increase SYS_BOOM_LEN from the default 16M in imx6_common to 64M. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Increase SYS_BOOM_LEN from the default 16M in imx6_common to 64M. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Add Legacy U-Boot image support needed to boot a uImage.
Signed-off-by: Tim Harvey tharvey@gateworks.com --- configs/gwventana_emmc_defconfig | 1 - configs/gwventana_gw5904_defconfig | 1 - configs/gwventana_nand_defconfig | 1 - 3 files changed, 3 deletions(-)
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index db0b214033..22644bf715 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -24,7 +24,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y # CONFIG_USE_SPL_FIT_GENERATOR is not set -# CONFIG_LEGACY_IMAGE_FORMAT is not set CONFIG_SUPPORT_RAW_INITRD=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 0927ab5b23..bf53e50e55 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -24,7 +24,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y # CONFIG_USE_SPL_FIT_GENERATOR is not set -# CONFIG_LEGACY_IMAGE_FORMAT is not set CONFIG_SUPPORT_RAW_INITRD=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index e746728cf8..1785d9a01e 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -24,7 +24,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y # CONFIG_USE_SPL_FIT_GENERATOR is not set -# CONFIG_LEGACY_IMAGE_FORMAT is not set CONFIG_SUPPORT_RAW_INITRD=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
Add Legacy U-Boot image support needed to boot a uImage. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Add Legacy U-Boot image support needed to boot a uImage. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Substitutions in EOL parts changes the VDD_2P5 voltage rail such that the previously unused VGEN6 LDO is needed in place of the lower power VGEN5 for the GW54xx-G.
Signed-off-by: Tim Harvey tharvey@gateworks.com --- board/gateworks/gw_ventana/common.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c index 4627a156fe..9f5f20f781 100644 --- a/board/gateworks/gw_ventana/common.c +++ b/board/gateworks/gw_ventana/common.c @@ -1550,6 +1550,17 @@ void setup_pmic(void) int board = read_eeprom(CONFIG_I2C_GSC, &ventana_info); const int i2c_pmic = 1; u32 reg; + char rev; + int i; + + /* determine board revision */ + rev = 'A'; + for (i = sizeof(ventana_info.model) - 1; i > 0; i--) { + if (ventana_info.model[i] >= 'A') { + rev = ventana_info.model[i]; + break; + } + }
i2c_set_bus_num(i2c_pmic);
@@ -1573,6 +1584,17 @@ void setup_pmic(void) reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK); reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT)); pmic_reg_write(p, PFUZE100_SWBSTCON1, reg); + + if (board == GW54xx && (rev == 'G')) { + /* Disable VGEN5 */ + pmic_reg_write(p, PFUZE100_VGEN5VOL, 0); + + /* Set VGEN6 to 2.5V and enable */ + pmic_reg_read(p, PFUZE100_VGEN6VOL, ®); + reg &= ~(LDO_VOL_MASK); + reg |= (LDOB_2_50V | LDO_EN); + pmic_reg_write(p, PFUZE100_VGEN6VOL, reg); + } } }
Substitutions in EOL parts changes the VDD_2P5 voltage rail such that the previously unused VGEN6 LDO is needed in place of the lower power VGEN5 for the GW54xx-G. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Substitutions in EOL parts changes the VDD_2P5 voltage rail such that the previously unused VGEN6 LDO is needed in place of the lower power VGEN5 for the GW54xx-G. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
In the default 'auto' mode regulators that are very lightly loaded can be put in PFM mode and fail to regulator properly. Switching them to always use continuous PWM mode has a neglibable affect on system power and garuntees proper regulation under lightly loaded circumstances.
Signed-off-by: Tim Harvey tharvey@gateworks.com --- board/gateworks/gw_ventana/common.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c index 9f5f20f781..b5a0162c5e 100644 --- a/board/gateworks/gw_ventana/common.c +++ b/board/gateworks/gw_ventana/common.c @@ -1596,6 +1596,32 @@ void setup_pmic(void) pmic_reg_write(p, PFUZE100_VGEN6VOL, reg); } } + + /* put all switchers in continuous mode */ + pmic_reg_read(p, PFUZE100_SW1ABMODE, ®); + reg &= ~(SW_MODE_MASK); + reg |= PWM_PWM; + pmic_reg_write(p, PFUZE100_SW1ABMODE, reg); + + pmic_reg_read(p, PFUZE100_SW2MODE, ®); + reg &= ~(SW_MODE_MASK); + reg |= PWM_PWM; + pmic_reg_write(p, PFUZE100_SW2MODE, reg); + + pmic_reg_read(p, PFUZE100_SW3AMODE, ®); + reg &= ~(SW_MODE_MASK); + reg |= PWM_PWM; + pmic_reg_write(p, PFUZE100_SW3AMODE, reg); + + pmic_reg_read(p, PFUZE100_SW3BMODE, ®); + reg &= ~(SW_MODE_MASK); + reg |= PWM_PWM; + pmic_reg_write(p, PFUZE100_SW3BMODE, reg); + + pmic_reg_read(p, PFUZE100_SW4MODE, ®); + reg &= ~(SW_MODE_MASK); + reg |= PWM_PWM; + pmic_reg_write(p, PFUZE100_SW4MODE, reg); }
/* configure LTC3676 PMIC */
In the default 'auto' mode regulators that are very lightly loaded can be put in PFM mode and fail to regulator properly. Switching them to always use continuous PWM mode has a neglibable affect on system power and garuntees proper regulation under lightly loaded circumstances. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
In the default 'auto' mode regulators that are very lightly loaded can be put in PFM mode and fail to regulator properly. Switching them to always use continuous PWM mode has a neglibable affect on system power and garuntees proper regulation under lightly loaded circumstances. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
In the default pulse-skipping mode regulators that are very lightly loaded can fail to regulate properly. Switching them to always use continuous mode causes only around 10mW of overall system power difference in a lightly loaded system that isn't already operating them in continuous mode.
Signed-off-by: Tim Harvey tharvey@gateworks.com --- board/gateworks/gw_ventana/common.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c index b5a0162c5e..adbc6791b3 100644 --- a/board/gateworks/gw_ventana/common.c +++ b/board/gateworks/gw_ventana/common.c @@ -1688,6 +1688,12 @@ void setup_pmic(void) /* set SW3 (VDD_ARM) */ pmic_reg_write(p, LTC3676_DVB3A, 0x1f); } + + /* put all switchers in continuous mode */ + pmic_reg_write(p, LTC3676_BUCK1, 0xc0); + pmic_reg_write(p, LTC3676_BUCK2, 0xc0); + pmic_reg_write(p, LTC3676_BUCK3, 0xc0); + pmic_reg_write(p, LTC3676_BUCK4, 0xc0); } }
In the default pulse-skipping mode regulators that are very lightly loaded can fail to regulate properly. Switching them to always use continuous mode causes only around 10mW of overall system power difference in a lightly loaded system that isn't already operating them in continuous mode. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
In the default pulse-skipping mode regulators that are very lightly loaded can fail to regulate properly. Switching them to always use continuous mode causes only around 10mW of overall system power difference in a lightly loaded system that isn't already operating them in continuous mode. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Add DP83867 PHY LED configuration.
Signed-off-by: Tim Harvey tharvey@gateworks.com --- board/gateworks/gw_ventana/gw_ventana.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 4a6b1dc461..860342dd4a 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -96,6 +96,12 @@ int board_phy_config(struct phy_device *phydev)
/* TI DP83867 */ else if (phydev->phy_id == 0x2000a231) { + /* LED configuration */ + val = 0; + val |= 0x5 << 4; /* LED1(Amber;Speed) : 1000BT link */ + val |= 0xb << 8; /* LED2(Green;Link/Act): blink for TX/RX act */ + phy_write(phydev, MDIO_DEVAD_NONE, 24, val); + /* configure register 0x170 for ref CLKOUT */ phy_write(phydev, MDIO_DEVAD_NONE, 13, 0x001f); phy_write(phydev, MDIO_DEVAD_NONE, 14, 0x0170);
Add DP83867 PHY LED configuration. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Add DP83867 PHY LED configuration. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Add displaying the detected network PHY on boot.
Signed-off-by: Tim Harvey tharvey@gateworks.com --- board/gateworks/gw_ventana/gw_ventana.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 860342dd4a..4536d553ce 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -81,6 +81,7 @@ int board_phy_config(struct phy_device *phydev)
/* Marvel 88E1510 */ if (phydev->phy_id == 0x1410dd1) { + puts("MV88E1510"); /* * Page 3, Register 16: LED[2:0] Function Control Register * LED[0] (SPD:Amber) R16_3.3:0 to 0111: on-GbE link @@ -96,6 +97,7 @@ int board_phy_config(struct phy_device *phydev)
/* TI DP83867 */ else if (phydev->phy_id == 0x2000a231) { + puts("TIDP83867 "); /* LED configuration */ val = 0; val |= 0x5 << 4; /* LED1(Amber;Speed) : 1000BT link */
Add displaying the detected network PHY on boot. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Add displaying the detected network PHY on boot. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Add LVDS support for DLC0700XDP21LF 7in 1024x600 display (equivalent to the DLC-700JMGT4 with new touch controller)
Signed-off-by: Robert Jones rjones@gateworks.com Signed-off-by: Tim Harvey tharvey@gateworks.com --- board/gateworks/gw_ventana/gw_ventana.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 4536d553ce..583f1a26ee 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -245,6 +245,27 @@ struct display_info_t const displays[] = {{ .vsync_len = 10, .sync = FB_SYNC_EXT, .vmode = FB_VMODE_NONINTERLACED +} }, { + /* DLC0700XDP21LF-C-1 */ + .bus = 0, + .addr = 0, + .detect = NULL, + .enable = enable_lvds, + .pixfmt = IPU_PIX_FMT_LVDS666, + .mode = { + .name = "DLC0700XDP21LF", + .refresh = 60, + .xres = 1024, /* 1024x600active pixels */ + .yres = 600, + .pixclock = 15385, /* 64MHz */ + .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 } }, { /* DLC800FIG-T-3 */ .bus = 2,
Add LVDS support for DLC0700XDP21LF 7in 1024x600 display (equivalent to the DLC-700JMGT4 with new touch controller) Signed-off-by: Robert Jones rjones@gateworks.com Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Add LVDS support for DLC0700XDP21LF 7in 1024x600 display (equivalent to the DLC-700JMGT4 with new touch controller) Signed-off-by: Robert Jones rjones@gateworks.com Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
print 'None' instead of just a blank line if nothing is detected: MMC: None
Signed-off-by: Tim Harvey tharvey@gateworks.com --- board/gateworks/gw_ventana/common.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c index adbc6791b3..c07eb627a2 100644 --- a/board/gateworks/gw_ventana/common.c +++ b/board/gateworks/gw_ventana/common.c @@ -1758,6 +1758,7 @@ int board_mmc_init(struct bd_info *bis) return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); default: /* doesn't have MMC */ + printf("None"); return -1; } }
print 'None' instead of just a blank line if nothing is detected: MMC: None Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
print 'None' instead of just a blank line if nothing is detected: MMC: None Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
For some time now having USB_KEYBOARD support has caused usb to be initialized on boot. To allow for a quicker bootup we don't want this for Ventana and don't really need USB keyboard support so remove it. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
For some time now having USB_KEYBOARD support has caused usb to be initialized on boot. To allow for a quicker bootup we don't want this for Ventana and don't really need USB keyboard support so remove it. Signed-off-by: Tim Harvey tharvey@gateworks.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
participants (2)
-
sbabic＠denx.de -
Tim Harvey