diff options
| author | Jagan Teki <jagan@amarulasolutions.com> | 2018-08-05 00:40:09 +0530 |
|---|---|---|
| committer | Jagan Teki <jagan@amarulasolutions.com> | 2018-09-28 22:09:24 +0530 |
| commit | d1d4295aab97306454254989c8080f5093360af4 (patch) | |
| tree | 60fe3196e8a0e3450c4d96af3e5eb4550774eea1 /arch/arm/dts/sun6i-a31-app4-evb1.dts | |
| parent | 13b36face7adebd790c0b201792ec47b77d2fb0c (diff) | |
| download | u-boot-d1d4295aab97306454254989c8080f5093360af4.tar.gz | |
ARM: dts: sun6i: Update A31/A31s dts(i) files from Linux-v4.18-rc3
Update all A31/A31s devicetree dtsi and dtsi files from
Linux-v4.18-rc3 with below commit:
commit b240b419db5d624ce7a5a397d6f62a1a686009ec
Merge: 9c2dd8405c0c 518d2f43c358
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu Apr 5 21:18:09 2018 -0700
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Diffstat (limited to 'arch/arm/dts/sun6i-a31-app4-evb1.dts')
| -rw-r--r-- | arch/arm/dts/sun6i-a31-app4-evb1.dts | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/dts/sun6i-a31-app4-evb1.dts b/arch/arm/dts/sun6i-a31-app4-evb1.dts index 2f8cfab771..7f34323a66 100644 --- a/arch/arm/dts/sun6i-a31-app4-evb1.dts +++ b/arch/arm/dts/sun6i-a31-app4-evb1.dts @@ -47,7 +47,6 @@ #include "sunxi-common-regulators.dtsi" #include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/pinctrl/sun4i-a10.h> / { model = "Allwinner A31 APP4 EVB1 Evaluation Board"; @@ -68,10 +67,8 @@ &pio { usb1_vbus_pin_a: usb1_vbus_pin@0 { - allwinner,pins = "PH27"; - allwinner,function = "gpio_out"; - allwinner,drive = <SUN4I_PINCTRL_10_MA>; - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + pins = "PH27"; + function = "gpio_out"; }; }; |