diff options
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/acpi_i2c.c | 2 | ||||
-rw-r--r-- | drivers/i2c/acpi_i2c.h | 2 | ||||
-rw-r--r-- | drivers/i2c/ast_i2c.c | 4 | ||||
-rw-r--r-- | drivers/i2c/at91_i2c.c | 4 | ||||
-rw-r--r-- | drivers/i2c/cros_ec_tunnel.c | 4 | ||||
-rw-r--r-- | drivers/i2c/designware_i2c.c | 4 | ||||
-rw-r--r-- | drivers/i2c/designware_i2c.h | 2 | ||||
-rw-r--r-- | drivers/i2c/designware_i2c_pci.c | 6 | ||||
-rw-r--r-- | drivers/i2c/exynos_hs_i2c.c | 4 | ||||
-rw-r--r-- | drivers/i2c/fsl_i2c.c | 4 | ||||
-rw-r--r-- | drivers/i2c/i2c-cdns.c | 4 | ||||
-rw-r--r-- | drivers/i2c/i2c-cortina.c | 4 | ||||
-rw-r--r-- | drivers/i2c/i2c-gpio.c | 4 | ||||
-rw-r--r-- | drivers/i2c/i2c-uclass.c | 6 | ||||
-rw-r--r-- | drivers/i2c/iproc_i2c.c | 4 | ||||
-rw-r--r-- | drivers/i2c/muxes/pca954x.c | 4 | ||||
-rw-r--r-- | drivers/i2c/mvtwsi.c | 4 | ||||
-rw-r--r-- | drivers/i2c/omap24xx_i2c.c | 4 | ||||
-rw-r--r-- | drivers/i2c/rk_i2c.c | 4 | ||||
-rw-r--r-- | drivers/i2c/s3c24x0_i2c.c | 4 | ||||
-rw-r--r-- | drivers/i2c/stm32f7_i2c.c | 4 |
21 files changed, 41 insertions, 41 deletions
diff --git a/drivers/i2c/acpi_i2c.c b/drivers/i2c/acpi_i2c.c index ef12789e7f..142f41178c 100644 --- a/drivers/i2c/acpi_i2c.c +++ b/drivers/i2c/acpi_i2c.c @@ -174,7 +174,7 @@ int acpi_i2c_fill_ssdt(const struct udevice *dev, struct acpi_ctx *ctx) return 0; } -int acpi_i2c_ofdata_to_platdata(struct udevice *dev) +int acpi_i2c_of_to_plat(struct udevice *dev) { struct acpi_i2c_priv *priv = dev_get_priv(dev); diff --git a/drivers/i2c/acpi_i2c.h b/drivers/i2c/acpi_i2c.h index 1f4be29601..fc6616ade6 100644 --- a/drivers/i2c/acpi_i2c.h +++ b/drivers/i2c/acpi_i2c.h @@ -10,6 +10,6 @@ extern struct acpi_ops acpi_i2c_ops; -int acpi_i2c_ofdata_to_platdata(struct udevice *dev); +int acpi_i2c_of_to_plat(struct udevice *dev); #endif diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c index 9a223d8828..3aa8ad1cf8 100644 --- a/drivers/i2c/ast_i2c.c +++ b/drivers/i2c/ast_i2c.c @@ -87,7 +87,7 @@ static void ast_i2c_init_bus(struct udevice *dev) | I2CD_INTR_ABNORMAL, &priv->regs->icr); } -static int ast_i2c_ofdata_to_platdata(struct udevice *dev) +static int ast_i2c_of_to_plat(struct udevice *dev) { struct ast_i2c_priv *priv = dev_get_priv(dev); int ret; @@ -351,7 +351,7 @@ U_BOOT_DRIVER(ast_i2c) = { .id = UCLASS_I2C, .of_match = ast_i2c_ids, .probe = ast_i2c_probe, - .ofdata_to_platdata = ast_i2c_ofdata_to_platdata, + .of_to_plat = ast_i2c_of_to_plat, .priv_auto = sizeof(struct ast_i2c_priv), .ops = &ast_i2c_ops, }; diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c index db2fbc9d66..3eb6db4878 100644 --- a/drivers/i2c/at91_i2c.c +++ b/drivers/i2c/at91_i2c.c @@ -219,7 +219,7 @@ int at91_i2c_get_bus_speed(struct udevice *dev) return bus->speed; } -static int at91_i2c_ofdata_to_platdata(struct udevice *dev) +static int at91_i2c_of_to_plat(struct udevice *dev) { const void *blob = gd->fdt_blob; struct at91_i2c_bus *bus = dev_get_priv(dev); @@ -317,7 +317,7 @@ U_BOOT_DRIVER(i2c_at91) = { .id = UCLASS_I2C, .of_match = at91_i2c_ids, .probe = at91_i2c_probe, - .ofdata_to_platdata = at91_i2c_ofdata_to_platdata, + .of_to_plat = at91_i2c_of_to_plat, .per_child_auto = sizeof(struct dm_i2c_chip), .priv_auto = sizeof(struct at91_i2c_bus), .ops = &at91_i2c_ops, diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c index 1cc5c0618e..970b91cfd3 100644 --- a/drivers/i2c/cros_ec_tunnel.c +++ b/drivers/i2c/cros_ec_tunnel.c @@ -29,7 +29,7 @@ static int cros_ec_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, return cros_ec_i2c_tunnel(dev->parent, i2c_bus->remote_bus, msg, nmsgs); } -static int cros_ec_i2c_ofdata_to_platdata(struct udevice *dev) +static int cros_ec_i2c_of_to_plat(struct udevice *dev) { struct cros_ec_i2c_bus *i2c_bus = dev_get_priv(dev); const void *blob = gd->fdt_blob; @@ -55,7 +55,7 @@ U_BOOT_DRIVER(cros_ec_tunnel) = { .name = "cros_ec_tunnel", .id = UCLASS_I2C, .of_match = cros_ec_i2c_ids, - .ofdata_to_platdata = cros_ec_i2c_ofdata_to_platdata, + .of_to_plat = cros_ec_i2c_of_to_plat, .priv_auto = sizeof(struct cros_ec_i2c_bus), .ops = &cros_ec_i2c_ops, }; diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c index 1a083d959f..60111b8419 100644 --- a/drivers/i2c/designware_i2c.c +++ b/drivers/i2c/designware_i2c.c @@ -762,7 +762,7 @@ static int designware_i2c_probe_chip(struct udevice *bus, uint chip_addr, return ret; } -int designware_i2c_ofdata_to_platdata(struct udevice *bus) +int designware_i2c_of_to_plat(struct udevice *bus) { struct dw_i2c *priv = dev_get_priv(bus); int ret; @@ -842,7 +842,7 @@ U_BOOT_DRIVER(i2c_designware) = { .name = "i2c_designware", .id = UCLASS_I2C, .of_match = designware_i2c_ids, - .ofdata_to_platdata = designware_i2c_ofdata_to_platdata, + .of_to_plat = designware_i2c_of_to_plat, .probe = designware_i2c_probe, .priv_auto = sizeof(struct dw_i2c), .remove = designware_i2c_remove, diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h index 18acf4e841..9b2349a0a2 100644 --- a/drivers/i2c/designware_i2c.h +++ b/drivers/i2c/designware_i2c.h @@ -212,7 +212,7 @@ extern const struct dm_i2c_ops designware_i2c_ops; int designware_i2c_probe(struct udevice *bus); int designware_i2c_remove(struct udevice *dev); -int designware_i2c_ofdata_to_platdata(struct udevice *bus); +int designware_i2c_of_to_plat(struct udevice *bus); /** * dw_i2c_gen_speed_config() - Calculate config info from requested speed diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c index d62805aa51..8d7b1fe6df 100644 --- a/drivers/i2c/designware_i2c_pci.c +++ b/drivers/i2c/designware_i2c_pci.c @@ -34,7 +34,7 @@ static struct dw_scl_sda_cfg byt_config = { /* Have a weak function for now - possibly should be a new uclass */ __weak void lpss_reset_release(void *regs); -static int designware_i2c_pci_ofdata_to_platdata(struct udevice *dev) +static int designware_i2c_pci_of_to_plat(struct udevice *dev) { struct dw_i2c *priv = dev_get_priv(dev); @@ -71,7 +71,7 @@ static int designware_i2c_pci_ofdata_to_platdata(struct udevice *dev) if (dev_get_driver_data(dev) == INTEL_APL) priv->has_spk_cnt = true; - return designware_i2c_ofdata_to_platdata(dev); + return designware_i2c_of_to_plat(dev); } static int designware_i2c_pci_probe(struct udevice *dev) @@ -211,7 +211,7 @@ U_BOOT_DRIVER(i2c_designware_pci) = { .id = UCLASS_I2C, .of_match = designware_i2c_pci_ids, .bind = designware_i2c_pci_bind, - .ofdata_to_platdata = designware_i2c_pci_ofdata_to_platdata, + .of_to_plat = designware_i2c_pci_of_to_plat, .probe = designware_i2c_pci_probe, .priv_auto = sizeof(struct dw_i2c), .remove = designware_i2c_remove, diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c index 2ef6f53a8b..7dbf0a4752 100644 --- a/drivers/i2c/exynos_hs_i2c.c +++ b/drivers/i2c/exynos_hs_i2c.c @@ -517,7 +517,7 @@ static int s3c24x0_i2c_probe(struct udevice *dev, uint chip, uint chip_flags) return ret != I2C_OK; } -static int s3c_i2c_ofdata_to_platdata(struct udevice *dev) +static int s3c_i2c_of_to_plat(struct udevice *dev) { const void *blob = gd->fdt_blob; struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev); @@ -557,7 +557,7 @@ U_BOOT_DRIVER(hs_i2c) = { .name = "i2c_s3c_hs", .id = UCLASS_I2C, .of_match = exynos_hs_i2c_ids, - .ofdata_to_platdata = s3c_i2c_ofdata_to_platdata, + .of_to_plat = s3c_i2c_of_to_plat, .priv_auto = sizeof(struct s3c24x0_i2c_bus), .ops = &exynos_hs_i2c_ops, }; diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index f55b475197..875d30762e 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -573,7 +573,7 @@ static int fsl_i2c_set_bus_speed(struct udevice *bus, uint speed) return __i2c_set_bus_speed(dev->base, speed, dev->i2c_clk); } -static int fsl_i2c_ofdata_to_platdata(struct udevice *bus) +static int fsl_i2c_of_to_plat(struct udevice *bus) { struct fsl_i2c_dev *dev = dev_get_priv(bus); struct clk clock; @@ -649,7 +649,7 @@ U_BOOT_DRIVER(i2c_fsl) = { .id = UCLASS_I2C, .of_match = fsl_i2c_ids, .probe = fsl_i2c_probe, - .ofdata_to_platdata = fsl_i2c_ofdata_to_platdata, + .of_to_plat = fsl_i2c_of_to_plat, .priv_auto = sizeof(struct fsl_i2c_dev), .ops = &fsl_i2c_ops, }; diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c index 2cf22330e0..db3c04fa6e 100644 --- a/drivers/i2c/i2c-cdns.c +++ b/drivers/i2c/i2c-cdns.c @@ -460,7 +460,7 @@ static int cdns_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, return ret; } -static int cdns_i2c_ofdata_to_platdata(struct udevice *dev) +static int cdns_i2c_of_to_plat(struct udevice *dev) { struct i2c_cdns_bus *i2c_bus = dev_get_priv(dev); struct cdns_i2c_platform_data *pdata = @@ -503,7 +503,7 @@ U_BOOT_DRIVER(cdns_i2c) = { .name = "i2c_cdns", .id = UCLASS_I2C, .of_match = cdns_i2c_of_match, - .ofdata_to_platdata = cdns_i2c_ofdata_to_platdata, + .of_to_plat = cdns_i2c_of_to_plat, .priv_auto = sizeof(struct i2c_cdns_bus), .ops = &cdns_i2c_ops, }; diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c index 420dfdbab9..960ae8c700 100644 --- a/drivers/i2c/i2c-cortina.c +++ b/drivers/i2c/i2c-cortina.c @@ -322,7 +322,7 @@ static int ca_i2c_probe(struct udevice *bus) return 0; } -static int ca_i2c_ofdata_to_platdata(struct udevice *bus) +static int ca_i2c_of_to_plat(struct udevice *bus) { struct ca_i2c *priv = dev_get_priv(bus); @@ -339,7 +339,7 @@ U_BOOT_DRIVER(i2c_cortina) = { .name = "i2c_cortina", .id = UCLASS_I2C, .of_match = ca_i2c_ids, - .ofdata_to_platdata = ca_i2c_ofdata_to_platdata, + .of_to_plat = ca_i2c_of_to_plat, .probe = ca_i2c_probe, .priv_auto = sizeof(struct ca_i2c), .ops = &ca_i2c_ops, diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c index 9b2f6f20a9..8bd96a074e 100644 --- a/drivers/i2c/i2c-gpio.c +++ b/drivers/i2c/i2c-gpio.c @@ -329,7 +329,7 @@ static int i2c_gpio_drv_probe(struct udevice *dev) return 0; } -static int i2c_gpio_ofdata_to_platdata(struct udevice *dev) +static int i2c_gpio_of_to_plat(struct udevice *dev) { struct i2c_gpio_bus *bus = dev_get_priv(dev); int ret; @@ -371,7 +371,7 @@ U_BOOT_DRIVER(i2c_gpio) = { .id = UCLASS_I2C, .of_match = i2c_gpio_ids, .probe = i2c_gpio_drv_probe, - .ofdata_to_platdata = i2c_gpio_ofdata_to_platdata, + .of_to_plat = i2c_gpio_of_to_plat, .priv_auto = sizeof(struct i2c_gpio_bus), .ops = &i2c_gpio_ops, }; diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c index e81420558d..490437bd42 100644 --- a/drivers/i2c/i2c-uclass.c +++ b/drivers/i2c/i2c-uclass.c @@ -617,7 +617,7 @@ int i2c_deblock(struct udevice *bus) } #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -int i2c_chip_ofdata_to_platdata(struct udevice *dev, struct dm_i2c_chip *chip) +int i2c_chip_of_to_plat(struct udevice *dev, struct dm_i2c_chip *chip) { int addr; @@ -680,7 +680,7 @@ static int i2c_child_post_bind(struct udevice *dev) if (!dev_of_valid(dev)) return 0; - return i2c_chip_ofdata_to_platdata(dev, plat); + return i2c_chip_of_to_plat(dev, plat); #else return 0; #endif @@ -765,7 +765,7 @@ U_BOOT_DRIVER(i2c_generic_chip_drv) = { .id = UCLASS_I2C_GENERIC, .of_match = generic_chip_i2c_ids, #if CONFIG_IS_ENABLED(ACPIGEN) - .ofdata_to_platdata = acpi_i2c_ofdata_to_platdata, + .of_to_plat = acpi_i2c_of_to_plat, .priv_auto = sizeof(struct acpi_i2c_priv), #endif ACPI_OPS_PTR(&acpi_i2c_ops) diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c index 20e2595733..83301bbf1b 100644 --- a/drivers/i2c/iproc_i2c.c +++ b/drivers/i2c/iproc_i2c.c @@ -672,7 +672,7 @@ static int iproc_i2c_probe(struct udevice *bus) return iproc_i2c_init(bus); } -static int iproc_i2c_ofdata_to_platdata(struct udevice *bus) +static int iproc_i2c_of_to_plat(struct udevice *bus) { struct iproc_i2c *bus_prvdata = dev_get_priv(bus); int node = dev_of_offset(bus); @@ -705,7 +705,7 @@ U_BOOT_DRIVER(iproc_i2c) = { .name = "iproc_i2c", .id = UCLASS_I2C, .of_match = iproc_i2c_ids, - .ofdata_to_platdata = iproc_i2c_ofdata_to_platdata, + .of_to_plat = iproc_i2c_of_to_plat, .probe = iproc_i2c_probe, .priv_auto = sizeof(struct iproc_i2c), .ops = &iproc_i2c_ops, diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c index 06efe84676..d21a84c4fa 100644 --- a/drivers/i2c/muxes/pca954x.c +++ b/drivers/i2c/muxes/pca954x.c @@ -108,7 +108,7 @@ static const struct udevice_id pca954x_ids[] = { { } }; -static int pca954x_ofdata_to_platdata(struct udevice *dev) +static int pca954x_of_to_plat(struct udevice *dev) { struct pca954x_priv *priv = dev_get_priv(dev); const struct chip_desc *chip = &chips[dev_get_driver_data(dev)]; @@ -171,6 +171,6 @@ U_BOOT_DRIVER(pca954x) = { .probe = pca954x_probe, .remove = pca954x_remove, .ops = &pca954x_ops, - .ofdata_to_platdata = pca954x_ofdata_to_platdata, + .of_to_plat = pca954x_of_to_plat, .priv_auto = sizeof(struct pca954x_priv), }; diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index dd9cfebdfe..1fcb8c698b 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -794,7 +794,7 @@ static int mvtwsi_i2c_set_bus_speed(struct udevice *bus, uint speed) return 0; } -static int mvtwsi_i2c_ofdata_to_platdata(struct udevice *bus) +static int mvtwsi_i2c_of_to_plat(struct udevice *bus) { struct mvtwsi_i2c_dev *dev = dev_get_priv(bus); @@ -888,7 +888,7 @@ U_BOOT_DRIVER(i2c_mvtwsi) = { .of_match = mvtwsi_i2c_ids, .bind = mvtwsi_i2c_bind, .probe = mvtwsi_i2c_probe, - .ofdata_to_platdata = mvtwsi_i2c_ofdata_to_platdata, + .of_to_plat = mvtwsi_i2c_of_to_plat, .priv_auto = sizeof(struct mvtwsi_i2c_dev), .ops = &mvtwsi_i2c_ops, }; diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index 9d05a1f702..322d72132b 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -1063,7 +1063,7 @@ static int omap_i2c_probe(struct udevice *bus) } #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -static int omap_i2c_ofdata_to_platdata(struct udevice *bus) +static int omap_i2c_of_to_plat(struct udevice *bus) { struct omap_i2c_platdata *plat = dev_get_plat(bus); @@ -1093,7 +1093,7 @@ U_BOOT_DRIVER(i2c_omap) = { .id = UCLASS_I2C, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_i2c_ids, - .ofdata_to_platdata = omap_i2c_ofdata_to_platdata, + .of_to_plat = omap_i2c_of_to_plat, .plat_auto = sizeof(struct omap_i2c_platdata), #endif .probe = omap_i2c_probe, diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c index e9717e530c..704bafe238 100644 --- a/drivers/i2c/rk_i2c.c +++ b/drivers/i2c/rk_i2c.c @@ -375,7 +375,7 @@ int rockchip_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) return 0; } -static int rockchip_i2c_ofdata_to_platdata(struct udevice *bus) +static int rockchip_i2c_of_to_plat(struct udevice *bus) { struct rk_i2c *priv = dev_get_priv(bus); int ret; @@ -489,7 +489,7 @@ U_BOOT_DRIVER(rockchip_rk3066_i2c) = { .name = "rockchip_rk3066_i2c", .id = UCLASS_I2C, .of_match = rockchip_i2c_ids, - .ofdata_to_platdata = rockchip_i2c_ofdata_to_platdata, + .of_to_plat = rockchip_i2c_of_to_plat, .probe = rockchip_i2c_probe, .priv_auto = sizeof(struct rk_i2c), .ops = &rockchip_i2c_ops, diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index ca94d2950e..ff2c3452a3 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -302,7 +302,7 @@ static int s3c24x0_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, return ret ? -EREMOTEIO : 0; } -static int s3c_i2c_ofdata_to_platdata(struct udevice *dev) +static int s3c_i2c_of_to_plat(struct udevice *dev) { const void *blob = gd->fdt_blob; struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev); @@ -342,7 +342,7 @@ U_BOOT_DRIVER(i2c_s3c) = { .name = "i2c_s3c", .id = UCLASS_I2C, .of_match = s3c_i2c_ids, - .ofdata_to_platdata = s3c_i2c_ofdata_to_platdata, + .of_to_plat = s3c_i2c_of_to_plat, .priv_auto = sizeof(struct s3c24x0_i2c_bus), .ops = &s3c_i2c_ops, }; diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c index 483d83409f..6553bdc610 100644 --- a/drivers/i2c/stm32f7_i2c.c +++ b/drivers/i2c/stm32f7_i2c.c @@ -901,7 +901,7 @@ clk_free: return ret; } -static int stm32_ofdata_to_platdata(struct udevice *dev) +static int stm32_of_to_plat(struct udevice *dev) { struct stm32_i2c_priv *i2c_priv = dev_get_priv(dev); u32 rise_time, fall_time; @@ -953,7 +953,7 @@ U_BOOT_DRIVER(stm32f7_i2c) = { .name = "stm32f7-i2c", .id = UCLASS_I2C, .of_match = stm32_i2c_of_match, - .ofdata_to_platdata = stm32_ofdata_to_platdata, + .of_to_plat = stm32_of_to_plat, .probe = stm32_i2c_probe, .priv_auto = sizeof(struct stm32_i2c_priv), .ops = &stm32_i2c_ops, |