dm: core: Rename of_device_is_compatible()

The of_ prefix conflicts with the livetree version of this function.
Rename it to avoid problems when we add livetree support.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 363c183..f5e8541 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -701,7 +701,7 @@ int device_set_name(struct udevice *dev, const char *name)
        return 0;
 }
 
-bool of_device_is_compatible(struct udevice *dev, const char *compat)
+bool device_is_compatible(struct udevice *dev, const char *compat)
 {
        const void *fdt = gd->fdt_blob;
 

diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 7652cc2..451fbde 100644 (file)
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -40,8 +40,8 @@ static unsigned long __invoke_psci_fn_smc(unsigned long function_id,
 static int psci_bind(struct udevice *dev)
 {
        /* No SYSTEM_RESET support for PSCI 0.1 */
-       if (of_device_is_compatible(dev, "arm,psci-0.2") ||
-           of_device_is_compatible(dev, "arm,psci-1.0")) {
+       if (device_is_compatible(dev, "arm,psci-0.2") ||
+           device_is_compatible(dev, "arm,psci-1.0")) {
                int ret;
 
                /* bind psci-sysreset optionally */

diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c
index 6cd176f..2b7cb7f 100644 (file)
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -454,7 +454,7 @@ static int xenon_sdhci_ofdata_to_platdata(struct udevice *dev)
        host->name = dev->name;
        host->ioaddr = (void *)devfdt_get_addr(dev);
 
-       if (of_device_is_compatible(dev, "marvell,armada-3700-sdhci"))
+       if (device_is_compatible(dev, "marvell,armada-3700-sdhci"))
                priv->pad_ctrl_reg = (void *)devfdt_get_addr_index(dev, 1);
 
        name = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "marvell,pad-type",

diff --git a/drivers/net/cpsw-common.c b/drivers/net/cpsw-common.c
index 55f56d9..8970ee0 100644 (file)
--- a/drivers/net/cpsw-common.c
+++ b/drivers/net/cpsw-common.c
@@ -104,10 +104,10 @@ int ti_cm_get_macid(struct udevice *dev, int slave, u8 *mac_addr)
        if (of_machine_is_compatible("ti,am33xx"))
                return cpsw_am33xx_cm_get_macid(dev, 0x630, slave, mac_addr);
 
-       if (of_device_is_compatible(dev, "ti,am3517-emac"))
+       if (device_is_compatible(dev, "ti,am3517-emac"))
                return davinci_emac_3517_get_macid(dev, 0x110, slave, mac_addr);
 
-       if (of_device_is_compatible(dev, "ti,dm816-emac"))
+       if (device_is_compatible(dev, "ti,dm816-emac"))
                return cpsw_am33xx_cm_get_macid(dev, 0x30, slave, mac_addr);
 
        if (of_machine_is_compatible("ti,am43"))

diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index af07b28..50577d7 100644 (file)
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -1695,7 +1695,7 @@ static int mvneta_probe(struct udevice *dev)
        pp->base = (void __iomem *)pdata->iobase;
 
        /* Configure MBUS address windows */
-       if (of_device_is_compatible(dev, "marvell,armada-3700-neta"))
+       if (device_is_compatible(dev, "marvell,armada-3700-neta"))
                mvneta_bypass_mbus_windows(pp);
        else
                mvneta_conf_mbus_windows(pp);

diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index ccf024b..426db30 100644 (file)
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c
@@ -135,10 +135,10 @@ static int comphy_probe(struct udevice *dev)
                return -EINVAL;
        }
 
-       if (of_device_is_compatible(dev, "marvell,comphy-armada-3700"))
+       if (device_is_compatible(dev, "marvell,comphy-armada-3700"))
                chip_cfg->ptr_comphy_chip_init = comphy_a3700_init;
 
-       if (of_device_is_compatible(dev, "marvell,comphy-cp110"))
+       if (device_is_compatible(dev, "marvell,comphy-cp110"))
                chip_cfg->ptr_comphy_chip_init = comphy_cp110_init;
 
        /*

diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 56409df..7a0f208 100644 (file)
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -121,7 +121,7 @@ static int ehci_mvebu_probe(struct udevice *dev)
         * Also, the address decoder doesn't need to get setup with this
         * SoC, so don't call usb_brg_adrdec_setup().
         */
-       if (of_device_is_compatible(dev, "marvell,armada3700-ehci"))
+       if (device_is_compatible(dev, "marvell,armada3700-ehci"))
                marvell_ehci_ops.powerup_fixup = marvell_ehci_powerup_fixup;
        else
                usb_brg_adrdec_setup((void *)priv->hcd_base);

diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c
index 5e7130f..38e1c68 100644 (file)
--- a/drivers/usb/host/xhci-rockchip.c
+++ b/drivers/usb/host/xhci-rockchip.c
@@ -55,7 +55,7 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
        /* Get the base address for usbphy from the device node */
        for (device_find_first_child(dev, &child); child;
             device_find_next_child(&child)) {
-               if (!of_device_is_compatible(child, "rockchip,rk3399-usb3-phy"))
+               if (!device_is_compatible(child, "rockchip,rk3399-usb3-phy"))
                        continue;
                plat->phy_base = devfdt_get_addr(child);
                break;

diff --git a/include/dm/device.h b/include/dm/device.h
index 489cf33..4866f7c 100644 (file)
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -563,7 +563,7 @@ int device_set_name(struct udevice *dev, const char *name);
 void device_set_name_alloced(struct udevice *dev);
 
 /**
- * of_device_is_compatible() - check if the device is compatible with the compat
+ * device_is_compatible() - check if the device is compatible with the compat
  *
  * This allows to check whether the device is comaptible with the compat.
  *
@@ -572,7 +572,7 @@ void device_set_name_alloced(struct udevice *dev);
  *             device
  * @return true if OK, false if the compatible is not found
  */
-bool of_device_is_compatible(struct udevice *dev, const char *compat);
+bool device_is_compatible(struct udevice *dev, const char *compat);
 
 /**
  * of_machine_is_compatible() - check if the machine is compatible with