Merge tag 'xilinx-for-v2023.01-rc3' of https://source.denx.de/u-boot/custodians/u...

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

diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c
index 153bbf8..f3602a2 100644 (file)
--- a/drivers/spi/soft_spi.c
+++ b/drivers/spi/soft_spi.c
@@ -16,13 +16,14 @@
 #include <log.h>
 #include <malloc.h>
 #include <spi.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-struct soft_spi_platdata {
+struct soft_spi_plat {
        struct gpio_desc cs;
        struct gpio_desc sclk;
        struct gpio_desc mosi;
@@ -41,7 +42,7 @@ struct soft_spi_priv {
 static int soft_spi_scl(struct udevice *dev, int bit)
 {
        struct udevice *bus = dev_get_parent(dev);
-       struct soft_spi_platdata *plat = dev_get_platdata(bus);
+       struct soft_spi_plat *plat = dev_get_plat(bus);
 
        dm_gpio_set_value(&plat->sclk, bit);
 
@@ -51,7 +52,7 @@ static int soft_spi_scl(struct udevice *dev, int bit)
 static int soft_spi_sda(struct udevice *dev, int bit)
 {
        struct udevice *bus = dev_get_parent(dev);
-       struct soft_spi_platdata *plat = dev_get_platdata(bus);
+       struct soft_spi_plat *plat = dev_get_plat(bus);
 
        dm_gpio_set_value(&plat->mosi, bit);
 
@@ -62,7 +63,7 @@ static int soft_spi_cs_activate(struct udevice *dev)
 {
        struct udevice *bus = dev_get_parent(dev);
        struct soft_spi_priv *priv = dev_get_priv(bus);
-       struct soft_spi_platdata *plat = dev_get_platdata(bus);
+       struct soft_spi_plat *plat = dev_get_plat(bus);
        int cidle = !!(priv->mode & SPI_CPOL);
 
        dm_gpio_set_value(&plat->cs, 0);
@@ -75,7 +76,7 @@ static int soft_spi_cs_activate(struct udevice *dev)
 static int soft_spi_cs_deactivate(struct udevice *dev)
 {
        struct udevice *bus = dev_get_parent(dev);
-       struct soft_spi_platdata *plat = dev_get_platdata(bus);
+       struct soft_spi_plat *plat = dev_get_plat(bus);
 
        dm_gpio_set_value(&plat->cs, 0);
 
@@ -117,7 +118,7 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen,
 {
        struct udevice *bus = dev_get_parent(dev);
        struct soft_spi_priv *priv = dev_get_priv(bus);
-       struct soft_spi_platdata *plat = dev_get_platdata(bus);
+       struct soft_spi_plat *plat = dev_get_plat(bus);
        uchar           tmpdin  = 0;
        uchar           tmpdout = 0;
        const u8        *txd = dout;
@@ -226,9 +227,9 @@ static const struct dm_spi_ops soft_spi_ops = {
        .set_mode       = soft_spi_set_mode,
 };
 
-static int soft_spi_ofdata_to_platdata(struct udevice *dev)
+static int soft_spi_of_to_plat(struct udevice *dev)
 {
-       struct soft_spi_platdata *plat = dev->platdata;
+       struct soft_spi_plat *plat = dev_get_plat(dev);
        const void *blob = gd->fdt_blob;
        int node = dev_of_offset(dev);
 
@@ -240,7 +241,7 @@ static int soft_spi_ofdata_to_platdata(struct udevice *dev)
 static int soft_spi_probe(struct udevice *dev)
 {
        struct spi_slave *slave = dev_get_parent_priv(dev);
-       struct soft_spi_platdata *plat = dev->platdata;
+       struct soft_spi_plat *plat = dev_get_plat(dev);
        int cs_flags, clk_flags;
        int ret;
 
@@ -280,8 +281,8 @@ U_BOOT_DRIVER(soft_spi) = {
        .id     = UCLASS_SPI,
        .of_match = soft_spi_ids,
        .ops    = &soft_spi_ops,
-       .ofdata_to_platdata = soft_spi_ofdata_to_platdata,
-       .platdata_auto_alloc_size = sizeof(struct soft_spi_platdata),
-       .priv_auto_alloc_size = sizeof(struct soft_spi_priv),
+       .of_to_plat = soft_spi_of_to_plat,
+       .plat_auto      = sizeof(struct soft_spi_plat),
+       .priv_auto      = sizeof(struct soft_spi_priv),
        .probe  = soft_spi_probe,
 };