leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-dm

Browse Source
This commit is contained in:
Tom Rini
2016-08-12 16:00:50 -04:00
parent ab65006b08 b647f55420
commit f4b0df1823
14 changed files with 100 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/core/device.c
View File

@@ -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)

2
drivers/gpio/mpc85xx_gpio.c
View File

@@ -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;

2
drivers/i2c/fsl_i2c.c
View File

@@ -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);

11
drivers/misc/misc-uclass.c
View File

@@ -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",

3
drivers/mmc/msm_sdhci.c
View File

@@ -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;

3
drivers/net/cpsw.c
View File

@@ -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)

4
drivers/power/pmic/act8846.c
View File

@@ -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;
}

4
drivers/power/regulator/act8846.c
View File

@@ -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;

5
drivers/spmi/spmi-msm.c
View File

@@ -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)