spi: cadence_qspi: Add support for Versal NET platform

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

diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c
index ae16b45..5c8c185 100644 (file)
--- a/drivers/spi/tegra210_qspi.c
+++ b/drivers/spi/tegra210_qspi.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <time.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
@@ -97,9 +98,9 @@ struct tegra210_qspi_priv {
        int last_transaction_us;
 };
 
-static int tegra210_qspi_ofdata_to_platdata(struct udevice *bus)
+static int tegra210_qspi_of_to_plat(struct udevice *bus)
 {
-       struct tegra_spi_platdata *plat = bus->platdata;
+       struct tegra_spi_plat *plat = dev_get_plat(bus);
 
        plat->base = dev_read_addr(bus);
        plat->periph_id = clock_decode_periph_id(bus);
@@ -125,7 +126,7 @@ static int tegra210_qspi_ofdata_to_platdata(struct udevice *bus)
 
 static int tegra210_qspi_probe(struct udevice *bus)
 {
-       struct tegra_spi_platdata *plat = dev_get_platdata(bus);
+       struct tegra_spi_plat *plat = dev_get_plat(bus);
        struct tegra210_qspi_priv *priv = dev_get_priv(bus);
 
        priv->regs = (struct qspi_regs *)plat->base;
@@ -174,7 +175,7 @@ static int tegra210_qspi_claim_bus(struct udevice *dev)
 static void spi_cs_activate(struct udevice *dev)
 {
        struct udevice *bus = dev->parent;
-       struct tegra_spi_platdata *pdata = dev_get_platdata(bus);
+       struct tegra_spi_plat *pdata = dev_get_plat(bus);
        struct tegra210_qspi_priv *priv = dev_get_priv(bus);
 
        /* If it's too soon to do another transaction, wait */
@@ -198,7 +199,7 @@ static void spi_cs_activate(struct udevice *dev)
 static void spi_cs_deactivate(struct udevice *dev)
 {
        struct udevice *bus = dev->parent;
-       struct tegra_spi_platdata *pdata = dev_get_platdata(bus);
+       struct tegra_spi_plat *pdata = dev_get_plat(bus);
        struct tegra210_qspi_priv *priv = dev_get_priv(bus);
 
        setbits_le32(&priv->regs->command1, QSPI_CMD1_CS_SW_VAL);
@@ -223,7 +224,7 @@ static int tegra210_qspi_xfer(struct udevice *dev, unsigned int bitlen,
        int num_bytes, tm, ret;
 
        debug("%s: slave %u:%u dout %p din %p bitlen %u\n",
-             __func__, bus->seq, spi_chip_select(dev), dout, din, bitlen);
+             __func__, dev_seq(bus), spi_chip_select(dev), dout, din, bitlen);
        if (bitlen % 8)
                return -1;
        num_bytes = bitlen / 8;
@@ -380,7 +381,7 @@ static int tegra210_qspi_xfer(struct udevice *dev, unsigned int bitlen,
 
 static int tegra210_qspi_set_speed(struct udevice *bus, uint speed)
 {
-       struct tegra_spi_platdata *plat = bus->platdata;
+       struct tegra_spi_plat *plat = dev_get_plat(bus);
        struct tegra210_qspi_priv *priv = dev_get_priv(bus);
 
        if (speed > plat->frequency)
@@ -422,9 +423,9 @@ U_BOOT_DRIVER(tegra210_qspi) = {
        .id = UCLASS_SPI,
        .of_match = tegra210_qspi_ids,
        .ops = &tegra210_qspi_ops,
-       .ofdata_to_platdata = tegra210_qspi_ofdata_to_platdata,
-       .platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata),
-       .priv_auto_alloc_size = sizeof(struct tegra210_qspi_priv),
-       .per_child_auto_alloc_size = sizeof(struct spi_slave),
+       .of_to_plat = tegra210_qspi_of_to_plat,
+       .plat_auto      = sizeof(struct tegra_spi_plat),
+       .priv_auto      = sizeof(struct tegra210_qspi_priv),
+       .per_child_auto = sizeof(struct spi_slave),
        .probe = tegra210_qspi_probe,
 };