diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 20:13:48 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 20:13:48 +0200 |
| commit | 94b972d366c29b92319865e3ded16da062aa8507 (patch) | |
| tree | 2948fd62cdd789f182775f5d7d576ac9b7b025e5 /drivers/spi | |
| parent | dda0dbfc69f3d560c87f5be85f127ed862ea6721 (diff) | |
| parent | d381294aef4a5b6ddeda3685519330a5b73d884f (diff) | |
| download | u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.zip u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.tar.gz u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.tar.bz2 | |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/tegra20_sflash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 603c024..b5d561b 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -208,9 +208,9 @@ int tegra20_spi_claim_bus(struct spi_slave *slave) * SPI pins on Tegra20 are muxed - change pinmux later due to UART * issue. */ - pinmux_set_func(PINGRP_GMD, PMUX_FUNC_SFLASH); - pinmux_tristate_disable(PINGRP_LSPI); - pinmux_set_func(PINGRP_GMC, PMUX_FUNC_SFLASH); + pinmux_set_func(PMUX_PINGRP_GMD, PMUX_FUNC_SFLASH); + pinmux_tristate_disable(PMUX_PINGRP_LSPI); + pinmux_set_func(PMUX_PINGRP_GMC, PMUX_FUNC_SFLASH); return 0; } |