kw_spi: fix clock prescaler computation

[platform/kernel/u-boot.git] / drivers / spi / kirkwood_spi.c

diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index 6f502f0..a7cda75 100644 (file)
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -34,16 +34,14 @@
 
 static struct kwspi_registers *spireg = (struct kwspi_registers *)KW_SPI_BASE;
 
+u32 cs_spi_mpp_back[2];
+
 struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
                                unsigned int max_hz, unsigned int mode)
 {
        struct spi_slave *slave;
        u32 data;
-       u32 kwspi_mpp_config[] = {
-               MPP0_GPIO,
-               MPP7_SPI_SCn,
-               0
-       };
+       u32 kwspi_mpp_config[] = { 0, 0 };
 
        if (!spi_cs_is_valid(bus, cs))
                return NULL;
@@ -58,41 +56,88 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
        writel(~KWSPI_CSN_ACT | KWSPI_SMEMRDY, &spireg->ctrl);
 
        /* calculate spi clock prescaller using max_hz */
-       data = ((CONFIG_SYS_TCLK / 2) / max_hz) & KWSPI_CLKPRESCL_MASK;
-       data |= 0x10;
+       data = ((CONFIG_SYS_TCLK / 2) / max_hz) + 0x10;
+       data = data < KWSPI_CLKPRESCL_MIN ? KWSPI_CLKPRESCL_MIN : data;
+       data = data > KWSPI_CLKPRESCL_MASK ? KWSPI_CLKPRESCL_MASK : data;
 
        /* program spi clock prescaller using max_hz */
        writel(KWSPI_ADRLEN_3BYTE | data, &spireg->cfg);
        debug("data = 0x%08x \n", data);
 
        writel(KWSPI_SMEMRDIRQ, &spireg->irq_cause);
-       writel(KWSPI_IRQMASK, spireg->irq_mask);
+       writel(KWSPI_IRQMASK, &spireg->irq_mask);
 
        /* program mpp registers to select  SPI_CSn */
        if (cs) {
-               kwspi_mpp_config[0] = MPP0_GPIO;
-               kwspi_mpp_config[1] = MPP7_SPI_SCn;
+               kwspi_mpp_config[0] = MPP7_SPI_SCn;
        } else {
                kwspi_mpp_config[0] = MPP0_SPI_SCn;
-               kwspi_mpp_config[1] = MPP7_GPO;
        }
-       kirkwood_mpp_conf(kwspi_mpp_config);
+       kirkwood_mpp_conf(kwspi_mpp_config, cs_spi_mpp_back);
 
        return slave;
 }
 
 void spi_free_slave(struct spi_slave *slave)
 {
+       kirkwood_mpp_conf(cs_spi_mpp_back, NULL);
        free(slave);
 }
 
-int spi_claim_bus(struct spi_slave *slave)
+#if defined(CONFIG_SYS_KW_SPI_MPP)
+u32 spi_mpp_backup[4];
+#endif
+
+__attribute__((weak)) int board_spi_claim_bus(struct spi_slave *slave)
 {
        return 0;
 }
 
+int spi_claim_bus(struct spi_slave *slave)
+{
+#if defined(CONFIG_SYS_KW_SPI_MPP)
+       u32 config;
+       u32 spi_mpp_config[4];
+
+       config = CONFIG_SYS_KW_SPI_MPP;
+
+       if (config & MOSI_MPP6)
+               spi_mpp_config[0] = MPP6_SPI_MOSI;
+       else
+               spi_mpp_config[0] = MPP1_SPI_MOSI;
+
+       if (config & SCK_MPP10)
+               spi_mpp_config[1] = MPP10_SPI_SCK;
+       else
+               spi_mpp_config[1] = MPP2_SPI_SCK;
+
+       if (config & MISO_MPP11)
+               spi_mpp_config[2] = MPP11_SPI_MISO;
+       else
+               spi_mpp_config[2] = MPP3_SPI_MISO;
+
+       spi_mpp_config[3] = 0;
+       spi_mpp_backup[3] = 0;
+
+       /* set new spi mpp and save current mpp config */
+       kirkwood_mpp_conf(spi_mpp_config, spi_mpp_backup);
+
+#endif
+
+       return board_spi_claim_bus(slave);
+}
+
+__attribute__((weak)) void board_spi_release_bus(struct spi_slave *slave)
+{
+}
+
 void spi_release_bus(struct spi_slave *slave)
 {
+#if defined(CONFIG_SYS_KW_SPI_MPP)
+       kirkwood_mpp_conf(spi_mpp_backup, NULL);
+#endif
+
+       board_spi_release_bus(slave);
 }
 
 #ifndef CONFIG_SPI_CS_IS_VALID
@@ -107,6 +152,10 @@ int spi_cs_is_valid(unsigned int bus, unsigned int cs)
 }
 #endif
 
+void spi_init(void)
+{
+}
+
 void spi_cs_activate(struct spi_slave *slave)
 {
        writel(readl(&spireg->ctrl) | KWSPI_IRQUNMASK, &spireg->ctrl);
@@ -123,7 +172,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
        unsigned int tmpdout, tmpdin;
        int tm, isread = 0;
 
-       debug("spi_xfer: slave %u:%u dout %08X din %08X bitlen %u\n",
+       debug("spi_xfer: slave %u:%u dout %p din %p bitlen %u\n",
              slave->bus, slave->cs, dout, din, bitlen);
 
        if (flags & SPI_XFER_BEGIN)
@@ -159,7 +208,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
                                isread = 1;
                                tmpdin = readl(&spireg->din);
                                debug
-                                       ("spi_xfer: din %08x..%08x read\n",
+                                       ("spi_xfer: din %p..%08x read\n",
                                        din, tmpdin);
 
                                if (din) {