summaryrefslogtreecommitdiff
path: root/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts
diff options
context:
space:
mode:
authorJagan Teki <jagan@amarulasolutions.com>2018-08-05 00:40:09 +0530
committerJagan Teki <jagan@amarulasolutions.com>2018-09-28 22:09:24 +0530
commitd1d4295aab97306454254989c8080f5093360af4 (patch)
tree60fe3196e8a0e3450c4d96af3e5eb4550774eea1 /arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts
parent13b36face7adebd790c0b201792ec47b77d2fb0c (diff)
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-mele-a1000g-quad.dts')
-rw-r--r--arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts23
1 files changed, 8 insertions, 15 deletions
diff --git a/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts
index 5faeae429e..bb14b171b1 100644
--- a/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -45,7 +45,6 @@
#include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
/ {
model = "Mele A1000G Quad top set box";
@@ -108,8 +107,7 @@
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
- cd-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
- cd-inverted;
+ cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
status = "okay";
};
@@ -128,24 +126,19 @@
&pio {
led_pins_m9: led_pins@0 {
- allwinner,pins = "PH13";
- allwinner,function = "gpio_out";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PH13";
+ function = "gpio_out";
};
mmc0_cd_pin_m9: mmc0_cd_pin@0 {
- allwinner,pins = "PH22";
- allwinner,function = "gpio_in";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- 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";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ pins = "PC27";
+ function = "gpio_out";
};
};