diff options
author | Tom Rini <trini@konsulko.com> | 2016-08-12 16:00:50 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-08-12 16:00:50 -0400 |
commit | f4b0df1823921ad3bc39820466e9c5201cef6210 (patch) | |
tree | fa7ae4f3ac018bc010b7910da55ebb76e3639489 /drivers | |
parent | ab65006b08c5a2d022b1ce43581e555c82926cd4 (diff) | |
parent | b647f55420310beb8f576e23f3b6a69745126f71 (diff) | |
download | u-boot-f4b0df1823921ad3bc39820466e9c5201cef6210.zip u-boot-f4b0df1823921ad3bc39820466e9c5201cef6210.tar.gz u-boot-f4b0df1823921ad3bc39820466e9c5201cef6210.tar.bz2 |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/core/device.c | 2 | ||||
-rw-r--r-- | drivers/gpio/mpc85xx_gpio.c | 2 | ||||
-rw-r--r-- | drivers/i2c/fsl_i2c.c | 2 | ||||
-rw-r--r-- | drivers/misc/misc-uclass.c | 11 | ||||
-rw-r--r-- | drivers/mmc/msm_sdhci.c | 3 | ||||
-rw-r--r-- | drivers/net/cpsw.c | 3 | ||||
-rw-r--r-- | drivers/power/pmic/act8846.c | 4 | ||||
-rw-r--r-- | drivers/power/regulator/act8846.c | 4 | ||||
-rw-r--r-- | drivers/spmi/spmi-msm.c | 5 |
9 files changed, 25 insertions, 11 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 5bb1d77..b737f1c 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -671,7 +671,7 @@ fdt_addr_t dev_get_addr_index(struct udevice *dev, int index) addr = fdtdec_get_addr_size_auto_parent(gd->fdt_blob, dev->parent->of_offset, dev->of_offset, "reg", - index, NULL); + index, NULL, false); if (CONFIG_IS_ENABLED(SIMPLE_BUS) && addr != FDT_ADDR_T_NONE) { if (device_get_uclass_id(dev->parent) == UCLASS_SIMPLE_BUS) diff --git a/drivers/gpio/mpc85xx_gpio.c b/drivers/gpio/mpc85xx_gpio.c index 3754a82..168c696 100644 --- a/drivers/gpio/mpc85xx_gpio.c +++ b/drivers/gpio/mpc85xx_gpio.c @@ -170,7 +170,7 @@ static int mpc85xx_gpio_ofdata_to_platdata(struct udevice *dev) { fdt_size_t size; addr = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, dev->of_offset, - "reg", 0, &size); + "reg", 0, &size, false); plat->addr = addr; plat->size = size; diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 407c4a7..c3f826d 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -587,7 +587,7 @@ static int fsl_i2c_ofdata_to_platdata(struct udevice *bus) fdt_size_t size; addr = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, bus->of_offset, - "reg", 0, &size); + "reg", 0, &size, false); dev->base = map_sysmem(CONFIG_SYS_IMMR + addr, size); diff --git a/drivers/misc/misc-uclass.c b/drivers/misc/misc-uclass.c index 13a6ea5..d9eea3d 100644 --- a/drivers/misc/misc-uclass.c +++ b/drivers/misc/misc-uclass.c @@ -45,6 +45,17 @@ int misc_ioctl(struct udevice *dev, unsigned long request, void *buf) return ops->ioctl(dev, request, buf); } +int misc_call(struct udevice *dev, int msgid, void *tx_msg, int tx_size, + void *rx_msg, int rx_size) +{ + const struct misc_ops *ops = device_get_ops(dev); + + if (!ops->call) + return -ENOSYS; + + return ops->call(dev, msgid, tx_msg, tx_size, rx_msg, rx_size); +} + UCLASS_DRIVER(misc) = { .id = UCLASS_MISC, .name = "misc", diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index a8cb9e2..8d4399e 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -178,7 +178,8 @@ static int msm_ofdata_to_platdata(struct udevice *dev) priv->base = (void *)fdtdec_get_addr_size_auto_parent(gd->fdt_blob, parent->of_offset, dev->of_offset, - "reg", 1, NULL); + "reg", 1, NULL, + false); if (priv->base == (void *)FDT_ADDR_T_NONE || host->ioaddr == (void *)FDT_ADDR_T_NONE) return -EINVAL; diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index 511a965..81ccc61 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -1146,7 +1146,8 @@ static const struct eth_ops cpsw_eth_ops = { static inline fdt_addr_t cpsw_get_addr_by_node(const void *fdt, int node) { - return fdtdec_get_addr_size_auto_noparent(fdt, node, "reg", 0, NULL); + return fdtdec_get_addr_size_auto_noparent(fdt, node, "reg", 0, NULL, + false); } static int cpsw_eth_ofdata_to_platdata(struct udevice *dev) diff --git a/drivers/power/pmic/act8846.c b/drivers/power/pmic/act8846.c index ff096b3..e8164bf 100644 --- a/drivers/power/pmic/act8846.c +++ b/drivers/power/pmic/act8846.c @@ -29,7 +29,7 @@ static int act8846_write(struct udevice *dev, uint reg, const uint8_t *buff, int len) { if (dm_i2c_write(dev, reg, buff, len)) { - debug("write error to device: %p register: %#x!", dev, reg); + debug("write error to device: %p register: %#x!\n", dev, reg); return -EIO; } @@ -39,7 +39,7 @@ static int act8846_write(struct udevice *dev, uint reg, const uint8_t *buff, static int act8846_read(struct udevice *dev, uint reg, uint8_t *buff, int len) { if (dm_i2c_read(dev, reg, buff, len)) { - debug("read error from device: %p register: %#x!", dev, reg); + debug("read error from device: %p register: %#x!\n", dev, reg); return -EIO; } diff --git a/drivers/power/regulator/act8846.c b/drivers/power/regulator/act8846.c index 255f8b0..d506165 100644 --- a/drivers/power/regulator/act8846.c +++ b/drivers/power/regulator/act8846.c @@ -88,7 +88,7 @@ static int reg_get_value(struct udevice *dev) int reg = dev->driver_data; int ret; - ret = pmic_reg_read(dev->parent, reg); + ret = pmic_reg_read(dev->parent, addr_vol[reg]); if (ret < 0) return ret; @@ -120,7 +120,7 @@ static bool reg_get_enable(struct udevice *dev) int reg = dev->driver_data; int ret; - ret = pmic_reg_read(dev->parent, reg); + ret = pmic_reg_read(dev->parent, addr_ctl[reg]); if (ret < 0) return ret; diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c index 0cef505..48bc157 100644 --- a/drivers/spmi/spmi-msm.c +++ b/drivers/spmi/spmi-msm.c @@ -153,11 +153,12 @@ static int msm_spmi_probe(struct udevice *dev) priv->spmi_core = fdtdec_get_addr_size_auto_parent(gd->fdt_blob, parent->of_offset, dev->of_offset, - "reg", 1, NULL); + "reg", 1, NULL, + false); priv->spmi_obs = fdtdec_get_addr_size_auto_parent(gd->fdt_blob, parent->of_offset, dev->of_offset, "reg", - 2, NULL); + 2, NULL, false); if (priv->arb_chnl == FDT_ADDR_T_NONE || priv->spmi_core == FDT_ADDR_T_NONE || priv->spmi_obs == FDT_ADDR_T_NONE) |