| Message ID | 20190812212757.23432-6-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | c1ad3ffb182e31eb445b7afbb0c02c70a3eef48f |
| Headers | show |
| Series | [1/9] ARM: dts: at91: Add label for sam9x5's internal RTC | expand |
On 12/08/2019 23:27:54+0200, Uwe Kleine-König wrote: > - use tags from included dtsi instead of duplicating the hierarchy > > There are no differences in the generated .dtbs > > Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> > --- > arch/arm/boot/dts/at91sam9g15.dtsi | 28 ++++++++++++---------------- > 1 file changed, 12 insertions(+), 16 deletions(-) > Applied, thanks.
diff --git a/arch/arm/boot/dts/at91sam9g15.dtsi b/arch/arm/boot/dts/at91sam9g15.dtsi index d77c69ad7f02..dde88276fe52 100644 --- a/arch/arm/boot/dts/at91sam9g15.dtsi +++ b/arch/arm/boot/dts/at91sam9g15.dtsi @@ -11,22 +11,18 @@ / { model = "Atmel AT91SAM9G15 SoC"; compatible = "atmel,at91sam9g15", "atmel,at91sam9x5"; +}; - ahb { - apb { - pinctrl@fffff400 { - atmel,mux-mask = < - /* A B C */ - 0xffffffff 0xffe0399f 0x00000000 /* pioA */ - 0x00040000 0x00047e3f 0x00000000 /* pioB */ - 0xfdffffff 0x00000000 0xb83fffff /* pioC */ - 0x003fffff 0x003f8000 0x00000000 /* pioD */ - >; - }; +&pinctrl { + atmel,mux-mask = < + /* A B C */ + 0xffffffff 0xffe0399f 0x00000000 /* pioA */ + 0x00040000 0x00047e3f 0x00000000 /* pioB */ + 0xfdffffff 0x00000000 0xb83fffff /* pioC */ + 0x003fffff 0x003f8000 0x00000000 /* pioD */ + >; +}; - pmc: pmc@fffffc00 { - compatible = "atmel,at91sam9g15-pmc", "atmel,at91sam9x5-pmc", "syscon"; - }; - }; - }; +&pmc { + compatible = "atmel,at91sam9g15-pmc", "atmel,at91sam9x5-pmc", "syscon"; };
- use tags from included dtsi instead of duplicating the hierarchy There are no differences in the generated .dtbs Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> --- arch/arm/boot/dts/at91sam9g15.dtsi | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)