diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-09-23 13:28:10 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-12-26 08:27:11 +0100 |
| commit | 1edcd36fcb48fe841bcc62eda36c105037d9583c (patch) | |
| tree | c67dbb1620c841cac42bf4e347284ca69ee5efb6 /arch/arm/boot/dts/sun6i-a31s-primo81.dts | |
| parent | ARM: sunxi: Remove useless allwinner,pull property (diff) | |
| download | linux-1edcd36fcb48fe841bcc62eda36c105037d9583c.tar.xz linux-1edcd36fcb48fe841bcc62eda36c105037d9583c.zip | |
ARM: sunxi: Convert pinctrl nodes to generic bindings
Now that we can handle the generic pinctrl bindings, convert our DT to it.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/sun6i-a31s-primo81.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31s-primo81.dts | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts index f511aa0e250d..2238eda318f6 100644 --- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts +++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts @@ -134,20 +134,20 @@ &pio { gt911_int_primo81: gt911_int_pin@0 { - allwinner,pins = "PA3"; - allwinner,function = "gpio_in"; + pins = "PA3"; + function = "gpio_in"; }; mma8452_int_primo81: mma8452_int_pin@0 { - allwinner,pins = "PA9"; - allwinner,function = "gpio_in"; - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + pins = "PA9"; + function = "gpio_in"; + bias-pull-up; }; mmc0_cd_pin_primo81: mmc0_cd_pin@0 { - allwinner,pins = "PA8"; - allwinner,function = "gpio_in"; - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + pins = "PA8"; + function = "gpio_in"; + bias-pull-up; }; }; |