* [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support
@ 2014-09-16 15:51 Stefan Herbrechtsmeier
2014-09-16 15:51 ` [U-Boot] [PATCH 1/5] omap3: overo: Fix fdtfile test Stefan Herbrechtsmeier
` (6 more replies)
0 siblings, 7 replies; 14+ messages in thread
From: Stefan Herbrechtsmeier @ 2014-09-16 15:51 UTC (permalink / raw)
To: u-boot
At the moment the boot loader use a common configuration for all Gumstix
Overo expansion boards. This also includes configuration of all inputs
and outputs even if they aren't used by the boot loader. Because the
Overo module could be used on foreign expansion boards with different
configurations this could lead to problems. Split the configuration into
a Overo module and expansion board part. The expansion board
configuration is skipped if a foreign expansion board is detected. This
enables a foreign expansion board to use the common boot loader without
any modifications. It could load a specific device tree by saving the
expansion name in the EEPROM.
Additionally fix some errors in the environment configuration and add
USB host support.
The series is only tested on a foreign expansion boards. It would be nice
if somebody could test it on an expansion board with network support.
Stefan Herbrechtsmeier (5):
omap3: overo: Fix fdtfile test
omap3: overo: Call bootm only after successful nand read
omap3: overo: Move ethernet setup to board_eth_init function
omap3: overo: Separate module and expansion board MUX configuration
omap3: overo: Add usb host support
board/overo/overo.c | 137 ++++++++++++++++++++++++++++----------
board/overo/overo.h | 150 ++++++++++++++++++++++--------------------
include/configs/omap3_overo.h | 15 ++++-
3 files changed, 195 insertions(+), 107 deletions(-)
--
2.1.0
^ permalink raw reply [flat|nested] 14+ messages in thread* [U-Boot] [PATCH 1/5] omap3: overo: Fix fdtfile test 2014-09-16 15:51 [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier @ 2014-09-16 15:51 ` Stefan Herbrechtsmeier 2014-10-10 14:39 ` [U-Boot] [U-Boot,1/5] " Tom Rini 2014-09-16 15:51 ` [U-Boot] [PATCH 2/5] omap3: overo: Call bootm only after successful nand read Stefan Herbrechtsmeier ` (5 subsequent siblings) 6 siblings, 1 reply; 14+ messages in thread From: Stefan Herbrechtsmeier @ 2014-09-16 15:51 UTC (permalink / raw) To: u-boot Commit 12cc54376768461533b55ada1b0b6d4979f40579 'omap3: overo: Select fdtfile for expansion board' wrongly missed the operator in the fdtfile test. Update the test to only overwrite an empty fdtfile environment variable. Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> --- include/configs/omap3_overo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index e66f306..b17e495 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -151,7 +151,7 @@ "run mmcboot;" \ "fi;" \ "if run loadzimage; then " \ - "if test $fdtfile; then " \ + "if test -z \"${fdtfile}\"; then " \ "setenv fdtfile omap3-${boardname}-${expansionname}.dtb;" \ "fi;" \ "if run loadfdt; then " \ -- 2.1.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [U-Boot,1/5] omap3: overo: Fix fdtfile test 2014-09-16 15:51 ` [U-Boot] [PATCH 1/5] omap3: overo: Fix fdtfile test Stefan Herbrechtsmeier @ 2014-10-10 14:39 ` Tom Rini 0 siblings, 0 replies; 14+ messages in thread From: Tom Rini @ 2014-10-10 14:39 UTC (permalink / raw) To: u-boot On Tue, Sep 16, 2014 at 05:51:05PM +0200, Stefan Herbrechtsmeier wrote: > Commit 12cc54376768461533b55ada1b0b6d4979f40579 'omap3: overo: Select > fdtfile for expansion board' wrongly missed the operator in the fdtfile > test. Update the test to only overwrite an empty fdtfile environment > variable. > > Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141010/e0503efc/attachment.pgp> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 2/5] omap3: overo: Call bootm only after successful nand read 2014-09-16 15:51 [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier 2014-09-16 15:51 ` [U-Boot] [PATCH 1/5] omap3: overo: Fix fdtfile test Stefan Herbrechtsmeier @ 2014-09-16 15:51 ` Stefan Herbrechtsmeier 2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini 2014-09-16 15:51 ` [U-Boot] [PATCH 3/5] omap3: overo: Move ethernet setup to board_eth_init function Stefan Herbrechtsmeier ` (4 subsequent siblings) 6 siblings, 1 reply; 14+ messages in thread From: Stefan Herbrechtsmeier @ 2014-09-16 15:51 UTC (permalink / raw) To: u-boot Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> --- include/configs/omap3_overo.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index b17e495..d042eea 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -131,8 +131,9 @@ "bootz ${loadaddr} - ${fdtaddr}\0" \ "nandboot=echo Booting from nand ...; " \ "run nandargs; " \ - "nand read ${loadaddr} linux; " \ - "bootm ${loadaddr}\0" \ + "if nand read ${loadaddr} linux; then " \ + "bootm ${loadaddr};" \ + "fi;\0" \ #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ -- 2.1.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [U-Boot, 2/5] omap3: overo: Call bootm only after successful nand read 2014-09-16 15:51 ` [U-Boot] [PATCH 2/5] omap3: overo: Call bootm only after successful nand read Stefan Herbrechtsmeier @ 2014-10-23 17:16 ` Tom Rini 0 siblings, 0 replies; 14+ messages in thread From: Tom Rini @ 2014-10-23 17:16 UTC (permalink / raw) To: u-boot On Tue, Sep 16, 2014 at 05:51:06PM +0200, Stefan Herbrechtsmeier wrote: > Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> Applied to u-boot-ti/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141023/42ec153e/attachment.pgp> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 3/5] omap3: overo: Move ethernet setup to board_eth_init function 2014-09-16 15:51 [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier 2014-09-16 15:51 ` [U-Boot] [PATCH 1/5] omap3: overo: Fix fdtfile test Stefan Herbrechtsmeier 2014-09-16 15:51 ` [U-Boot] [PATCH 2/5] omap3: overo: Call bootm only after successful nand read Stefan Herbrechtsmeier @ 2014-09-16 15:51 ` Stefan Herbrechtsmeier 2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini 2014-09-16 15:51 ` [U-Boot] [PATCH 4/5] omap3: overo: Separate module and expansion board MUX configuration Stefan Herbrechtsmeier ` (3 subsequent siblings) 6 siblings, 1 reply; 14+ messages in thread From: Stefan Herbrechtsmeier @ 2014-09-16 15:51 UTC (permalink / raw) To: u-boot Move ethernet setup to the board_eth_init function and select the available network devices via expansion id. Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> --- board/overo/overo.c | 76 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/board/overo/overo.c b/board/overo/overo.c index 13220c5..caffb50 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -58,21 +58,6 @@ static struct { char env_setting[64]; } expansion_config; -#if defined(CONFIG_CMD_NET) -static void setup_net_chip(void); -#endif - -/* GPMC definitions for LAN9221 chips on Tobi expansion boards */ -static const u32 gpmc_lan_config[] = { - NET_LAN9221_GPMC_CONFIG1, - NET_LAN9221_GPMC_CONFIG2, - NET_LAN9221_GPMC_CONFIG3, - NET_LAN9221_GPMC_CONFIG4, - NET_LAN9221_GPMC_CONFIG5, - NET_LAN9221_GPMC_CONFIG6, - /*CONFIG7- computed as params */ -}; - /* * Routine: board_init * Description: Early hardware init. @@ -241,10 +226,6 @@ int misc_init_r(void) twl4030_power_init(); twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); -#if defined(CONFIG_CMD_NET) - setup_net_chip(); -#endif - printf("Board revision: %d\n", get_board_revision()); switch (get_sdio2_config()) { @@ -280,9 +261,6 @@ int misc_init_r(void) printf("Recognized Tobi Duo expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); - /* second lan chip */ - enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[4], - 0x2B000000, GPMC_SIZE_16M); break; case GUMSTIX_PALO35: printf("Recognized Palo35 expansion board (rev %d %s)\n", @@ -388,7 +366,18 @@ void set_muxconf_regs(void) MUX_OVERO(); } -#if defined(CONFIG_CMD_NET) +#if defined(CONFIG_CMD_NET) && !defined(CONFIG_SPL_BUILD) +/* GPMC definitions for LAN9221 chips on Tobi expansion boards */ +static const u32 gpmc_lan_config[] = { + NET_LAN9221_GPMC_CONFIG1, + NET_LAN9221_GPMC_CONFIG2, + NET_LAN9221_GPMC_CONFIG3, + NET_LAN9221_GPMC_CONFIG4, + NET_LAN9221_GPMC_CONFIG5, + NET_LAN9221_GPMC_CONFIG6, + /*CONFIG7- computed as params */ +}; + /* * Routine: setup_net_chip * Description: Setting up the configuration GPMC registers specific to the @@ -398,10 +387,6 @@ static void setup_net_chip(void) { struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE; - /* first lan chip */ - enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[5], 0x2C000000, - GPMC_SIZE_16M); - /* Enable off mode for NWE in PADCONF_GPMC_NWE register */ writew(readw(&ctrl_base ->gpmc_nwe) | 0x0E00, &ctrl_base->gpmc_nwe); /* Enable off mode for NOE in PADCONF_GPMC_NADV_ALE register */ @@ -409,7 +394,14 @@ static void setup_net_chip(void) /* Enable off mode for ALE in PADCONF_GPMC_NADV_ALE register */ writew(readw(&ctrl_base->gpmc_nadv_ale) | 0x0E00, &ctrl_base->gpmc_nadv_ale); +} +/* + * Routine: reset_net_chip + * Description: Reset the Ethernet hardware. + */ +static void reset_net_chip(void) +{ /* Make GPIO 64 as output pin and send a magic pulse through it */ if (!gpio_request(64, "")) { gpio_direction_output(64, 0); @@ -420,16 +412,42 @@ static void setup_net_chip(void) gpio_set_value(64, 1); } } -#endif int board_eth_init(bd_t *bis) { + unsigned int expansion_id; int rc = 0; + #ifdef CONFIG_SMC911X - rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); + expansion_id = get_expansion_id(); + switch (expansion_id) { + case GUMSTIX_TOBI_DUO: + /* second lan chip */ + enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[4], + 0x2B000000, GPMC_SIZE_16M); + /* no break */ + case GUMSTIX_TOBI: + case GUMSTIX_CHESTNUT43: + case GUMSTIX_STAGECOACH: + case GUMSTIX_NO_EEPROM: + case GUMSTIX_EMPTY_EEPROM: + /* first lan chip */ + enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[5], + 0x2C000000, GPMC_SIZE_16M); + + setup_net_chip(); + reset_net_chip(); + + rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); + break; + default: + break; + } #endif + return rc; } +#endif #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) int board_mmc_init(bd_t *bis) -- 2.1.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [U-Boot, 3/5] omap3: overo: Move ethernet setup to board_eth_init function 2014-09-16 15:51 ` [U-Boot] [PATCH 3/5] omap3: overo: Move ethernet setup to board_eth_init function Stefan Herbrechtsmeier @ 2014-10-23 17:16 ` Tom Rini 0 siblings, 0 replies; 14+ messages in thread From: Tom Rini @ 2014-10-23 17:16 UTC (permalink / raw) To: u-boot On Tue, Sep 16, 2014 at 05:51:07PM +0200, Stefan Herbrechtsmeier wrote: > Move ethernet setup to the board_eth_init function and select > the available network devices via expansion id. > > Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> Applied to u-boot-ti/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141023/4cbf1ae7/attachment.pgp> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 4/5] omap3: overo: Separate module and expansion board MUX configuration 2014-09-16 15:51 [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier ` (2 preceding siblings ...) 2014-09-16 15:51 ` [U-Boot] [PATCH 3/5] omap3: overo: Move ethernet setup to board_eth_init function Stefan Herbrechtsmeier @ 2014-09-16 15:51 ` Stefan Herbrechtsmeier 2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini 2014-09-16 15:51 ` [U-Boot] [PATCH 5/5] omap3: overo: Add usb host support Stefan Herbrechtsmeier ` (2 subsequent siblings) 6 siblings, 1 reply; 14+ messages in thread From: Stefan Herbrechtsmeier @ 2014-09-16 15:51 UTC (permalink / raw) To: u-boot Separate overo module and expansion board MUX configuration. This allows an foreign expansion board to use the boot loader without any adaption. It only needs to save the expansion name in the EEPROM to load a specific device tree. Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> --- board/overo/overo.c | 27 ++++++++-- board/overo/overo.h | 150 +++++++++++++++++++++++++++------------------------- 2 files changed, 102 insertions(+), 75 deletions(-) diff --git a/board/overo/overo.c b/board/overo/overo.c index caffb50..488246b 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -31,6 +31,8 @@ DECLARE_GLOBAL_DATA_PTR; #define EXPANSION_EEPROM_I2C_BUS 2 #define EXPANSION_EEPROM_I2C_ADDRESS 0x51 +#define GUMSTIX_EMPTY_EEPROM 0x0 + #define GUMSTIX_SUMMIT 0x01000200 #define GUMSTIX_TOBI 0x02000200 #define GUMSTIX_TOBI_DUO 0x03000200 @@ -56,7 +58,7 @@ static struct { char fab_revision[8]; char env_var[16]; char env_setting[64]; -} expansion_config; +} expansion_config = {0x0}; /* * Routine: board_init @@ -198,6 +200,9 @@ int get_sdio2_config(void) */ unsigned int get_expansion_id(void) { + if (expansion_config.device_vendor != 0x0) + return expansion_config.device_vendor; + i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS); /* return GUMSTIX_NO_EEPROM if eeprom doesn't respond */ @@ -247,6 +252,7 @@ int misc_init_r(void) printf("Recognized Summit expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); setenv("defaultdisplay", "dvi"); setenv("expansionname", "summit"); break; @@ -254,6 +260,7 @@ int misc_init_r(void) printf("Recognized Tobi expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); setenv("defaultdisplay", "dvi"); setenv("expansionname", "tobi"); break; @@ -261,17 +268,20 @@ int misc_init_r(void) printf("Recognized Tobi Duo expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); break; case GUMSTIX_PALO35: printf("Recognized Palo35 expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); setenv("defaultdisplay", "lcd35"); break; case GUMSTIX_PALO43: printf("Recognized Palo43 expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); setenv("defaultdisplay", "lcd43"); setenv("expansionname", "palo43"); break; @@ -279,6 +289,7 @@ int misc_init_r(void) printf("Recognized Chestnut43 expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); setenv("defaultdisplay", "lcd43"); setenv("expansionname", "chestnut43"); break; @@ -286,11 +297,13 @@ int misc_init_r(void) printf("Recognized Pinto expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); break; case GUMSTIX_GALLOP43: printf("Recognized Gallop43 expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); setenv("defaultdisplay", "lcd43"); setenv("expansionname", "gallop43"); break; @@ -298,6 +311,7 @@ int misc_init_r(void) printf("Recognized Alto35 expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); MUX_ALTO35(); setenv("defaultdisplay", "lcd35"); setenv("expansionname", "alto35"); @@ -306,21 +320,25 @@ int misc_init_r(void) printf("Recognized Stagecoach expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); break; case GUMSTIX_THUMBO: printf("Recognized Thumbo expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); break; case GUMSTIX_TURTLECORE: printf("Recognized Turtlecore expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); break; case GUMSTIX_ARBOR43C: printf("Recognized Arbor43C expansion board (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); MUX_ARBOR43C(); setenv("defaultdisplay", "lcd43"); break; @@ -328,16 +346,17 @@ int misc_init_r(void) printf("Recognized Ettus Research USRP-E (rev %d %s)\n", expansion_config.revision, expansion_config.fab_revision); + MUX_GUMSTIX(); MUX_USRP_E(); setenv("defaultdisplay", "dvi"); break; case GUMSTIX_NO_EEPROM: - puts("No EEPROM on expansion board\n"); + case GUMSTIX_EMPTY_EEPROM: + puts("No or empty EEPROM on expansion board\n"); + MUX_GUMSTIX(); setenv("expansionname", "tobi"); break; default: - if (expansion_id == 0x0) - setenv("expansionname", "tobi"); printf("Unrecognized expansion board 0x%08x\n", expansion_id); break; } diff --git a/board/overo/overo.h b/board/overo/overo.h index 57725d8..d0edf86 100644 --- a/board/overo/overo.h +++ b/board/overo/overo.h @@ -101,13 +101,9 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(GPMC_D14), (IEN | PTU | EN | M0)) /*GPMC_D14*/\ MUX_VAL(CP(GPMC_D15), (IEN | PTU | EN | M0)) /*GPMC_D15*/\ MUX_VAL(CP(GPMC_NCS0), (IDIS | PTU | EN | M0)) /*GPMC_nCS0*/\ - MUX_VAL(CP(GPMC_NCS1), (IDIS | PTU | EN | M0)) /*GPMC_nCS1*/\ MUX_VAL(CP(GPMC_NCS2), (IDIS | PTU | EN | M0)) /*GPMC_nCS2*/\ MUX_VAL(CP(GPMC_NCS3), (IEN | PTU | EN | M4)) /*GPIO_54*/\ /* - MMC1_WP*/\ - MUX_VAL(CP(GPMC_NCS4), (IDIS | PTU | EN | M0)) /*GPMC_nCS4*/\ - MUX_VAL(CP(GPMC_NCS5), (IDIS | PTU | EN | M0)) /*GPMC_nCS5*/\ - MUX_VAL(CP(GPMC_NCS6), (IEN | PTD | DIS | M0)) /*GPMC_nCS6*/\ MUX_VAL(CP(GPMC_NCS7), (IEN | PTU | EN | M0)) /*GPMC_nCS7*/\ MUX_VAL(CP(GPMC_NBE1), (IEN | PTD | DIS | M0)) /*GPMC_nCS3*/\ MUX_VAL(CP(GPMC_CLK), (IEN | PTU | EN | M0)) /*GPMC_CLK*/\ @@ -117,45 +113,11 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(GPMC_NBE0_CLE), (IDIS | PTD | DIS | M0)) /*GPMC_nBE0_CLE*/\ MUX_VAL(CP(GPMC_NWP), (IEN | PTD | DIS | M0)) /*GPMC_nWP*/\ MUX_VAL(CP(GPMC_WAIT0), (IEN | PTU | EN | M0)) /*GPMC_WAIT0*/\ - MUX_VAL(CP(GPMC_WAIT1), (IEN | PTU | EN | M0)) /*GPMC_WAIT1*/\ - MUX_VAL(CP(GPMC_WAIT2), (IEN | PTU | EN | M4)) /*GPIO_64*/\ - /* - SMSC911X_NRES*/\ - MUX_VAL(CP(GPMC_WAIT3), (IEN | PTU | DIS | M4)) /*GPIO_65*/\ - /*DSS*/\ - MUX_VAL(CP(DSS_PCLK), (IDIS | PTD | DIS | M0)) /*DSS_PCLK*/\ - MUX_VAL(CP(DSS_HSYNC), (IDIS | PTD | DIS | M0)) /*DSS_HSYNC*/\ - MUX_VAL(CP(DSS_VSYNC), (IDIS | PTD | DIS | M0)) /*DSS_VSYNC*/\ - MUX_VAL(CP(DSS_ACBIAS), (IDIS | PTD | DIS | M0)) /*DSS_ACBIAS*/\ - MUX_VAL(CP(DSS_DATA0), (IDIS | PTD | DIS | M0)) /*DSS_DATA0*/\ - MUX_VAL(CP(DSS_DATA1), (IDIS | PTD | DIS | M0)) /*DSS_DATA1*/\ - MUX_VAL(CP(DSS_DATA2), (IDIS | PTD | DIS | M0)) /*DSS_DATA2*/\ - MUX_VAL(CP(DSS_DATA3), (IDIS | PTD | DIS | M0)) /*DSS_DATA3*/\ - MUX_VAL(CP(DSS_DATA4), (IDIS | PTD | DIS | M0)) /*DSS_DATA4*/\ - MUX_VAL(CP(DSS_DATA5), (IDIS | PTD | DIS | M0)) /*DSS_DATA5*/\ - MUX_VAL(CP(DSS_DATA6), (IDIS | PTD | DIS | M0)) /*DSS_DATA6*/\ - MUX_VAL(CP(DSS_DATA7), (IDIS | PTD | DIS | M0)) /*DSS_DATA7*/\ - MUX_VAL(CP(DSS_DATA8), (IDIS | PTD | DIS | M0)) /*DSS_DATA8*/\ - MUX_VAL(CP(DSS_DATA9), (IDIS | PTD | DIS | M0)) /*DSS_DATA9*/\ - MUX_VAL(CP(DSS_DATA10), (IDIS | PTD | DIS | M0)) /*DSS_DATA10*/\ - MUX_VAL(CP(DSS_DATA11), (IDIS | PTD | DIS | M0)) /*DSS_DATA11*/\ - MUX_VAL(CP(DSS_DATA12), (IDIS | PTD | DIS | M0)) /*DSS_DATA12*/\ - MUX_VAL(CP(DSS_DATA13), (IDIS | PTD | DIS | M0)) /*DSS_DATA13*/\ - MUX_VAL(CP(DSS_DATA14), (IDIS | PTD | DIS | M0)) /*DSS_DATA14*/\ - MUX_VAL(CP(DSS_DATA15), (IDIS | PTD | DIS | M0)) /*DSS_DATA15*/\ - MUX_VAL(CP(DSS_DATA16), (IDIS | PTD | DIS | M0)) /*DSS_DATA16*/\ - MUX_VAL(CP(DSS_DATA17), (IDIS | PTD | DIS | M0)) /*DSS_DATA17*/\ - MUX_VAL(CP(DSS_DATA18), (IDIS | PTD | DIS | M0)) /*DSS_DATA18*/\ - MUX_VAL(CP(DSS_DATA19), (IDIS | PTD | DIS | M0)) /*DSS_DATA19*/\ - MUX_VAL(CP(DSS_DATA20), (IDIS | PTD | DIS | M0)) /*DSS_DATA20*/\ - MUX_VAL(CP(DSS_DATA21), (IDIS | PTD | DIS | M0)) /*DSS_DATA21*/\ - MUX_VAL(CP(DSS_DATA22), (IDIS | PTD | DIS | M0)) /*DSS_DATA22*/\ - MUX_VAL(CP(DSS_DATA23), (IDIS | PTD | DIS | M0)) /*DSS_DATA23*/\ /*CAMERA*/\ MUX_VAL(CP(CAM_HS), (IEN | PTU | DIS | M0)) /*CAM_HS */\ MUX_VAL(CP(CAM_VS), (IEN | PTU | DIS | M0)) /*CAM_VS */\ MUX_VAL(CP(CAM_XCLKA), (IDIS | PTD | DIS | M0)) /*CAM_XCLKA*/\ MUX_VAL(CP(CAM_PCLK), (IEN | PTU | DIS | M0)) /*CAM_PCLK*/\ - MUX_VAL(CP(CAM_FLD), (IDIS | PTD | DIS | M4)) /*CAM_FLD*/\ MUX_VAL(CP(CAM_D0), (IEN | PTD | DIS | M0)) /*CAM_D0*/\ MUX_VAL(CP(CAM_D1), (IEN | PTD | DIS | M0)) /*CAM_D1*/\ MUX_VAL(CP(CAM_D2), (IEN | PTD | DIS | M0)) /*CAM_D2*/\ @@ -168,13 +130,8 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(CAM_D9), (IEN | PTD | DIS | M0)) /*CAM_D9*/\ MUX_VAL(CP(CAM_D10), (IEN | PTD | DIS | M0)) /*CAM_D10*/\ MUX_VAL(CP(CAM_D11), (IEN | PTD | DIS | M0)) /*CAM_D11*/\ - MUX_VAL(CP(CAM_XCLKB), (IDIS | PTD | DIS | M0)) /*CAM_XCLKB*/\ - MUX_VAL(CP(CAM_WEN), (IEN | PTD | DIS | M0)) /*CAM_WEN*/\ - MUX_VAL(CP(CAM_STROBE), (IDIS | PTD | DIS | M0)) /*CAM_STROBE*/\ MUX_VAL(CP(CSI2_DX0), (IEN | PTD | EN | M4)) /*GPIO_112*/\ MUX_VAL(CP(CSI2_DY0), (IEN | PTD | EN | M4)) /*GPIO_113*/\ - MUX_VAL(CP(CSI2_DX1), (IEN | PTD | EN | M4)) /*GPIO_114*/\ - /* - PEN_DOWN*/\ MUX_VAL(CP(CSI2_DY1), (IEN | PTD | EN | M4)) /*GPIO_115*/\ /*Audio Interface */\ MUX_VAL(CP(MCBSP2_FSX), (IEN | PTD | DIS | M0)) /*McBSP2_FSX*/\ @@ -208,14 +165,7 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(MCBSP3_DR), (IDIS | PTD | DIS | M1)) /*UART2_RTS*/\ MUX_VAL(CP(MCBSP3_CLKX), (IDIS | PTD | DIS | M1)) /*UART2_TX*/\ MUX_VAL(CP(MCBSP3_FSX), (IEN | PTD | DIS | M1)) /*UART2_RX*/\ - MUX_VAL(CP(UART2_CTS), (IEN | PTD | DIS | M4)) /*GPIO_144 - LCD_EN*/\ - MUX_VAL(CP(UART2_RTS), (IEN | PTD | DIS | M4)) /*GPIO_145*/\ - MUX_VAL(CP(UART2_TX), (IEN | PTD | DIS | M4)) /*GPIO_146*/\ - MUX_VAL(CP(UART2_RX), (IEN | PTD | DIS | M4)) /*GPIO_147*/\ - MUX_VAL(CP(UART1_TX), (IDIS | PTD | DIS | M0)) /*UART1_TX*/\ MUX_VAL(CP(UART1_RTS), (IEN | PTU | DIS | M4)) /*GPIO_149*/ \ - MUX_VAL(CP(UART1_CTS), (IEN | PTU | DIS | M4)) /*GPIO_150-MMC3_WP*/\ - MUX_VAL(CP(UART1_RX), (IEN | PTD | DIS | M0)) /*UART1_RX*/\ MUX_VAL(CP(MCBSP4_CLKX), (IEN | PTD | DIS | M0)) /*McBSP4_CLKX*/\ MUX_VAL(CP(MCBSP4_DR), (IEN | PTD | DIS | M0)) /*McBSP4_DR*/\ MUX_VAL(CP(MCBSP4_DX), (IEN | PTD | DIS | M0)) /*McBSP4_DX*/\ @@ -228,7 +178,6 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(MCBSP1_FSX), (IEN | PTD | DIS | M0)) /*McBSP1_FSX*/\ MUX_VAL(CP(MCBSP1_CLKX), (IEN | PTD | DIS | M0)) /*McBSP1_CLKX*/\ /*Serial Interface*/\ - MUX_VAL(CP(UART3_CTS_RCTX), (IEN | PTD | EN | M0)) /*UART3_CTS_RCTX*/\ MUX_VAL(CP(UART3_RTS_SD), (IEN | PTU | EN | M4)) /*GPIO_164 W2W_*/\ /* BT_NRESET*/\ MUX_VAL(CP(UART3_RX_IRRX), (IEN | PTU | EN | M0)) /*UART3_RX_IRRX*/\ @@ -255,14 +204,6 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(I2C3_SDA), (IEN | PTU | EN | M0)) /*I2C3_SDA*/\ MUX_VAL(CP(I2C4_SCL), (IEN | PTU | EN | M0)) /*I2C4_SCL*/\ MUX_VAL(CP(I2C4_SDA), (IEN | PTU | EN | M0)) /*I2C4_SDA*/\ - MUX_VAL(CP(HDQ_SIO), (IDIS | PTU | EN | M4)) /*HDQ_SIO*/\ - MUX_VAL(CP(MCSPI1_CLK), (IEN | PTD | DIS | M0)) /*McSPI1_CLK*/\ - MUX_VAL(CP(MCSPI1_SIMO), (IEN | PTD | DIS | M0)) /*McSPI1_SIMO */\ - MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTD | DIS | M0)) /*McSPI1_SOMI */\ - MUX_VAL(CP(MCSPI1_CS0), (IEN | PTD | EN | M0)) /*McSPI1_CS0*/\ - MUX_VAL(CP(MCSPI1_CS1), (IDIS | PTD | EN | M0)) /*McSPI1_CS1*/\ - MUX_VAL(CP(MCSPI1_CS2), (IEN | PTU | DIS | M4)) /*GPIO_176 */\ - /* - LAN_INTR */\ MUX_VAL(CP(MCSPI1_CS3), (IEN | PTD | DIS | M3)) /*HSUSB2_DATA2*/\ MUX_VAL(CP(MCSPI2_CLK), (IEN | PTD | DIS | M3)) /*HSUSB2_DATA7*/\ MUX_VAL(CP(MCSPI2_SIMO), (IEN | PTD | DIS | M3)) /*HSUSB2_DATA4*/\ @@ -281,21 +222,9 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(SYS_BOOT5), (IEN | PTD | DIS | M4)) /*GPIO_7*/\ MUX_VAL(CP(SYS_BOOT6), (IDIS | PTD | DIS | M4)) /*GPIO_8*/\ MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0)) /*SYS_OFF_MODE*/\ - MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTU | EN | M4)) /*GPIO_10*/\ - MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M4)) /*GPIO_186*/\ - MUX_VAL(CP(ETK_CLK_ES2), (IEN | PTU | EN | M2)) /*MMC3_CLK*/\ - MUX_VAL(CP(ETK_CTL_ES2), (IEN | PTU | EN | M2)) /*MMC3_CMD*/\ - MUX_VAL(CP(ETK_D0_ES2), (IEN | PTU | EN | M4)) /*GPIO_14*/\ MUX_VAL(CP(ETK_D1_ES2), (IEN | PTD | EN | M4)) /*GPIO_15 - X_GATE*/\ MUX_VAL(CP(ETK_D2_ES2), (IEN | PTU | EN | M4)) /*GPIO_16*/\ /* - W2W_NRESET*/\ - MUX_VAL(CP(ETK_D3_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT3*/\ - MUX_VAL(CP(ETK_D4_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT0*/\ - MUX_VAL(CP(ETK_D5_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT1*/\ - MUX_VAL(CP(ETK_D6_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT2*/\ - MUX_VAL(CP(ETK_D7_ES2), (IEN | PTU | EN | M4)) /*GPIO_21*/\ - MUX_VAL(CP(ETK_D8_ES2), (IEN | PTU | EN | M4)) /*GPIO_22*/\ - MUX_VAL(CP(ETK_D9_ES2), (IEN | PTU | EN | M4)) /*GPIO_23*/\ MUX_VAL(CP(ETK_D10_ES2), (IDIS | PTD | DIS | M3)) /*HSUSB2_CLK*/\ MUX_VAL(CP(ETK_D11_ES2), (IDIS | PTD | DIS | M3)) /*HSUSB2_STP*/\ MUX_VAL(CP(ETK_D12_ES2), (IEN | PTD | DIS | M3)) /*HSUSB2_DIR*/\ @@ -369,6 +298,85 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0)) /*sdrc_cke0*/\ MUX_VAL(CP(SDRC_CKE1), (IDIS | PTU | EN | M0)) /*sdrc_cke1*/ +#define MUX_GUMSTIX() \ + /*GPMC*/\ + MUX_VAL(CP(GPMC_NCS1), (IDIS | PTU | EN | M0)) /*GPMC_nCS1*/\ + MUX_VAL(CP(GPMC_NCS4), (IDIS | PTU | EN | M0)) /*GPMC_nCS4*/\ + MUX_VAL(CP(GPMC_NCS5), (IDIS | PTU | EN | M0)) /*GPMC_nCS5*/\ + MUX_VAL(CP(GPMC_NCS6), (IEN | PTD | DIS | M0)) /*GPMC_nCS6*/\ + MUX_VAL(CP(GPMC_WAIT1), (IEN | PTU | EN | M4)) /*GPIO_63*/\ + /* - CAM_IRQ*/\ + MUX_VAL(CP(GPMC_WAIT2), (IEN | PTU | EN | M4)) /*GPIO_64*/\ + /* - SMSC911X_NRES*/\ + MUX_VAL(CP(GPMC_WAIT3), (IEN | PTU | DIS | M4)) /*GPIO_65*/\ + /*DSS*/\ + MUX_VAL(CP(DSS_PCLK), (IDIS | PTD | DIS | M0)) /*DSS_PCLK*/\ + MUX_VAL(CP(DSS_HSYNC), (IDIS | PTD | DIS | M0)) /*DSS_HSYNC*/\ + MUX_VAL(CP(DSS_VSYNC), (IDIS | PTD | DIS | M0)) /*DSS_VSYNC*/\ + MUX_VAL(CP(DSS_ACBIAS), (IDIS | PTD | DIS | M0)) /*DSS_ACBIAS*/\ + MUX_VAL(CP(DSS_DATA0), (IDIS | PTD | DIS | M0)) /*DSS_DATA0*/\ + MUX_VAL(CP(DSS_DATA1), (IDIS | PTD | DIS | M0)) /*DSS_DATA1*/\ + MUX_VAL(CP(DSS_DATA2), (IDIS | PTD | DIS | M0)) /*DSS_DATA2*/\ + MUX_VAL(CP(DSS_DATA3), (IDIS | PTD | DIS | M0)) /*DSS_DATA3*/\ + MUX_VAL(CP(DSS_DATA4), (IDIS | PTD | DIS | M0)) /*DSS_DATA4*/\ + MUX_VAL(CP(DSS_DATA5), (IDIS | PTD | DIS | M0)) /*DSS_DATA5*/\ + MUX_VAL(CP(DSS_DATA6), (IDIS | PTD | DIS | M0)) /*DSS_DATA6*/\ + MUX_VAL(CP(DSS_DATA7), (IDIS | PTD | DIS | M0)) /*DSS_DATA7*/\ + MUX_VAL(CP(DSS_DATA8), (IDIS | PTD | DIS | M0)) /*DSS_DATA8*/\ + MUX_VAL(CP(DSS_DATA9), (IDIS | PTD | DIS | M0)) /*DSS_DATA9*/\ + MUX_VAL(CP(DSS_DATA10), (IDIS | PTD | DIS | M0)) /*DSS_DATA10*/\ + MUX_VAL(CP(DSS_DATA11), (IDIS | PTD | DIS | M0)) /*DSS_DATA11*/\ + MUX_VAL(CP(DSS_DATA12), (IDIS | PTD | DIS | M0)) /*DSS_DATA12*/\ + MUX_VAL(CP(DSS_DATA13), (IDIS | PTD | DIS | M0)) /*DSS_DATA13*/\ + MUX_VAL(CP(DSS_DATA14), (IDIS | PTD | DIS | M0)) /*DSS_DATA14*/\ + MUX_VAL(CP(DSS_DATA15), (IDIS | PTD | DIS | M0)) /*DSS_DATA15*/\ + MUX_VAL(CP(DSS_DATA16), (IDIS | PTD | DIS | M0)) /*DSS_DATA16*/\ + MUX_VAL(CP(DSS_DATA17), (IDIS | PTD | DIS | M0)) /*DSS_DATA17*/\ + MUX_VAL(CP(DSS_DATA18), (IDIS | PTD | DIS | M0)) /*DSS_DATA18*/\ + MUX_VAL(CP(DSS_DATA19), (IDIS | PTD | DIS | M0)) /*DSS_DATA19*/\ + MUX_VAL(CP(DSS_DATA20), (IDIS | PTD | DIS | M0)) /*DSS_DATA20*/\ + MUX_VAL(CP(DSS_DATA21), (IDIS | PTD | DIS | M0)) /*DSS_DATA21*/\ + MUX_VAL(CP(DSS_DATA22), (IDIS | PTD | DIS | M0)) /*DSS_DATA22*/\ + MUX_VAL(CP(DSS_DATA23), (IDIS | PTD | DIS | M0)) /*DSS_DATA23*/\ + /*CAMERA*/\ + MUX_VAL(CP(CAM_FLD), (IDIS | PTD | DIS | M4)) /*CAM_FLD*/\ + MUX_VAL(CP(CAM_XCLKB), (IDIS | PTD | DIS | M0)) /*CAM_XCLKB*/\ + MUX_VAL(CP(CAM_WEN), (IEN | PTD | DIS | M0)) /*CAM_WEN*/\ + MUX_VAL(CP(CAM_STROBE), (IDIS | PTD | DIS | M0)) /*CAM_STROBE*/\ + MUX_VAL(CP(CSI2_DX1), (IEN | PTD | EN | M4)) /*GPIO_114*/\ + /* - PEN_DOWN*/\ + /*Bluetooth*/\ + MUX_VAL(CP(UART2_CTS), (IEN | PTD | DIS | M4)) /*GPIO_144 - LCD_EN*/\ + MUX_VAL(CP(UART2_RTS), (IEN | PTD | DIS | M4)) /*GPIO_145*/\ + MUX_VAL(CP(UART2_TX), (IEN | PTD | DIS | M4)) /*GPIO_146*/\ + MUX_VAL(CP(UART2_RX), (IEN | PTD | DIS | M4)) /*GPIO_147*/\ + MUX_VAL(CP(UART1_TX), (IDIS | PTD | DIS | M0)) /*UART1_TX*/\ + MUX_VAL(CP(UART1_CTS), (IEN | PTU | DIS | M4)) /*GPIO_150-MMC3_WP*/\ + MUX_VAL(CP(UART1_RX), (IEN | PTD | DIS | M0)) /*UART1_RX*/\ + /*Serial Interface*/\ + MUX_VAL(CP(UART3_CTS_RCTX), (IEN | PTD | EN | M0)) /*UART3_CTS_RCTX*/\ + MUX_VAL(CP(HDQ_SIO), (IDIS | PTU | EN | M4)) /*HDQ_SIO*/\ + MUX_VAL(CP(MCSPI1_CLK), (IEN | PTD | DIS | M0)) /*McSPI1_CLK*/\ + MUX_VAL(CP(MCSPI1_SIMO), (IEN | PTD | DIS | M0)) /*McSPI1_SIMO */\ + MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTD | DIS | M0)) /*McSPI1_SOMI */\ + MUX_VAL(CP(MCSPI1_CS0), (IEN | PTD | EN | M0)) /*McSPI1_CS0*/\ + MUX_VAL(CP(MCSPI1_CS1), (IDIS | PTD | EN | M0)) /*McSPI1_CS1*/\ + MUX_VAL(CP(MCSPI1_CS2), (IEN | PTU | DIS | M4)) /*GPIO_176 */\ + /* - LAN_INTR */\ + /*Control and debug */\ + MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTU | EN | M4)) /*GPIO_10*/\ + MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M4)) /*GPIO_186*/\ + MUX_VAL(CP(ETK_CLK_ES2), (IEN | PTU | EN | M2)) /*MMC3_CLK*/\ + MUX_VAL(CP(ETK_CTL_ES2), (IEN | PTU | EN | M2)) /*MMC3_CMD*/\ + MUX_VAL(CP(ETK_D0_ES2), (IEN | PTU | EN | M4)) /*GPIO_14*/\ + MUX_VAL(CP(ETK_D3_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT3*/\ + MUX_VAL(CP(ETK_D4_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT0*/\ + MUX_VAL(CP(ETK_D5_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT1*/\ + MUX_VAL(CP(ETK_D6_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT2*/\ + MUX_VAL(CP(ETK_D7_ES2), (IEN | PTU | EN | M4)) /*GPIO_21*/\ + MUX_VAL(CP(ETK_D8_ES2), (IEN | PTU | EN | M4)) /*GPIO_22*/\ + MUX_VAL(CP(ETK_D9_ES2), (IEN | PTU | EN | M4)) /*GPIO_23*/\ + #define MUX_OVERO_SDIO2_DIRECT() \ MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M0)) /*MMC2_CLK*/\ MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M0)) /*MMC2_CMD*/\ -- 2.1.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [U-Boot, 4/5] omap3: overo: Separate module and expansion board MUX configuration 2014-09-16 15:51 ` [U-Boot] [PATCH 4/5] omap3: overo: Separate module and expansion board MUX configuration Stefan Herbrechtsmeier @ 2014-10-23 17:16 ` Tom Rini 0 siblings, 0 replies; 14+ messages in thread From: Tom Rini @ 2014-10-23 17:16 UTC (permalink / raw) To: u-boot On Tue, Sep 16, 2014 at 05:51:08PM +0200, Stefan Herbrechtsmeier wrote: > Separate overo module and expansion board MUX configuration. This allows > an foreign expansion board to use the boot loader without any adaption. > It only needs to save the expansion name in the EEPROM to load a > specific device tree. > > Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> Applied to u-boot-ti/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141023/9017c30e/attachment.pgp> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 5/5] omap3: overo: Add usb host support 2014-09-16 15:51 [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier ` (3 preceding siblings ...) 2014-09-16 15:51 ` [U-Boot] [PATCH 4/5] omap3: overo: Separate module and expansion board MUX configuration Stefan Herbrechtsmeier @ 2014-09-16 15:51 ` Stefan Herbrechtsmeier 2014-10-23 17:16 ` [U-Boot] [U-Boot,5/5] " Tom Rini 2014-09-30 5:10 ` [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier 2014-10-10 16:12 ` Tom Rini 6 siblings, 1 reply; 14+ messages in thread From: Stefan Herbrechtsmeier @ 2014-09-16 15:51 UTC (permalink / raw) To: u-boot Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> --- board/overo/overo.c | 34 ++++++++++++++++++++++++++++++++++ include/configs/omap3_overo.h | 8 ++++++++ 2 files changed, 42 insertions(+) diff --git a/board/overo/overo.c b/board/overo/overo.c index 488246b..66146ee 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -25,6 +25,11 @@ #include <asm/mach-types.h> #include "overo.h" +#ifdef CONFIG_USB_EHCI +#include <usb.h> +#include <asm/ehci-omap.h> +#endif + DECLARE_GLOBAL_DATA_PTR; #define TWL4030_I2C_BUS 0 @@ -474,3 +479,32 @@ int board_mmc_init(bd_t *bis) return omap_mmc_init(0, 0, 0, -1, -1); } #endif + +#if defined(CONFIG_USB_EHCI) && !defined(CONFIG_SPL_BUILD) +static struct omap_usbhs_board_data usbhs_bdata = { + .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, + .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, + .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED +}; + +#define GUMSTIX_GPIO_USBH_CPEN 168 +int ehci_hcd_init(int index, enum usb_init_type init, + struct ehci_hccr **hccr, struct ehci_hcor **hcor) +{ + /* Enable USB power */ + if (!gpio_request(GUMSTIX_GPIO_USBH_CPEN, "usbh_cpen")) + gpio_direction_output(GUMSTIX_GPIO_USBH_CPEN, 1); + + return omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor); +} + +int ehci_hcd_stop(void) +{ + /* Disable USB power */ + gpio_set_value(GUMSTIX_GPIO_USBH_CPEN, 0); + gpio_free(GUMSTIX_GPIO_USBH_CPEN); + + return omap_ehci_hcd_stop(); +} + +#endif /* CONFIG_USB_EHCI */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index d042eea..c58636a 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -35,6 +35,13 @@ /* TWL4030 LED */ #define CONFIG_TWL4030_LED +/* USB EHCI */ +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_OMAP +#define CONFIG_USB_STORAGE +#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 183 +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 + /* Initialize GPIOs by default */ #define CONFIG_OMAP3_GPIO_2 /* GPIO32..63 is in GPIO Bank 2 */ #define CONFIG_OMAP3_GPIO_3 /* GPIO64..95 is in GPIO Bank 3 */ @@ -44,6 +51,7 @@ /* commands to include */ #define CONFIG_CMD_CACHE +#define CONFIG_CMD_USB #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_NFS /* NFS support */ -- 2.1.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [U-Boot,5/5] omap3: overo: Add usb host support 2014-09-16 15:51 ` [U-Boot] [PATCH 5/5] omap3: overo: Add usb host support Stefan Herbrechtsmeier @ 2014-10-23 17:16 ` Tom Rini 0 siblings, 0 replies; 14+ messages in thread From: Tom Rini @ 2014-10-23 17:16 UTC (permalink / raw) To: u-boot On Tue, Sep 16, 2014 at 05:51:09PM +0200, Stefan Herbrechtsmeier wrote: > Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> Applied to u-boot-ti/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141023/dd474e2b/attachment.pgp> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support 2014-09-16 15:51 [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier ` (4 preceding siblings ...) 2014-09-16 15:51 ` [U-Boot] [PATCH 5/5] omap3: overo: Add usb host support Stefan Herbrechtsmeier @ 2014-09-30 5:10 ` Stefan Herbrechtsmeier 2014-10-10 16:12 ` Tom Rini 6 siblings, 0 replies; 14+ messages in thread From: Stefan Herbrechtsmeier @ 2014-09-30 5:10 UTC (permalink / raw) To: u-boot Am 16.09.2014 um 17:51 schrieb Stefan Herbrechtsmeier: > At the moment the boot loader use a common configuration for all Gumstix > Overo expansion boards. This also includes configuration of all inputs > and outputs even if they aren't used by the boot loader. Because the > Overo module could be used on foreign expansion boards with different > configurations this could lead to problems. Split the configuration into > a Overo module and expansion board part. The expansion board > configuration is skipped if a foreign expansion board is detected. This > enables a foreign expansion board to use the common boot loader without > any modifications. It could load a specific device tree by saving the > expansion name in the EEPROM. > > Additionally fix some errors in the environment configuration and add > USB host support. > > The series is only tested on a foreign expansion boards. It would be nice > if somebody could test it on an expansion board with network support. > > > Stefan Herbrechtsmeier (5): > omap3: overo: Fix fdtfile test > omap3: overo: Call bootm only after successful nand read > omap3: overo: Move ethernet setup to board_eth_init function > omap3: overo: Separate module and expansion board MUX configuration > omap3: overo: Add usb host support > > board/overo/overo.c | 137 ++++++++++++++++++++++++++++---------- > board/overo/overo.h | 150 ++++++++++++++++++++++-------------------- > include/configs/omap3_overo.h | 15 ++++- > 3 files changed, 195 insertions(+), 107 deletions(-) > Any comments would be appreciated. ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support 2014-09-16 15:51 [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier ` (5 preceding siblings ...) 2014-09-30 5:10 ` [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier @ 2014-10-10 16:12 ` Tom Rini 2014-10-10 16:13 ` Ash Charles 6 siblings, 1 reply; 14+ messages in thread From: Tom Rini @ 2014-10-10 16:12 UTC (permalink / raw) To: u-boot On Tue, Sep 16, 2014 at 05:51:04PM +0200, Stefan Herbrechtsmeier wrote: > At the moment the boot loader use a common configuration for all Gumstix > Overo expansion boards. This also includes configuration of all inputs > and outputs even if they aren't used by the boot loader. Because the > Overo module could be used on foreign expansion boards with different > configurations this could lead to problems. Split the configuration into > a Overo module and expansion board part. The expansion board > configuration is skipped if a foreign expansion board is detected. This > enables a foreign expansion board to use the common boot loader without > any modifications. It could load a specific device tree by saving the > expansion name in the EEPROM. > > Additionally fix some errors in the environment configuration and add > USB host support. > > The series is only tested on a foreign expansion boards. It would be nice > if somebody could test it on an expansion board with network support. > > > Stefan Herbrechtsmeier (5): > omap3: overo: Fix fdtfile test > omap3: overo: Call bootm only after successful nand read > omap3: overo: Move ethernet setup to board_eth_init function > omap3: overo: Separate module and expansion board MUX configuration > omap3: overo: Add usb host support > > board/overo/overo.c | 137 ++++++++++++++++++++++++++++---------- > board/overo/overo.h | 150 ++++++++++++++++++++++-------------------- > include/configs/omap3_overo.h | 15 ++++- > 3 files changed, 195 insertions(+), 107 deletions(-) For the record, I plan to take 2, 3, 4 and 5 for the next merge but 1/5 is clearly a bugfix. Thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141010/d24b0315/attachment.pgp> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support 2014-10-10 16:12 ` Tom Rini @ 2014-10-10 16:13 ` Ash Charles 0 siblings, 0 replies; 14+ messages in thread From: Ash Charles @ 2014-10-10 16:13 UTC (permalink / raw) To: u-boot Thanks Tom. And Stefan: I apologize for my delayed review on these. --Ash On Fri, Oct 10, 2014 at 9:12 AM, Tom Rini <trini@ti.com> wrote: > On Tue, Sep 16, 2014 at 05:51:04PM +0200, Stefan Herbrechtsmeier wrote: > >> At the moment the boot loader use a common configuration for all Gumstix >> Overo expansion boards. This also includes configuration of all inputs >> and outputs even if they aren't used by the boot loader. Because the >> Overo module could be used on foreign expansion boards with different >> configurations this could lead to problems. Split the configuration into >> a Overo module and expansion board part. The expansion board >> configuration is skipped if a foreign expansion board is detected. This >> enables a foreign expansion board to use the common boot loader without >> any modifications. It could load a specific device tree by saving the >> expansion name in the EEPROM. >> >> Additionally fix some errors in the environment configuration and add >> USB host support. >> >> The series is only tested on a foreign expansion boards. It would be nice >> if somebody could test it on an expansion board with network support. >> >> >> Stefan Herbrechtsmeier (5): >> omap3: overo: Fix fdtfile test >> omap3: overo: Call bootm only after successful nand read >> omap3: overo: Move ethernet setup to board_eth_init function >> omap3: overo: Separate module and expansion board MUX configuration >> omap3: overo: Add usb host support >> >> board/overo/overo.c | 137 ++++++++++++++++++++++++++++---------- >> board/overo/overo.h | 150 ++++++++++++++++++++++-------------------- >> include/configs/omap3_overo.h | 15 ++++- >> 3 files changed, 195 insertions(+), 107 deletions(-) > > For the record, I plan to take 2, 3, 4 and 5 for the next merge but 1/5 > is clearly a bugfix. Thanks! > > -- > Tom > > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-10-23 17:16 UTC | newest] Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-09-16 15:51 [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier 2014-09-16 15:51 ` [U-Boot] [PATCH 1/5] omap3: overo: Fix fdtfile test Stefan Herbrechtsmeier 2014-10-10 14:39 ` [U-Boot] [U-Boot,1/5] " Tom Rini 2014-09-16 15:51 ` [U-Boot] [PATCH 2/5] omap3: overo: Call bootm only after successful nand read Stefan Herbrechtsmeier 2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini 2014-09-16 15:51 ` [U-Boot] [PATCH 3/5] omap3: overo: Move ethernet setup to board_eth_init function Stefan Herbrechtsmeier 2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini 2014-09-16 15:51 ` [U-Boot] [PATCH 4/5] omap3: overo: Separate module and expansion board MUX configuration Stefan Herbrechtsmeier 2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini 2014-09-16 15:51 ` [U-Boot] [PATCH 5/5] omap3: overo: Add usb host support Stefan Herbrechtsmeier 2014-10-23 17:16 ` [U-Boot] [U-Boot,5/5] " Tom Rini 2014-09-30 5:10 ` [U-Boot] [PATCH 0/5] omap3: overo: Add foreign expansion board support Stefan Herbrechtsmeier 2014-10-10 16:12 ` Tom Rini 2014-10-10 16:13 ` Ash Charles
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.