summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSonic Zhang <Sonic.Zhang@analog.com>2009-03-20 19:28:20 -0400
committerMike Frysinger <vapier@gentoo.org>2009-03-23 15:14:52 -0400
commit974473caa732f63312687ef2bd2d22dad8e99b9a (patch)
tree3273e4c20deb5a3547cc0ab9c1f44f4770175564
parente82b762f293debc53c5afa90f37264f6b07520f9 (diff)
downloadu-boot-imx-974473caa732f63312687ef2bd2d22dad8e99b9a.zip
u-boot-imx-974473caa732f63312687ef2bd2d22dad8e99b9a.tar.gz
u-boot-imx-974473caa732f63312687ef2bd2d22dad8e99b9a.tar.bz2
Blackfin: spi: there is no PORTJ_FER MMR on BF537
Since the PORTJ on the BF537 is peripheral-only (no GPIO functionality), then there is no PORTJ_FER register for us to worry about. Signed-off-by: Sonic Zhang <Sonic.Zhang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--drivers/spi/bfin_spi.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c
index d22862a..0472c1a 100644
--- a/drivers/spi/bfin_spi.c
+++ b/drivers/spi/bfin_spi.c
@@ -191,21 +191,19 @@ static void spi_portmux(struct spi_slave *slave)
#elif defined(__ADSPBF534__) || defined(__ADSPBF536__) || defined(__ADSPBF537__)
u16 mux = bfin_read_PORT_MUX();
u16 f_fer = bfin_read_PORTF_FER();
- u16 j_fer = bfin_read_PORTJ_FER();
/* set SCK/MISO/MOSI */
f_fer |= PF11 | PF12 | PF13;
switch (slave->cs) {
case 1: f_fer |= PF10; break;
- case 2: mux |= PJSE; j_fer |= PJ11; break;
- case 3: mux |= PJSE; j_fer |= PJ10; break;
+ case 2: mux |= PJSE; break;
+ case 3: mux |= PJSE; break;
case 4: mux |= PFS4E; f_fer |= PF6; break;
case 5: mux |= PFS5E; f_fer |= PF5; break;
case 6: mux |= PFS6E; f_fer |= PF4; break;
- case 7: mux |= PJCE_SPI; j_fer |= PJ5; break;
+ case 7: mux |= PJCE_SPI; break;
}
bfin_write_PORT_MUX(mux);
bfin_write_PORTF_FER(f_fer);
- bfin_write_PORTJ_FER(j_fer);
#elif defined(__ADSPBF54x__)
#define DO_MUX(port, pin) \
mux = ((mux & ~PORT_x_MUX_##pin##_MASK) | PORT_x_MUX_##pin##_FUNC_1); \