diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-09-23 14:28:10 +0300 |
|---|---|---|
| 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-a31-mele-a1000g-quad.dts | |
| parent | 119c366aeae35e2322d3e31a7ac0d23679252777 (diff) | |
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-a31-mele-a1000g-quad.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts index a29ea186b964..bf0f5831126f 100644 --- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts +++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts @@ -128,19 +128,19 @@ &pio { led_pins_m9: led_pins@0 { - allwinner,pins = "PH13"; - allwinner,function = "gpio_out"; + pins = "PH13"; + function = "gpio_out"; }; mmc0_cd_pin_m9: mmc0_cd_pin@0 { - allwinner,pins = "PH22"; - allwinner,function = "gpio_in"; - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + pins = "PH22"; + function = "gpio_in"; + bias-pull-up; }; usb1_vbus_pin_m9: usb1_vbus_pin@0 { - allwinner,pins = "PC27"; - allwinner,function = "gpio_out"; + pins = "PC27"; + function = "gpio_out"; }; }; |