diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-16 20:23:44 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-16 20:23:44 +0200 |
commit | e741110f5a4089f22dbaae97443753acd4851bdd (patch) | |
tree | 86acf2e6c390d633da5be4a4ea4e1c6d024c4bec /arch/arm/boards/freescale-mx51-pdk/board.c | |
parent | 9115339720c3df3c9b40dae7adbef137362efcc0 (diff) | |
parent | 0d188aca536284f3c9650d8857c43c0dd5a81c2c (diff) | |
download | barebox-e741110f5a4089f22dbaae97443753acd4851bdd.tar.gz barebox-e741110f5a4089f22dbaae97443753acd4851bdd.tar.xz |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/boards/freescale-mx51-pdk/board.c')
-rw-r--r-- | arch/arm/boards/freescale-mx51-pdk/board.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c index 937fcfa3ad..74b32a99aa 100644 --- a/arch/arm/boards/freescale-mx51-pdk/board.c +++ b/arch/arm/boards/freescale-mx51-pdk/board.c @@ -66,7 +66,7 @@ static iomux_v3_cfg_t f3s_pads[] = { MX51_PAD_NANDF_D11__FEC_RX_DV, MX51_PAD_NANDF_D9__FEC_RDATA0, MX51_PAD_NANDF_D8__FEC_TDATA0, - MX51_PAD_CSPI1_SS0__GPIO4_24, + MX51_PAD_CSPI1_SS0__ECSPI1_SS0, MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI, MX51_PAD_CSPI1_MISO__ECSPI1_MISO, MX51_PAD_CSPI1_RDY__ECSPI1_RDY, |