]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
spi: ich: Convert to livetree
authorSimon Glass <sjg@chromium.org>
Sat, 7 Dec 2019 04:42:39 +0000 (21:42 -0700)
committerBin Meng <bmeng.cn@gmail.com>
Sun, 15 Dec 2019 03:44:22 +0000 (11:44 +0800)
Use dev_get_driver_data() to obtain the device type. It has the same
effect and is shorter.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
drivers/spi/ich.c

index 4d61be02eced3e4d01f93720cd5f1896b792aa07..646014456061ad1262bdf03afd619e3cbff94eaf 100644 (file)
@@ -597,28 +597,16 @@ static int ich_spi_ofdata_to_platdata(struct udevice *dev)
 {
        struct ich_spi_platdata *plat = dev_get_platdata(dev);
        struct ich_spi_priv *priv = dev_get_priv(dev);
-       int node = dev_of_offset(dev);
-       int ret;
 
        /* Find a PCH if there is one */
        uclass_first_device(UCLASS_PCH, &priv->pch);
        if (!priv->pch)
                priv->pch = dev_get_parent(dev);
 
-       ret = fdt_node_check_compatible(gd->fdt_blob, node, "intel,ich7-spi");
-       if (ret == 0) {
-               plat->ich_version = ICHV_7;
-       } else {
-               ret = fdt_node_check_compatible(gd->fdt_blob, node,
-                                               "intel,ich9-spi");
-               if (ret == 0)
-                       plat->ich_version = ICHV_9;
-       }
+       plat->ich_version = dev_get_driver_data(dev);
+       plat->lockdown = dev_read_bool(dev, "intel,spi-lock-down");
 
-       plat->lockdown = fdtdec_get_bool(gd->fdt_blob, node,
-                                        "intel,spi-lock-down");
-
-       return ret;
+       return 0;
 }
 
 static const struct spi_controller_mem_ops ich_controller_mem_ops = {
@@ -639,8 +627,8 @@ static const struct dm_spi_ops ich_spi_ops = {
 };
 
 static const struct udevice_id ich_spi_ids[] = {
-       { .compatible = "intel,ich7-spi" },
-       { .compatible = "intel,ich9-spi" },
+       { .compatible = "intel,ich7-spi", ICHV_7 },
+       { .compatible = "intel,ich9-spi", ICHV_9 },
        { }
 };