diff options
| author | Tom Rini <[email protected]> | 2018-02-19 11:39:39 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-02-19 11:39:39 -0500 |
| commit | d884c58f0c7b997fd7f04e360d86717e75de74b1 (patch) | |
| tree | 1426af3a541f4900e496ce4f15607da6631b1977 /drivers | |
| parent | ede52d04825d69a9aca4d048dae89f3b85e8f504 (diff) | |
| parent | c6b89f31806df06a5d7b688a65f9d2e6e6119a55 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/demo/demo-simple.c | 2 | ||||
| -rw-r--r-- | drivers/gpio/sandbox.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c index f069748e051..d05b1dfd871 100644 --- a/drivers/demo/demo-simple.c +++ b/drivers/demo/demo-simple.c @@ -17,7 +17,7 @@ static int simple_hello(struct udevice *dev, int ch) { const struct dm_demo_pdata *pdata = dev_get_platdata(dev); - printf("Hello from %08x: %s %d\n", map_to_sysmem(dev), pdata->colour, + printf("Hello from %08x: %s %d\n", (uint)map_to_sysmem(dev), pdata->colour, pdata->sides); return 0; diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c index 4f7b62eba0d..2a18f328576 100644 --- a/drivers/gpio/sandbox.c +++ b/drivers/gpio/sandbox.c @@ -198,7 +198,8 @@ static int sandbox_gpio_ofdata_to_platdata(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); - uc_priv->gpio_count = dev_read_u32_default(dev, "num-gpios", 0); + uc_priv->gpio_count = dev_read_u32_default(dev, "sandbox,gpio-count", + 0); uc_priv->bank_name = dev_read_string(dev, "gpio-bank-name"); return 0; |