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/sun4i-a10-hyundai-a7hd.dts | |
| parent | d29a58316137dfe32d69b4dff52bfe42551dc49f (diff) | |
| parent | 9ad93c0c968c8e6cd1273b73c44ec7262c616408 (diff) | |
| download | u-boot-cc49e2bdb8fbd47af28cb7e47696322586e9fff1.tar.gz u-boot-cc49e2bdb8fbd47af28cb7e47696322586e9fff1.tar.xz u-boot-cc49e2bdb8fbd47af28cb7e47696322586e9fff1.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/dts/sun4i-a10-hyundai-a7hd.dts')
| -rw-r--r-- | arch/arm/dts/sun4i-a10-hyundai-a7hd.dts | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/arch/arm/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/dts/sun4i-a10-hyundai-a7hd.dts index 9103864fef..f63767cddd 100644 --- a/arch/arm/dts/sun4i-a10-hyundai-a7hd.dts +++ b/arch/arm/dts/sun4i-a10-hyundai-a7hd.dts @@ -63,8 +63,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; status = "okay"; axp209: pmic@34 { @@ -78,12 +76,9 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; - cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ - cd-inverted; + cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ status = "okay"; }; @@ -92,18 +87,16 @@ }; &pio { - usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,drive = <SUN4I_PINCTRL_10_MA>; - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + usb0_id_detect_pin: usb0-id-detect-pin { + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; - usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,drive = <SUN4I_PINCTRL_10_MA>; - allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>; + usb0_vbus_detect_pin: usb0-vbus-detect-pin { + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; @@ -118,14 +111,10 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; -&usb2_vbus_pin_a { - allwinner,pins = "PH6"; -}; - &usb_otg { dr_mode = "otg"; status = "okay"; |