common: Move clock functions into a new file

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

diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index 791f3e8099c8f157b2fb7f8fff582ef8dd487cad..c725625146d2602a37e3b7cbdc0e247ecd643202 100644 (file)
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2009
  * Marvell Semiconductor <www.marvell.com>
  * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
  *
  * Derived from drivers/spi/mpc8xxx_spi.c
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -152,10 +151,6 @@ void spi_free_slave(struct spi_slave *slave)
        free(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;
@@ -163,34 +158,6 @@ __attribute__((weak)) int board_spi_claim_bus(struct spi_slave *slave)
 
 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);
 }
 
@@ -200,10 +167,6 @@ __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);
 }
 
@@ -243,8 +206,13 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
 
 /* Here now the DM part */
 
+struct mvebu_spi_dev {
+       bool                    is_errata_50mhz_ac;
+};
+
 struct mvebu_spi_platdata {
        struct kwspi_registers *spireg;
+       bool is_errata_50mhz_ac;
 };
 
 struct mvebu_spi_priv {
@@ -269,6 +237,39 @@ static int mvebu_spi_set_speed(struct udevice *bus, uint hz)
        return 0;
 }
 
+static void mvebu_spi_50mhz_ac_timing_erratum(struct udevice *bus, uint mode)
+{
+       struct mvebu_spi_platdata *plat = dev_get_platdata(bus);
+       struct kwspi_registers *reg = plat->spireg;
+       u32 data;
+
+       /*
+        * Erratum description: (Erratum NO. FE-9144572) The device
+        * SPI interface supports frequencies of up to 50 MHz.
+        * However, due to this erratum, when the device core clock is
+        * 250 MHz and the SPI interfaces is configured for 50MHz SPI
+        * clock and CPOL=CPHA=1 there might occur data corruption on
+        * reads from the SPI device.
+        * Erratum Workaround:
+        * Work in one of the following configurations:
+        * 1. Set CPOL=CPHA=0 in "SPI Interface Configuration
+        * Register".
+        * 2. Set TMISO_SAMPLE value to 0x2 in "SPI Timing Parameters 1
+        * Register" before setting the interface.
+        */
+       data = readl(&reg->timing1);
+       data &= ~KW_SPI_TMISO_SAMPLE_MASK;
+
+       if (CONFIG_SYS_TCLK == 250000000 &&
+           mode & SPI_CPOL &&
+           mode & SPI_CPHA)
+               data |= KW_SPI_TMISO_SAMPLE_2;
+       else
+               data |= KW_SPI_TMISO_SAMPLE_1;
+
+       writel(data, &reg->timing1);
+}
+
 static int mvebu_spi_set_mode(struct udevice *bus, uint mode)
 {
        struct mvebu_spi_platdata *plat = dev_get_platdata(bus);
@@ -286,6 +287,9 @@ static int mvebu_spi_set_mode(struct udevice *bus, uint mode)
 
        writel(data, &reg->cfg);
 
+       if (plat->is_errata_50mhz_ac)
+               mvebu_spi_50mhz_ac_timing_erratum(bus, mode);
+
        return 0;
 }
 
@@ -298,6 +302,11 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen,
        return _spi_xfer(plat->spireg, bitlen, dout, din, flags);
 }
 
+__attribute__((weak)) int mvebu_board_spi_claim_bus(struct udevice *dev)
+{
+       return 0;
+}
+
 static int mvebu_spi_claim_bus(struct udevice *dev)
 {
        struct udevice *bus = dev->parent;
@@ -308,9 +317,19 @@ static int mvebu_spi_claim_bus(struct udevice *dev)
                        KWSPI_CS_MASK << KWSPI_CS_SHIFT,
                        spi_chip_select(dev) << KWSPI_CS_SHIFT);
 
+       return mvebu_board_spi_claim_bus(dev);
+}
+
+__attribute__((weak)) int mvebu_board_spi_release_bus(struct udevice *dev)
+{
        return 0;
 }
 
+static int mvebu_spi_release_bus(struct udevice *dev)
+{
+       return mvebu_board_spi_release_bus(dev);
+}
+
 static int mvebu_spi_probe(struct udevice *bus)
 {
        struct mvebu_spi_platdata *plat = dev_get_platdata(bus);
@@ -326,14 +345,18 @@ static int mvebu_spi_probe(struct udevice *bus)
 static int mvebu_spi_ofdata_to_platdata(struct udevice *bus)
 {
        struct mvebu_spi_platdata *plat = dev_get_platdata(bus);
+       const struct mvebu_spi_dev *drvdata =
+               (struct mvebu_spi_dev *)dev_get_driver_data(bus);
 
-       plat->spireg = (struct kwspi_registers *)dev_get_addr(bus);
+       plat->spireg = (struct kwspi_registers *)devfdt_get_addr(bus);
+       plat->is_errata_50mhz_ac = drvdata->is_errata_50mhz_ac;
 
        return 0;
 }
 
 static const struct dm_spi_ops mvebu_spi_ops = {
        .claim_bus      = mvebu_spi_claim_bus,
+       .release_bus    = mvebu_spi_release_bus,
        .xfer           = mvebu_spi_xfer,
        .set_speed      = mvebu_spi_set_speed,
        .set_mode       = mvebu_spi_set_mode,
@@ -343,10 +366,39 @@ static const struct dm_spi_ops mvebu_spi_ops = {
         */
 };
 
+static const struct mvebu_spi_dev armada_spi_dev_data = {
+       .is_errata_50mhz_ac = false,
+};
+
+static const struct mvebu_spi_dev armada_xp_spi_dev_data = {
+       .is_errata_50mhz_ac = false,
+};
+
+static const struct mvebu_spi_dev armada_375_spi_dev_data = {
+       .is_errata_50mhz_ac = false,
+};
+
+static const struct mvebu_spi_dev armada_380_spi_dev_data = {
+       .is_errata_50mhz_ac = true,
+};
+
 static const struct udevice_id mvebu_spi_ids[] = {
-       { .compatible = "marvell,armada-375-spi" },
-       { .compatible = "marvell,armada-380-spi" },
-       { .compatible = "marvell,armada-xp-spi" },
+       {
+               .compatible = "marvell,orion-spi",
+               .data = (ulong)&armada_spi_dev_data,
+       },
+       {
+               .compatible = "marvell,armada-375-spi",
+               .data = (ulong)&armada_375_spi_dev_data
+       },
+       {
+               .compatible = "marvell,armada-380-spi",
+               .data = (ulong)&armada_380_spi_dev_data
+       },
+       {
+               .compatible = "marvell,armada-xp-spi",
+               .data = (ulong)&armada_xp_spi_dev_data
+       },
        { }
 };