diff options
| author | Yoshinori Sato <ysato@users.sourceforge.jp> | 2019-06-02 08:46:11 +0200 |
|---|---|---|
| committer | Yoshinori Sato <ysato@users.sourceforge.jp> | 2019-06-02 08:46:11 +0200 |
| commit | 860dbce3d8dd90cb9e909c58fa79808766243651 (patch) | |
| tree | f68920c82fa779ae37bbce08a58259e5c3934ab3 /arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | |
| parent | Fix allyesconfig output. (diff) | |
| parent | Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | linux-860dbce3d8dd90cb9e909c58fa79808766243651.tar.xz linux-860dbce3d8dd90cb9e909c58fa79808766243651.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'arch/arm/boot/dts/sun7i-a20-cubieboard2.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts index 200685b0b1cb..08e5a5abf8cc 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts @@ -173,14 +173,6 @@ status = "okay"; }; -&pio { - usb0_id_detect_pin: usb0-id-detect-pin { - pins = "PH4"; - function = "gpio_in"; - bias-pull-up; - }; -}; - ®_ahci_5v { status = "okay"; }; @@ -236,9 +228,7 @@ }; &usbphy { - pinctrl-names = "default"; - pinctrl-0 = <&usb0_id_detect_pin>; - usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; |