summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-04-10 20:23:41 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2014-04-23 12:32:35 +0200
commit6a40096a6c46b2ad31d97aba732a096bd9e6af76 (patch)
tree4b830bdb032cf53a26af43437feea0893a99a747 /drivers/spi
parente9ab71561b2bf166b175ab4af0784e7258bf1de4 (diff)
downloadbarebox-6a40096a6c46b2ad31d97aba732a096bd9e6af76.tar.gz
barebox-6a40096a6c46b2ad31d97aba732a096bd9e6af76.tar.xz
spi: i.MX: Simplify cspi_0_0_init()
Use SPI module software reset to simplify cspi_0_0_init(). Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/imx_spi.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c
index 6675729314..4e43725879 100644
--- a/drivers/spi/imx_spi.c
+++ b/drivers/spi/imx_spi.c
@@ -67,6 +67,8 @@
#define CSPI_0_0_TEST_LBC (1 << 14)
+#define CSPI_0_0_RESET_START (1 << 0)
+
#define CSPI_0_7_RXDATA 0x00
#define CSPI_0_7_TXDATA 0x04
#define CSPI_0_7_CTRL 0x08
@@ -197,13 +199,9 @@ static void cspi_0_0_init(struct imx_spi *imx)
{
void __iomem *base = imx->regs;
- writel(CSPI_0_0_CTRL_ENABLE | CSPI_0_0_CTRL_MASTER,
- base + CSPI_0_0_CTRL);
- writel(CSPI_0_0_PERIOD_32KHZ,
- base + CSPI_0_0_PERIOD);
- while (readl(base + CSPI_0_0_INT) & CSPI_0_0_STAT_RR)
- readl(base + CSPI_0_0_RXDATA);
- writel(0, base + CSPI_0_0_INT);
+ writel(CSPI_0_0_RESET_START, base + CSPI_0_0_RESET);
+ do {
+ } while (readl(base + CSPI_0_0_RESET) & CSPI_0_0_RESET_START);
}
static unsigned int cspi_0_7_xchg_single(struct imx_spi *imx, unsigned int data)