From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@free-electrons.com (Maxime Ripard) Date: Tue, 13 Jan 2015 17:20:53 +0100 Subject: [PATCH] ARM: dts: sun6i: Convert hummingbird a31 dts to label references In-Reply-To: References: <1421123484-21387-1-git-send-email-wens@csie.org> <20150113154415.GY4891@lukather> Message-ID: <20150113162053.GZ4891@lukather> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Jan 13, 2015 at 11:54:21PM +0800, Chen-Yu Tsai wrote: > On Tue, Jan 13, 2015 at 11:44 PM, Maxime Ripard > wrote: > > Hi, > > > > On Tue, Jan 13, 2015 at 12:31:24PM +0800, Chen-Yu Tsai wrote: > >> Using label references is preferred when override settings from the > >> included dtsi. > >> > >> Signed-off-by: Chen-Yu Tsai > >> --- > >> > >> My AXP221 series touches this file. I thought I'd convert it first. > >> > >> This looks like a lot of changes. But if you filter out all the > >> indentation changes, it's just the opening lines for each node. > >> > >> --- > >> arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 181 ++++++++++++++-------------- > >> 1 file changed, 88 insertions(+), 93 deletions(-) > >> > >> diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts > >> index ebd5f7854b1b..97dbaeb76416 100644 > >> --- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts > >> +++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts > >> @@ -61,101 +61,96 @@ > >> chosen { > >> bootargs = "earlyprintk console=ttyS0,115200"; > >> }; > >> +}; > >> + > >> +&mmc0 { > >> + pinctrl-names = "default"; > >> + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>; > >> + vmmc-supply = <®_vcc3v0>; > >> + bus-width = <4>; > >> + cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */ > >> + cd-inverted; > >> + status = "okay"; > >> +}; > >> + > >> +&usbphy { > >> + usb1_vbus-supply = <®_usb1_vbus>; > >> + status = "okay"; > >> +}; > >> + > >> +&ehci0 { > >> + status = "okay"; > >> +}; > >> + > >> +&ohci0 { > >> + status = "okay"; > >> +}; > >> + > >> +&pio { > >> + mmc0_cd_pin_hummingbird: mmc0_cd_pin at 0 { > >> + allwinner,pins = "PA8"; > >> + allwinner,function = "gpio_in"; > >> + allwinner,drive = ; > >> + allwinner,pull = ; > >> + }; > >> +}; > >> + > >> +&mmc0_pins_a { > >> + /* external pull-ups missing for some pins */ > >> + allwinner,pull = ; > >> +}; > >> + > >> +&usb1_vbus_pin_a { > >> + /* different pin from sunxi-common-regulators */ > >> + allwinner,pins = "PH24"; > >> +}; > >> + > >> +&uart0 { > >> + pinctrl-names = "default"; > >> + pinctrl-0 = <&uart0_pins_a>; > >> + status = "okay"; > >> +}; > >> + > >> +&i2c0 { > >> + pinctrl-names = "default"; > >> + pinctrl-0 = <&i2c0_pins_a>; > >> + /* pull-ups and devices require AXP221 DLDO3 */ > >> + status = "failed"; > >> +}; > > > > I think we should define a convention about how to sort these nodes > > before we actually start merging some of it. > > > > This of course also apply to the other patches doing that, hence why > > Hans is CC'd. > > > > I guess sorting them by label alphabetical order would make > > sense. What do you think? > > I'm currently using the ordering from the dtsi, which is based > on address. Even if it's not visible, if you're creating the > dts by looking at the dtsi and enabling the devices available, > that's the order you add them by, so it kind of makes sense. I know you're doing just that, and that it makes some kind of sense whenever you convert an old DTS to the label based syntax, but whenever you create a new one, it's a bit harder to get it right. And the fact that Hans didn't follow that convention illustrate that very well. I guess a sorting logic internal to the DTS itself would be much easier to understand and follow, hence why I suggested the alphabetical order: it just stands out without any external reference. -- 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: