diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-03-25 22:43:25 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-25 22:43:25 +0100 |
| commit | 2c5bd16af132bb6e9158c43fc6206fa0f1f501c1 (patch) | |
| tree | 39c3dd1da3692cbe609f66f4d004451944d89771 /drivers | |
| parent | 196c74311f394c6eb08bd9ab07a35671299b9851 (diff) | |
| parent | 4de1a5daab079ddc8ce1274144700203d692105c (diff) | |
| download | u-boot-imx-2c5bd16af132bb6e9158c43fc6206fa0f1f501c1.zip u-boot-imx-2c5bd16af132bb6e9158c43fc6206fa0f1f501c1.tar.gz u-boot-imx-2c5bd16af132bb6e9158c43fc6206fa0f1f501c1.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/bfin_spi.c | 8 |
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); \ |