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 01e1d11..a7cda75 100644 (file)
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -56,8 +56,9 @@ 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);
@@ -83,13 +84,60 @@ void spi_free_slave(struct spi_slave *slave)
        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