diff options
| author | Tom Rini | 2018-09-29 11:48:02 -0400 |
|---|---|---|
| committer | Tom Rini | 2018-09-29 11:48:02 -0400 |
| commit | cc49e2bdb8fbd47af28cb7e47696322586e9fff1 (patch) | |
| tree | 927dc0d043ae3ab0d2ff12b225fad746a4936dc0 /arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.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-a31s-yones-toptech-bs1078-v2.dts')
| -rw-r--r-- | arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts index d6ad6196a76..aab6c1720ef 100644 --- a/arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts +++ b/arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts @@ -45,7 +45,6 @@ #include "sunxi-common-regulators.dtsi" #include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/pinctrl/sun4i-a10.h> / { model = "Yones TopTech BS1078 v2 Tablet"; @@ -92,10 +91,9 @@ &pio { mmc0_cd_pin_bs1078v2: mmc0_cd_pin@0 { - allwinner,pins = "PA8"; - allwinner,function = "gpio_in"; - allwinner,drive = <SUN4I_PINCTRL_10_MA>; - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + pins = "PA8"; + function = "gpio_in"; + bias-pull-up; }; }; @@ -104,13 +102,12 @@ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bs1078v2>; vmmc-supply = <®_vcc3v0>; bus-width = <4>; - cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */ - cd-inverted; + cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ status = "okay"; }; &mmc0_pins_a { - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + bias-pull-up; }; &p2wi { |