[PATCH v2 12/30] ARM: sun5i: a10s: olinuxino micro: Convert to DT label based syntax

public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed

From: maxime.ripard@free-electrons.com (Maxime Ripard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 12/30] ARM: sun5i: a10s: olinuxino micro: Convert to DT label based syntax
Date: Wed, 11 Feb 2015 10:01:11 +0100	[thread overview]
Message-ID: <1423645289-1074-13-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1423645289-1074-1-git-send-email-maxime.ripard@free-electrons.com>

In order to lessen the amount of duplication of the DT tree, ease the
new and follow the trend that prefers to use label based references
when overriding DTSI nodes, convert the board to this syntax

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 315 +++++++++++------------
 1 file changed, 157 insertions(+), 158 deletions(-)

diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index 2bbc93b935ca..aa88ee887381 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -65,184 +65,183 @@
 		serial2 = &uart3;
 	};
 
-	soc at 01c00000 {
-		emac: ethernet at 01c0b000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&emac_pins_a>;
-			phy = <&phy1>;
-			status = "okay";
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&led_pins_olinuxino>;
+
+		green {
+			label = "a10s-olinuxino-micro:green:usr";
+			gpios = <&pio 4 3 GPIO_ACTIVE_HIGH>;
+			default-state = "on";
 		};
+	};
+};
 
-		mdio at 01c0b080 {
-			status = "okay";
+&ehci0 {
+	status = "okay";
+};
 
-			phy1: ethernet-phy at 1 {
-				reg = <1>;
-			};
-		};
+&emac {
+	pinctrl-names = "default";
+	pinctrl-0 = <&emac_pins_a>;
+	phy = <&phy1>;
+	status = "okay";
+};
 
-		mmc0: mmc at 01c0f000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
-			vmmc-supply = <&reg_vcc3v3>;
-			bus-width = <4>;
-			cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
-			cd-inverted;
-			status = "okay";
-		};
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins_a>;
+	status = "okay";
+};
 
-		mmc1: mmc at 01c10000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
-			vmmc-supply = <&reg_vcc3v3>;
-			bus-width = <4>;
-			cd-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
-			cd-inverted;
-			status = "okay";
-		};
+&i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1_pins_a>;
+	status = "okay";
 
-		usbphy: phy at 01c13400 {
-			usb1_vbus-supply = <&reg_usb1_vbus>;
-			status = "okay";
-		};
+	at24 at 50 {
+		compatible = "at,24c16";
+		pagesize = <16>;
+		reg = <0x50>;
+		read-only;
+	};
+};
 
-		ehci0: usb at 01c14000 {
-			status = "okay";
-		};
+&i2c2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c2_pins_a>;
+	status = "okay";
+};
 
-		ohci0: usb at 01c14400 {
-			status = "okay";
-		};
+&lradc {
+	vref-supply = <&reg_vcc3v0>;
+	status = "okay";
 
-		pinctrl at 01c20800 {
-			mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin at 0 {
-				allwinner,pins = "PG1";
-				allwinner,function = "gpio_in";
-				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
-			};
-
-			mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin at 0 {
-				allwinner,pins = "PG13";
-				allwinner,function = "gpio_in";
-				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
-			};
-
-			led_pins_olinuxino: led_pins at 0 {
-				allwinner,pins = "PE3";
-				allwinner,function = "gpio_out";
-				allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-			};
-
-			usb1_vbus_pin_olinuxino_m: usb1_vbus_pin at 0 {
-				allwinner,pins = "PB10";
-				allwinner,function = "gpio_out";
-				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-			};
-		};
+	button at 191 {
+		label = "Volume Up";
+		linux,code = <KEY_VOLUMEUP>;
+		channel = <0>;
+		voltage = <191274>;
+	};
 
-		lradc: lradc at 01c22800 {
-			vref-supply = <&reg_vcc3v0>;
-			status = "okay";
-
-			button at 191 {
-				label = "Volume Up";
-				linux,code = <KEY_VOLUMEUP>;
-				channel = <0>;
-				voltage = <191274>;
-			};
-
-			button at 392 {
-				label = "Volume Down";
-				linux,code = <KEY_VOLUMEDOWN>;
-				channel = <0>;
-				voltage = <392644>;
-			};
-
-			button at 601 {
-				label = "Menu";
-				linux,code = <KEY_MENU>;
-				channel = <0>;
-				voltage = <601151>;
-			};
-
-			button at 795 {
-				label = "Enter";
-				linux,code = <KEY_ENTER>;
-				channel = <0>;
-				voltage = <795090>;
-			};
-
-			button at 987 {
-				label = "Home";
-				linux,code = <KEY_HOMEPAGE>;
-				channel = <0>;
-				voltage = <987387>;
-			};
-		};
+	button at 392 {
+		label = "Volume Down";
+		linux,code = <KEY_VOLUMEDOWN>;
+		channel = <0>;
+		voltage = <392644>;
+	};
 
-		uart0: serial at 01c28000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&uart0_pins_a>;
-			status = "okay";
-		};
+	button at 601 {
+		label = "Menu";
+		linux,code = <KEY_MENU>;
+		channel = <0>;
+		voltage = <601151>;
+	};
 
-		uart2: serial at 01c28800 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&uart2_pins_a>;
-			status = "okay";
-		};
+	button at 795 {
+		label = "Enter";
+		linux,code = <KEY_ENTER>;
+		channel = <0>;
+		voltage = <795090>;
+	};
 
-		uart3: serial at 01c28c00 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&uart3_pins_a>;
-			status = "okay";
-		};
+	button at 987 {
+		label = "Home";
+		linux,code = <KEY_HOMEPAGE>;
+		channel = <0>;
+		voltage = <987387>;
+	};
+};
 
-		i2c0: i2c at 01c2ac00 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&i2c0_pins_a>;
-			status = "okay";
-		};
+&mdio {
+	status = "okay";
 
-		i2c1: i2c at 01c2b000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&i2c1_pins_a>;
-			status = "okay";
-
-			at24 at 50 {
-				compatible = "at,24c16";
-				pagesize = <16>;
-				reg = <0x50>;
-				read-only;
-			};
-		};
+	phy1: ethernet-phy at 1 {
+		reg = <1>;
+	};
+};
 
-		i2c2: i2c at 01c2b400 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&i2c2_pins_a>;
-			status = "okay";
-		};
+&mmc0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
+	vmmc-supply = <&reg_vcc3v3>;
+	bus-width = <4>;
+	cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
+	cd-inverted;
+	status = "okay";
+};
+
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
+	vmmc-supply = <&reg_vcc3v3>;
+	bus-width = <4>;
+	cd-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
+	cd-inverted;
+	status = "okay";
+};
+
+&ohci0 {
+	status = "okay";
+};
+
+&pio {
+	mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin at 0 {
+		allwinner,pins = "PG1";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
 	};
 
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-names = "default";
-		pinctrl-0 = <&led_pins_olinuxino>;
+	mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin at 0 {
+		allwinner,pins = "PG13";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
 
-		green {
-			label = "a10s-olinuxino-micro:green:usr";
-			gpios = <&pio 4 3 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
-		};
+	led_pins_olinuxino: led_pins at 0 {
+		allwinner,pins = "PE3";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 	};
 
-	reg_usb1_vbus: usb1-vbus {
-		pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
-		gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
-		status = "okay";
+	usb1_vbus_pin_olinuxino_m: usb1_vbus_pin at 0 {
+		allwinner,pins = "PB10";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 	};
 };
+
+&reg_usb1_vbus {
+	pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
+	gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_pins_a>;
+	status = "okay";
+};
+
+&uart2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart2_pins_a>;
+	status = "okay";
+};
+
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3_pins_a>;
+	status = "okay";
+};
+
+&usbphy {
+	usb1_vbus-supply = <&reg_usb1_vbus>;
+	status = "okay";
+};
+
-- 
2.3.0

next prev parent reply	other threads:[~2015-02-11  9:01 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-11  9:00 [PATCH v2 00/30] ARM: dt: sunxi: DT cleanups Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 01/30] ARM: sun5i: Add a DTSI common to A10s and A13 Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 02/30] ARM: sun5i: a13: Move to the common sun5i DTSI Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 03/30] ARM: sun5i: a10s: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 04/30] ARM: sun4i: a1000: Convert to DT label based syntax Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 05/30] ARM: sun4i: ba10 tvbox: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 06/30] ARM: sun4i: cubieboard: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 07/30] ARM: sun4i: hackberry: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 08/30] ARM: sun4i: inet97fv2: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 09/30] ARM: sun4i: mini xplus: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 10/30] ARM: sun4i: olinuxino lime: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 11/30] ARM: sun4i: pcduino: " Maxime Ripard
2015-02-11  9:01 ` Maxime Ripard [this message]
2015-02-11  9:01 ` [PATCH v2 13/30] ARM: sun5i: a10s: r7 tv dongle: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 14/30] ARM: sun5i: a13: hsg h702: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 15/30] ARM: sun5i: a13: olinuxino micro: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 16/30] ARM: sun5i: a13: olinuxino: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 17/30] ARM: sun6i: app4 evb1: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 18/30] ARM: sun6i: colombus: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 19/30] ARM: sun6i: m9: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 20/30] ARM: sun7i: bananapi: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 21/30] ARM: sun7i: cubieboard2: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 22/30] ARM: sun7i: cubietruck: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 23/30] ARM: sun7i: hummingbird: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 24/30] ARM: sun7i: i12 tvbox: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 25/30] ARM: sun7i: m3: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 26/30] ARM: sun7i: olinuxino lime: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 27/30] ARM: sun7i: olinuxino lime2: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 28/30] ARM: sun7i: olinuxino micro: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 29/30] ARM: sun7i: pcduino3: " Maxime Ripard
2015-02-11  9:01 ` [PATCH v2 30/30] ARM: sun8i: ippo q8h v5: " Maxime Ripard
2015-02-23  9:43 ` [PATCH v2 00/30] ARM: dt: sunxi: DT cleanups Maxime Ripard

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:2bbc93b935c dfblob:aa88ee88738 )
 OR (
bs:"[PATCH v2 12/30] ARM: sun5i: a10s: olinuxino micro: Convert to DT label based syntax" )
	(help)

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=1423645289-1074-13-git-send-email-maxime.ripard@free-electrons.com \
    --to=maxime.ripard@free-electrons.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox