From: wens@csie.org (Chen-Yu Tsai)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 6/9] ARM: dts: sun9i: Convert a80 optimus board dts to label referencing
Date: Sat, 17 Jan 2015 13:19:31 +0800 [thread overview]
Message-ID: <1421471974-32719-7-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1421471974-32719-1-git-send-email-wens@csie.org>
The preferred method of referencing nodes from the dtsi is to use
labels, instead of copying the complete tree.
This patch converts sun9i-a80-optimus.dts to use label references.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
arch/arm/boot/dts/sun9i-a80-optimus.dts | 76 ++++++++++++++++-----------------
1 file changed, 37 insertions(+), 39 deletions(-)
diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index 58f5cb346519..d4f3866a8d0b 100644
--- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
@@ -61,45 +61,6 @@
bootargs = "earlyprintk console=ttyS0,115200";
};
- soc {
- pio: pinctrl at 06000800 {
- i2c3_pins_a: i2c3 at 0 {
- /* Enable internal pull-up */
- allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
- };
-
- led_pins_optimus: led-pins at 0 {
- allwinner,pins = "PH0", "PH1";
- allwinner,function = "gpio_out";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
- };
-
- uart4_pins_a: uart4 at 0 {
- /* Enable internal pull-up */
- allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
- };
- };
-
- uart0: serial at 07000000 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
- status = "okay";
- };
-
- uart4: serial at 07001000 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart4_pins_a>;
- status = "okay";
- };
-
- i2c3: i2c at 07003400 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c3_pins_a>;
- status = "okay";
- };
- };
-
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
@@ -120,3 +81,40 @@
};
};
};
+
+&i2c3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c3_pins_a>;
+ status = "okay";
+};
+
+&i2c3_pins_a {
+ /* Enable internal pull-up */
+ allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+};
+
+&pio {
+ led_pins_optimus: led-pins at 0 {
+ allwinner,pins = "PH0", "PH1";
+ 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";
+};
+
+&uart4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart4_pins_a>;
+ status = "okay";
+};
+
+&uart4_pins_a {
+ /* Enable internal pull-up */
+ allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+};
--
2.1.4
next prev parent reply other threads:[~2015-01-17 5:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-17 5:19 [PATCH v4 0/9] ARM: sun9i: Enable MMC support on Allwinner A80 Chen-Yu Tsai
2015-01-17 5:19 ` [PATCH v4 1/9] clk: sunxi: Add mod0 and mmc module clock support for A80 Chen-Yu Tsai
2015-01-19 21:49 ` Maxime Ripard
2015-01-17 5:19 ` [PATCH v4 2/9] clk: sunxi: Add driver for A80 MMC config clocks/resets Chen-Yu Tsai
2015-01-19 21:57 ` Maxime Ripard
2015-01-20 2:13 ` Chen-Yu Tsai
2015-01-20 8:16 ` Maxime Ripard
2015-01-17 5:19 ` [PATCH v4 3/9] ARM: dts: sun9i: Add clock-indices property for bus gate clocks Chen-Yu Tsai
2015-01-19 21:59 ` Maxime Ripard
2015-01-20 1:50 ` Chen-Yu Tsai
2015-01-17 5:19 ` [PATCH v4 4/9] ARM: dts: sun9i: Add mmc config clock nodes Chen-Yu Tsai
2015-01-19 22:02 ` Maxime Ripard
2015-01-17 5:19 ` [PATCH v4 5/9] ARM: dts: sun9i: Add mmc controller nodes to the A80 dtsi Chen-Yu Tsai
2015-01-19 22:05 ` Maxime Ripard
2015-01-17 5:19 ` Chen-Yu Tsai [this message]
2015-01-19 22:05 ` [PATCH v4 6/9] ARM: dts: sun9i: Convert a80 optimus board dts to label referencing Maxime Ripard
2015-01-17 5:19 ` [PATCH v4 7/9] ARM: dts: sun9i: Enable mmc0 on A80 Optimus Board Chen-Yu Tsai
2015-01-19 22:06 ` Maxime Ripard
2015-01-17 5:19 ` [PATCH v4 8/9] ARM: dts: sun9i: Add 8 bit mmc pinmux setting for mmc2 Chen-Yu Tsai
2015-01-19 22:06 ` Maxime Ripard
2015-01-17 5:19 ` [PATCH v4 9/9] ARM: dts: sun9i: Enable mmc2 on A80 Optimus Board Chen-Yu Tsai
2015-01-19 22:07 ` Maxime Ripard
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=1421471974-32719-7-git-send-email-wens@csie.org \
--to=wens@csie.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.