On 01/08/2019 at 10:26, Ludovic Desroches wrote: > On Thu, Aug 01, 2019 at 12:00:45AM +0200, Uwe Kleine-König wrote: >> >> - newline between properties and sub-nodes >> - use tags from included dtsi instead of duplicating the hierarchy >> - status should be the last property >> - drop duplicated alias >> >> There are no differences in the generated .dtb >> >> Signed-off-by: Uwe Kleine-König <uwe@xxxxxxxxxxxxxxxxx> > Acked-by: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx> > >> --- >> Hello, >> >> these are the style rules I was teached when modifying imx dts files. >> Do they apply to at91, too? > > Hello Uwe, > > It's okay for me, we had no guidelines at the beginning, that explain > some inconsistency among our dt files. We tend to follow these rules > excepted the use of labels. > > I would like to be sure that Nicolas and Alexandre are on the same > wavelength than me. After I had been reluctant to use them (another syntax to learn in addition to learning DT, remember, back in the days...), I'm now okay to use labels as they are so convenient and widely used. Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx> Thanks Uwe! Best regards, Nicolas >> arch/arm/boot/dts/at91-ariettag25.dts | 87 +++++++++++++-------------- >> 1 file changed, 43 insertions(+), 44 deletions(-) >> >> diff --git a/arch/arm/boot/dts/at91-ariettag25.dts b/arch/arm/boot/dts/at91-ariettag25.dts >> index 7a34c4dc05d2..8f9f5a22cbf6 100644 >> --- a/arch/arm/boot/dts/at91-ariettag25.dts >> +++ b/arch/arm/boot/dts/at91-ariettag25.dts >> @@ -6,14 +6,11 @@ >> */ >> /dts-v1/; >> #include "at91sam9g25.dtsi" >> + >> / { >> model = "Acme Systems Arietta G25"; >> compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9"; >> >> - aliases { >> - serial0 = &dbgu; >> - }; >> - >> chosen { >> stdout-path = "serial0:115200n8"; >> }; >> @@ -34,55 +31,16 @@ >> >> ahb { >> apb { >> - mmc0: mmc@f0008000 { >> - pinctrl-0 = < >> - &pinctrl_mmc0_slot0_clk_cmd_dat0 >> - &pinctrl_mmc0_slot0_dat1_3>; >> - status = "okay"; >> - >> - slot@0 { >> - reg = <0>; >> - bus-width = <4>; >> - }; >> - }; >> - >> - tcb0: timer@f8008000 { >> - timer@0 { >> - compatible = "atmel,tcb-timer"; >> - reg = <0>; >> - }; >> - >> - timer@1 { >> - compatible = "atmel,tcb-timer"; >> - reg = <1>; >> - }; >> - }; >> - >> - usb2: gadget@f803c000 { >> - status = "okay"; >> - }; >> - >> - dbgu: serial@fffff200 { >> - status = "okay"; >> - }; >> - >> rtc@fffffeb0 { >> status = "okay"; >> }; >> }; >> >> - usb0: ohci@600000 { >> - status = "okay"; >> - num-ports = <3>; >> - }; >> - >> - usb1: ehci@700000 { >> - status = "okay"; >> - }; >> }; >> >> leds { >> compatible = "gpio-leds"; >> + >> arietta_led { >> label = "arietta_led"; >> gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */ >> @@ -90,3 +48,44 @@ >> }; >> }; >> }; >> + >> +&dbgu { >> + status = "okay"; >> +}; >> + >> +&mmc0 { >> + pinctrl-0 = < >> + &pinctrl_mmc0_slot0_clk_cmd_dat0 >> + &pinctrl_mmc0_slot0_dat1_3>; >> + status = "okay"; >> + >> + slot@0 { >> + reg = <0>; >> + bus-width = <4>; >> + }; >> +}; >> + >> +&tcb0 { >> + timer@0 { >> + compatible = "atmel,tcb-timer"; >> + reg = <0>; >> + }; >> + >> + timer@1 { >> + compatible = "atmel,tcb-timer"; >> + reg = <1>; >> + }; >> +}; >> + >> +&usb0 { >> + num-ports = <3>; >> + status = "okay"; >> +}; >> + >> +&usb1 { >> + status = "okay"; >> +}; >> + >> +&usb2 { >> + status = "okay"; >> +}; >> -- >> 2.20.1 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- Nicolas Ferre