Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-16 05:58:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

drivers: spi: omap3_spi: Initialize mode for all channels

Browse source 
At first SPI transfers, multiple chip selects can be
enabled simultaneously. This is due to chip select
polarity, which is not properly initialized for all
channels. This patch fixes the issue.

Signed-off-by: Julien Panis <jpanis@baylibre.com>
This commit is contained in:
Julien Panis 2023-05-29 15:42:28 +02:00 • committed by Tom Rini
parent 8dc2c66680
commit fb93bd8d26
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/spi/omap3_spi.c
View file

@ -347,20 +347,28 @@ static void _omap3_spi_set_wordlen(struct omap3_spi_priv *priv)
omap3_spi_write_chconf(priv, confr);
}
static void spi_reset(struct mcspi *regs)
static void spi_reset(struct omap3_spi_priv *priv)
{
unsigned int tmp;
writel(OMAP3_MCSPI_SYSCONFIG_SOFTRESET, &regs->sysconfig);
writel(OMAP3_MCSPI_SYSCONFIG_SOFTRESET, &priv->regs->sysconfig);
do {
tmp = readl(&regs->sysstatus);
tmp = readl(&priv->regs->sysstatus);
} while (!(tmp & OMAP3_MCSPI_SYSSTATUS_RESETDONE));
writel(OMAP3_MCSPI_SYSCONFIG_AUTOIDLE |
OMAP3_MCSPI_SYSCONFIG_ENAWAKEUP |
OMAP3_MCSPI_SYSCONFIG_SMARTIDLE, &regs->sysconfig);
OMAP3_MCSPI_SYSCONFIG_SMARTIDLE, &priv->regs->sysconfig);
writel(OMAP3_MCSPI_WAKEUPENABLE_WKEN, &regs->wakeupenable);
writel(OMAP3_MCSPI_WAKEUPENABLE_WKEN, &priv->regs->wakeupenable);
/*
* Set the same default mode for each channel, especially CS polarity
* which must be common for all SPI slaves before any transfer.
*/
for (priv->cs = 0 ; priv->cs < OMAP4_MCSPI_CHAN_NB ; priv->cs++)
_omap3_spi_set_mode(priv);
priv->cs = 0;
}
static void _omap3_spi_claim_bus(struct omap3_spi_priv *priv)
@ -430,7 +438,7 @@ static int omap3_spi_probe(struct udevice *dev)
priv->pin_dir = plat->pin_dir;
priv->wordlen = SPI_DEFAULT_WORDLEN;
spi_reset(priv->regs);
spi_reset(priv);
return 0;
}

4
include/omap3_spi.h
View file

@ -46,6 +46,8 @@
#define OMAP4_MCSPI_REG_OFFSET 0x100
#define OMAP4_MCSPI_CHAN_NB 4
/* OMAP3 McSPI registers */
struct mcspi_channel {
unsigned int chconf; /* 0x2C, 0x40, 0x54, 0x68 */
@ -64,7 +66,7 @@ struct mcspi {
unsigned int wakeupenable; /* 0x20 */
unsigned int syst; /* 0x24 */
unsigned int modulctrl; /* 0x28 */
struct mcspi_channel channel[4];
struct mcspi_channel channel[OMAP4_MCSPI_CHAN_NB];
/* channel0: 0x2C - 0x3C, bus 0 & 1 & 2 & 3 */
/* channel1: 0x40 - 0x50, bus 0 & 1 */
/* channel2: 0x54 - 0x64, bus 0 & 1 */