diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-29 11:48:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-29 11:48:02 -0400 |
| commit | cc49e2bdb8fbd47af28cb7e47696322586e9fff1 (patch) | |
| tree | 927dc0d043ae3ab0d2ff12b225fad746a4936dc0 /arch/arm/dts/sun6i-a31-m9.dts | |
| parent | d29a58316137dfe32d69b4dff52bfe42551dc49f (diff) | |
| parent | 9ad93c0c968c8e6cd1273b73c44ec7262c616408 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/dts/sun6i-a31-m9.dts')
| -rw-r--r-- | arch/arm/dts/sun6i-a31-m9.dts | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/arch/arm/dts/sun6i-a31-m9.dts b/arch/arm/dts/sun6i-a31-m9.dts index 29016a13a2..9698f6d38d 100644 --- a/arch/arm/dts/sun6i-a31-m9.dts +++ b/arch/arm/dts/sun6i-a31-m9.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 M9 top set box"; @@ -108,8 +107,7 @@ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>; vmmc-supply = <®_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"; }; }; |