diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-12-17 00:59:57 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-01-21 11:58:57 +0300 |
| commit | 092a0c3b18ce8f2207591846dad5c9071ed2f832 (patch) | |
| tree | f9bfdb7753f5dc589815988b2cdb33af667825da /arch/arm/boot/dts/sun6i-a31-hummingbird.dts | |
| parent | 1f9f6a78735f56f5d718565b235c7e0188933e2d (diff) | |
| download | linux-092a0c3b18ce8f2207591846dad5c9071ed2f832.tar.xz | |
ARM: sunxi: DT: Convert the DTs to use a header for the pinctrl nodes
The pinctrl nodes require some extra opaque arguments for the pull up and drive
strength values.
Introduce a new header file and convert the device trees to replace these
opaque numbers by defines.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/sun6i-a31-hummingbird.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts index 7364d22b33dd..ebd5f7854b1b 100644 --- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts +++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts @@ -52,6 +52,7 @@ #include "sunxi-common-regulators.dtsi" #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/pinctrl/sun4i-a10.h> / { model = "Merrii A31 Hummingbird"; @@ -88,21 +89,21 @@ pio: pinctrl@01c20800 { mmc0_pins_a: mmc0@0 { /* external pull-ups missing for some pins */ - allwinner,pull = <1>; + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; }; mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 { allwinner,pins = "PA8"; allwinner,function = "gpio_in"; - allwinner,drive = <0>; - allwinner,pull = <1>; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; }; usb1_vbus_pin_a: usb1_vbus_pin@0 { allwinner,pins = "PH24"; allwinner,function = "gpio_out"; - allwinner,drive = <0>; - allwinner,pull = <0>; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; }; }; |