Stephen, > -----Original Message----- > From: Stephen Warren [mailto:swar...@wwwdotorg.org] > Sent: Tuesday, June 12, 2012 11:34 AM > To: Tom Warren > Cc: u-boot@lists.denx.de; Stephen Warren > Subject: [PATCH 1/3] tegra: add GMC/GMD funcmux entry for SFLASH
This series (3 patches) has been applied to u-boot-tegra/master. Thanks! Tom > > From: Stephen Warren <swar...@nvidia.com> > > This is used on TrimSlice. > > Signed-off-by: Stephen Warren <swar...@nvidia.com> > --- > arch/arm/cpu/armv7/tegra2/funcmux.c | 10 ++++++++++ > arch/arm/include/asm/arch-tegra2/funcmux.h | 3 +++ > 2 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/cpu/armv7/tegra2/funcmux.c > b/arch/arm/cpu/armv7/tegra2/funcmux.c > index 455d010..4a31a4c 100644 > --- a/arch/arm/cpu/armv7/tegra2/funcmux.c > +++ b/arch/arm/cpu/armv7/tegra2/funcmux.c > @@ -224,6 +224,16 @@ int funcmux_select(enum periph_id id, int config) > } > break; > > + case PERIPH_ID_SPI1: > + if (config == FUNCMUX_SPI1_GMC_GMD) { > + pinmux_set_func(PINGRP_GMC, PMUX_FUNC_SFLASH); > + pinmux_set_func(PINGRP_GMD, PMUX_FUNC_SFLASH); > + > + pinmux_tristate_disable(PINGRP_GMC); > + pinmux_tristate_disable(PINGRP_GMD); > + } > + break; > + > default: > debug("%s: invalid periph_id %d", __func__, id); > return -1; > diff --git a/arch/arm/include/asm/arch-tegra2/funcmux.h > b/arch/arm/include/asm/arch-tegra2/funcmux.h > index 3cbc7d2..dcd512f 100644 > --- a/arch/arm/include/asm/arch-tegra2/funcmux.h > +++ b/arch/arm/include/asm/arch-tegra2/funcmux.h > @@ -54,6 +54,9 @@ enum { > > /* USB configs */ > FUNCMUX_USB2_ULPI = 0, > + > + /* Serial Flash configs */ > + FUNCMUX_SPI1_GMC_GMD = 0, > }; > > /** > -- > 1.7.0.4 -- nvpublic _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot