diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-03-21 14:23:01 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-04-27 08:20:30 +0200 |
| commit | b14c112344996c3400bd588982e61fef7fe0ea64 (patch) | |
| tree | fcef93c451f88483273d91a30fe61dd9a22813e4 /arch/arm/boot | |
| parent | ARM: dts: sun9i: optimus: Switch to phy core regulator bindings for usb phys (diff) | |
| download | linux-b14c112344996c3400bd588982e61fef7fe0ea64.tar.xz linux-b14c112344996c3400bd588982e61fef7fe0ea64.zip | |
ARM: dts: sun6i: csq cs908 dts cleanup
Remove the unused usb1_vbus_pin_csq908 node (vbus is always on on the cs908),
and sort the remaining nodes alphabetically.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31s-cs908.dts | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31s-cs908.dts b/arch/arm/boot/dts/sun6i-a31s-cs908.dts index bc3734f67cf0..3f0cc8c58df8 100644 --- a/arch/arm/boot/dts/sun6i-a31s-cs908.dts +++ b/arch/arm/boot/dts/sun6i-a31s-cs908.dts @@ -55,10 +55,6 @@ compatible = "csq,cs908", "allwinner,sun6i-a31s"; }; -&usbphy { - status = "okay"; -}; - &ehci0 { status = "okay"; }; @@ -67,25 +63,6 @@ status = "okay"; }; -&ohci1 { - status = "okay"; -}; - -&pio { - usb1_vbus_pin_csq908: usb1_vbus_pin@0 { - allwinner,pins = "PC27"; - allwinner,function = "gpio_out"; - allwinner,drive = <SUN4I_PINCTRL_10_MA>; - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; - }; -}; - -&uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; - status = "okay"; -}; - &gmac { pinctrl-names = "default"; pinctrl-0 = <&gmac_pins_mii_a>; @@ -102,3 +79,17 @@ pinctrl-0 = <&ir_pins_a>; status = "okay"; }; + +&ohci1 { + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; +}; + +&usbphy { + status = "okay"; +}; |