diff options
| author | Simon Glass <sjg@chromium.org> | 2018-02-03 10:36:59 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2018-02-18 15:53:32 -0700 |
| commit | 995b60b5937133639500d89a01da0d88af3cff15 (patch) | |
| tree | 9f64725d6b96f2d194435c55bf3cb963371ea54b | |
| parent | 7e87816caa2b54e7cca9aca9b29981e54fcd0496 (diff) | |
| download | u-boot-995b60b5937133639500d89a01da0d88af3cff15.zip u-boot-995b60b5937133639500d89a01da0d88af3cff15.tar.gz u-boot-995b60b5937133639500d89a01da0d88af3cff15.tar.bz2 | |
sandbox: Rename 'num-gpios' property to avoid dtc warning
At present dtc produces these warnings when compiling sandbox:
arch/sandbox/dts/test.dtb: Warning (gpios_property):
Could not get phandle node for /base-gpios:num-gpios(cell 0)
arch/sandbox/dts/test.dtb: Warning (gpios_property):
Missing property '#gpio-cells' in node /reset-ctl or bad phandle
(referred from /extra-gpios:num-gpios[0])
Both are due to it assuming that the 'num-gpios' property holds a phandle
pointing to a GPIO node.
To avoid these warnings, rename the sandbox property so that it does not
include the string 'gpios'.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/sandbox/dts/sandbox.dts | 4 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 4 | ||||
| -rw-r--r-- | drivers/gpio/sandbox.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index 0aba6c9..1fb8225 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -70,7 +70,7 @@ compatible = "sandbox,gpio"; #gpio-cells = <1>; gpio-bank-name = "a"; - num-gpios = <20>; + sandbox,gpio-count = <20>; }; gpio_b: gpios@1 { @@ -78,7 +78,7 @@ compatible = "sandbox,gpio"; #gpio-cells = <2>; gpio-bank-name = "b"; - num-gpios = <10>; + sandbox,gpio-count = <10>; }; hexagon { diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index c38e369..b0f0ca8 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -177,7 +177,7 @@ gpio-controller; #gpio-cells = <1>; gpio-bank-name = "a"; - num-gpios = <20>; + sandbox,gpio-count = <20>; }; gpio_b: extra-gpios { @@ -185,7 +185,7 @@ gpio-controller; #gpio-cells = <5>; gpio-bank-name = "b"; - num-gpios = <10>; + sandbox,gpio-count = <10>; }; i2c@0 { diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c index 4f7b62e..2a18f32 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; |