linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: sun6i: csq cs908 dts cleanup
@ 2015-03-21 13:23 Hans de Goede
  2015-03-23 14:01 ` Maxime Ripard
  0 siblings, 1 reply; 2+ messages in thread
From: Hans de Goede @ 2015-03-21 13:23 UTC (permalink / raw)
  To: linux-arm-kernel

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>
---
 arch/arm/boot/dts/sun6i-a31s-cs908.dts | 37 +++++++++++++---------------------
 1 file 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 bc3734f..3f0cc8c 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 at 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";
+};
-- 
2.3.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH] ARM: dts: sun6i: csq cs908 dts cleanup
  2015-03-21 13:23 [PATCH] ARM: dts: sun6i: csq cs908 dts cleanup Hans de Goede
@ 2015-03-23 14:01 ` Maxime Ripard
  0 siblings, 0 replies; 2+ messages in thread
From: Maxime Ripard @ 2015-03-23 14:01 UTC (permalink / raw)
  To: linux-arm-kernel

On Sat, Mar 21, 2015 at 02:23:01PM +0100, Hans de Goede wrote:
> 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>

Applied, thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150323/b1da81a2/attachment.sig>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-03-23 14:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-21 13:23 [PATCH] ARM: dts: sun6i: csq cs908 dts cleanup Hans de Goede
2015-03-23 14:01 ` Maxime Ripard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).