We now have fancy new syntax for having label references be both short and trigger an error if non-existent. Let's make use of it.
Signed-off-by: Ahmad Fatoum <[email protected]> --- arch/arm/dts/at91-sama5d27_som1.dtsi | 2 +- arch/arm/dts/at91-sama5d27_som1_ek.dts | 3 +- arch/arm/dts/at91-skov-arm9cpu.dts | 8 ++--- arch/arm/dts/at91sam9263ek.dts | 44 ++++++++++++-------------- 4 files changed, 26 insertions(+), 31 deletions(-) diff --git a/arch/arm/dts/at91-sama5d27_som1.dtsi b/arch/arm/dts/at91-sama5d27_som1.dtsi index 0d84c45f9263..357f46e3097e 100644 --- a/arch/arm/dts/at91-sama5d27_som1.dtsi +++ b/arch/arm/dts/at91-sama5d27_som1.dtsi @@ -7,7 +7,7 @@ nvmem-cell-names = "mac-address"; }; -&{/ahb/apb/i2c@f8028000/at24@50} { +&{i2c0/at24@50} { #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/dts/at91-sama5d27_som1_ek.dts b/arch/arm/dts/at91-sama5d27_som1_ek.dts index 1a704b42680f..a879c17cfcf9 100644 --- a/arch/arm/dts/at91-sama5d27_som1_ek.dts +++ b/arch/arm/dts/at91-sama5d27_som1_ek.dts @@ -30,9 +30,8 @@ }; }; +/delete-node/ &{qspi1/flash@0}; &qspi1 { - /delete-node/ flash@0; - flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/arch/arm/dts/at91-skov-arm9cpu.dts b/arch/arm/dts/at91-skov-arm9cpu.dts index 8e4fddfd3fa1..35988eff0652 100644 --- a/arch/arm/dts/at91-skov-arm9cpu.dts +++ b/arch/arm/dts/at91-skov-arm9cpu.dts @@ -204,13 +204,11 @@ }; }; -&{/ahb/apb} { - pinctrl: pinctrl@fffff200 { - }; +pinctrl: &{/ahb/apb/pinctrl@fffff200} { +}; - watchdog@fffffd40 { +&{/ahb/apb/watchdog@fffffd40} { status = "okay"; - }; }; &dbgu { diff --git a/arch/arm/dts/at91sam9263ek.dts b/arch/arm/dts/at91sam9263ek.dts index cce137e39422..522252d54f9b 100644 --- a/arch/arm/dts/at91sam9263ek.dts +++ b/arch/arm/dts/at91sam9263ek.dts @@ -9,34 +9,32 @@ }; -&nand_controller { - nand@3 { - /delete-node/ partitions; +&{nand_controller/nand@3} { + /delete-node/ partitions; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - at91bootstrap@0 { - label = "at91bootstrap"; - reg = <0x0 0x20000>; - }; + at91bootstrap@0 { + label = "at91bootstrap"; + reg = <0x0 0x20000>; + }; - barebox@20000 { - label = "barebox"; - reg = <0x20000 0x100000>; - }; + barebox@20000 { + label = "barebox"; + reg = <0x20000 0x100000>; + }; - environment_nand: bareboxenv@120000 { - label = "barebox-environment"; - reg = <0x120000 0x20000>; - }; + environment_nand: bareboxenv@120000 { + label = "barebox-environment"; + reg = <0x120000 0x20000>; + }; - rootfs@140000 { - label = "root"; - reg = <0x140000 0x0>; - }; + rootfs@140000 { + label = "root"; + reg = <0x140000 0x0>; }; }; }; -- 2.30.2
