From: "Andreas Färber" <afaerber@suse.de>
To: linux-amlogic@lists.infradead.org
Cc: "Carlo Caione" <carlo@caione.org>,
"Kevin Hilman" <khilman@baylibre.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, "Andreas Färber" <afaerber@suse.de>,
"Rob Herring" <robh+dt@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will.deacon@arm.com>,
devicetree@vger.kernel.org
Subject: [PATCH 12/18] ARM64: dts: meson-gxbb-vega-s95: Reorder nodes
Date: Fri, 20 Jan 2017 23:21:12 +0100 [thread overview]
Message-ID: <20170120222118.21476-13-afaerber@suse.de> (raw)
In-Reply-To: <20170120222118.21476-1-afaerber@suse.de>
Sort nodes referenced by label alphabetically.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
.../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 51 +++++++++++-----------
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index e688e8971a95..81024886d232 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -111,11 +111,10 @@
};
};
-&uart_AO {
+ðmac {
status = "okay";
- pinctrl-0 = <&uart_ao_a_pins>;
+ pinctrl-0 = <ð_rgmii_pins>;
pinctrl-names = "default";
-
};
&ir {
@@ -124,27 +123,12 @@
pinctrl-names = "default";
};
-ðmac {
+&pwm_ef {
status = "okay";
- pinctrl-0 = <ð_rgmii_pins>;
+ pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default";
-};
-
-&usb0_phy {
- status = "okay";
- phy-supply = <&usb_vbus>;
-};
-
-&usb1_phy {
- status = "okay";
-};
-
-&usb0 {
- status = "okay";
-};
-
-&usb1 {
- status = "okay";
+ clocks = <&clkc CLKID_FCLK_DIV4>;
+ clock-names = "clkin0";
};
/* Wireless SDIO Module */
@@ -210,10 +194,25 @@
vmmcq-sumpply = <&vcc_1v8>;
};
-&pwm_ef {
+&uart_AO {
status = "okay";
- pinctrl-0 = <&pwm_e_pins>;
+ pinctrl-0 = <&uart_ao_a_pins>;
pinctrl-names = "default";
- clocks = <&clkc CLKID_FCLK_DIV4>;
- clock-names = "clkin0";
+};
+
+&usb0_phy {
+ status = "okay";
+ phy-supply = <&usb_vbus>;
+};
+
+&usb1_phy {
+ status = "okay";
+};
+
+&usb0 {
+ status = "okay";
+};
+
+&usb1 {
+ status = "okay";
};
--
2.10.2
next prev parent reply other threads:[~2017-01-20 22:23 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 22:21 [PATCH 00/18] ARM64: meson: DT cleanups Andreas Färber
2017-01-20 22:21 ` [PATCH 01/18] Documentation: devicetree: amlogic: Reorder boards Andreas Färber
2017-01-23 16:48 ` Rob Herring
2017-01-23 18:36 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 02/18] ARM64: dts: amlogic: Sort Makefile Andreas Färber
2017-01-20 22:21 ` [PATCH 03/18] ARM64: dts: meson-gxbb-vega-s95: Fix Wifi node name Andreas Färber
2017-01-20 22:21 ` [PATCH 04/18] ARM64: dts: meson-gxbb-p20x: " Andreas Färber
2017-01-23 8:55 ` Neil Armstrong
2017-01-23 16:50 ` Rob Herring
2017-01-23 16:57 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 05/18] ARM64: dts: meson-gx-p23x-q20x: " Andreas Färber
2017-01-23 8:55 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 06/18] ARM64: dts: meson-gxm-nexbox-a1: Drop UART comment Andreas Färber
2017-01-23 8:55 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 07/18] ARM64: dts: meson-gxl-s905x: Comment typo fix Andreas Färber
2017-01-23 8:56 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 08/18] ARM64: dts: meson-gxm: Drop trailing white line Andreas Färber
2017-01-20 22:21 ` [PATCH 09/18] ARM64: dts: meson-gxbb-wetek-hub: Reference CVBS node by label Andreas Färber
2017-01-20 22:21 ` [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes Andreas Färber
2017-01-23 16:52 ` Rob Herring
2017-01-23 16:56 ` Andreas Färber
2017-01-30 14:59 ` Russell King - ARM Linux
2017-01-20 22:21 ` [PATCH 11/18] ARM64: dts: meson-gxbb-odroidc2: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber [this message]
2017-01-20 22:21 ` [PATCH 13/18] ARM64: dts: meson-gxbb-nexbox-a95x: " Andreas Färber
2017-01-23 8:57 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 14/18] ARM64: dts: meson-gxbb-p20x: " Andreas Färber
2017-01-20 22:21 ` [PATCH 15/18] ARM64: dts: meson-gxl: " Andreas Färber
2017-01-23 8:57 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 16/18] ARM64: dts: meson-gxl-s905x-nexbox-a95x: " Andreas Färber
2017-01-23 8:58 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 17/18] ARM64: dts: meson-gxm-nexbox-a1: " Andreas Färber
2017-01-23 8:58 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 18/18] ARM64: dts: meson-gx-p23x-q20x: " Andreas Färber
2017-01-23 8:58 ` Neil Armstrong
2017-01-23 18:46 ` [PATCH 00/18] ARM64: meson: DT cleanups Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170120222118.21476-13-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=carlo@caione.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).