mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-29 08:00:26 +09:00
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>
This commit is contained in:
parent
3af86a4e23
commit
911f3aef35
@ -701,7 +701,7 @@ int device_set_name(struct udevice *dev, const char *name)
|
|||||||
return 0;
|
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;
|
const void *fdt = gd->fdt_blob;
|
||||||
|
|
||||||
|
@ -40,8 +40,8 @@ static unsigned long __invoke_psci_fn_smc(unsigned long function_id,
|
|||||||
static int psci_bind(struct udevice *dev)
|
static int psci_bind(struct udevice *dev)
|
||||||
{
|
{
|
||||||
/* No SYSTEM_RESET support for PSCI 0.1 */
|
/* No SYSTEM_RESET support for PSCI 0.1 */
|
||||||
if (of_device_is_compatible(dev, "arm,psci-0.2") ||
|
if (device_is_compatible(dev, "arm,psci-0.2") ||
|
||||||
of_device_is_compatible(dev, "arm,psci-1.0")) {
|
device_is_compatible(dev, "arm,psci-1.0")) {
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* bind psci-sysreset optionally */
|
/* bind psci-sysreset optionally */
|
||||||
|
@ -454,7 +454,7 @@ static int xenon_sdhci_ofdata_to_platdata(struct udevice *dev)
|
|||||||
host->name = dev->name;
|
host->name = dev->name;
|
||||||
host->ioaddr = (void *)devfdt_get_addr(dev);
|
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);
|
priv->pad_ctrl_reg = (void *)devfdt_get_addr_index(dev, 1);
|
||||||
|
|
||||||
name = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "marvell,pad-type",
|
name = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "marvell,pad-type",
|
||||||
|
@ -104,10 +104,10 @@ int ti_cm_get_macid(struct udevice *dev, int slave, u8 *mac_addr)
|
|||||||
if (of_machine_is_compatible("ti,am33xx"))
|
if (of_machine_is_compatible("ti,am33xx"))
|
||||||
return cpsw_am33xx_cm_get_macid(dev, 0x630, slave, mac_addr);
|
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);
|
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);
|
return cpsw_am33xx_cm_get_macid(dev, 0x30, slave, mac_addr);
|
||||||
|
|
||||||
if (of_machine_is_compatible("ti,am43"))
|
if (of_machine_is_compatible("ti,am43"))
|
||||||
|
@ -1695,7 +1695,7 @@ static int mvneta_probe(struct udevice *dev)
|
|||||||
pp->base = (void __iomem *)pdata->iobase;
|
pp->base = (void __iomem *)pdata->iobase;
|
||||||
|
|
||||||
/* Configure MBUS address windows */
|
/* 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);
|
mvneta_bypass_mbus_windows(pp);
|
||||||
else
|
else
|
||||||
mvneta_conf_mbus_windows(pp);
|
mvneta_conf_mbus_windows(pp);
|
||||||
|
@ -135,10 +135,10 @@ static int comphy_probe(struct udevice *dev)
|
|||||||
return -EINVAL;
|
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;
|
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;
|
chip_cfg->ptr_comphy_chip_init = comphy_cp110_init;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -121,7 +121,7 @@ static int ehci_mvebu_probe(struct udevice *dev)
|
|||||||
* Also, the address decoder doesn't need to get setup with this
|
* Also, the address decoder doesn't need to get setup with this
|
||||||
* SoC, so don't call usb_brg_adrdec_setup().
|
* 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;
|
marvell_ehci_ops.powerup_fixup = marvell_ehci_powerup_fixup;
|
||||||
else
|
else
|
||||||
usb_brg_adrdec_setup((void *)priv->hcd_base);
|
usb_brg_adrdec_setup((void *)priv->hcd_base);
|
||||||
|
@ -55,7 +55,7 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
|
|||||||
/* Get the base address for usbphy from the device node */
|
/* Get the base address for usbphy from the device node */
|
||||||
for (device_find_first_child(dev, &child); child;
|
for (device_find_first_child(dev, &child); child;
|
||||||
device_find_next_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;
|
continue;
|
||||||
plat->phy_base = devfdt_get_addr(child);
|
plat->phy_base = devfdt_get_addr(child);
|
||||||
break;
|
break;
|
||||||
|
@ -563,7 +563,7 @@ int device_set_name(struct udevice *dev, const char *name);
|
|||||||
void device_set_name_alloced(struct udevice *dev);
|
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.
|
* 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
|
* device
|
||||||
* @return true if OK, false if the compatible is not found
|
* @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
|
* of_machine_is_compatible() - check if the machine is compatible with
|
||||||
|
Loading…
Reference in New Issue
Block a user