Commit f97daaa2317b68aacfbf19bb7566183e17db3349

Authored by Lucas Stach
Committed by Albert ARIBAUD (U-Boot)
1 parent 1e2d785975

tegra: add ULPI on USB2 funcmux entry

This is needed as a prerequisite for Tegra USB ULPI support
within U-Boot.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
CC: Stephen Warren <swarren@wwwdotorg.org>
CC: Tom Warren <twarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

Showing 2 changed files with 15 additions and 1 deletions Side-by-side Diff

arch/arm/cpu/armv7/tegra2/funcmux.c
... ... @@ -209,9 +209,20 @@
209 209 pinmux_set_func(grp[i], PMUX_FUNC_KBC);
210 210 pinmux_set_pullupdown(grp[i], PMUX_PULL_UP);
211 211 }
  212 + }
  213 + break;
212 214  
213   - break;
  215 + case PERIPH_ID_USB2:
  216 + if (config == FUNCMUX_USB2_ULPI) {
  217 + pinmux_set_func(PINGRP_UAA, PMUX_FUNC_ULPI);
  218 + pinmux_set_func(PINGRP_UAB, PMUX_FUNC_ULPI);
  219 + pinmux_set_func(PINGRP_UDA, PMUX_FUNC_ULPI);
  220 +
  221 + pinmux_tristate_disable(PINGRP_UAA);
  222 + pinmux_tristate_disable(PINGRP_UAB);
  223 + pinmux_tristate_disable(PINGRP_UDA);
214 224 }
  225 + break;
215 226  
216 227 default:
217 228 debug("%s: invalid periph_id %d", __func__, id);
arch/arm/include/asm/arch-tegra2/funcmux.h
... ... @@ -51,6 +51,9 @@
51 51 FUNCMUX_SDMMC4_ATC_ATD_8BIT = 0,
52 52 FUNCMUX_SDMMC4_ATB_GMA_4_BIT,
53 53 FUNCMUX_SDMMC4_ATB_GMA_GME_8_BIT,
  54 +
  55 + /* USB configs */
  56 + FUNCMUX_USB2_ULPI = 0,
54 57 };
55 58  
56 59 /**