summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-03-21 14:23:01 +0100
committerMaxime Ripard <maxime.ripard@free-electrons.com>2015-04-27 08:20:30 +0200
commitb14c112344996c3400bd588982e61fef7fe0ea64 (patch)
treefcef93c451f88483273d91a30fe61dd9a22813e4 /arch/arm/boot
parentf1bf2b9b3d4b2bd4a49a2e3ddf4c947d366a150c (diff)
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.dts37
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";
+};