From: Sungbo Eo Date: Thu, 2 Jul 2020 12:50:08 +0000 (+0900) Subject: ath79: rearrange nand node by register address X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=736995ce19ec6f734193d437fb7c1febbc8fa282;p=openwrt%2Fstaging%2Fnoltari.git ath79: rearrange nand node by register address All other nodes in the DTS are placed in order of address space. Harmonize the nand nodes as well. Signed-off-by: Sungbo Eo --- diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi index 0451960a60..763d1c8afe 100644 --- a/target/linux/ath79/dts/ar934x.dtsi +++ b/target/linux/ath79/dts/ar934x.dtsi @@ -148,24 +148,6 @@ }; }; - nand: nand@1b000200 { - compatible = "qca,ar934x-nand"; - reg = <0x1b000200 0xb8>; - - interrupts = <21>; - interrupt-parent = <&miscintc>; - - resets = <&rst 14>; - reset-names = "nand"; - - nand-ecc-mode = "hw"; - - #address-cells = <1>; - #size-cells = <0>; - - status = "disabled"; - }; - gmac: gmac@18070000 { compatible = "qca,ar9340-gmac"; reg = <0x18070000 0x14>; @@ -195,6 +177,24 @@ status = "disabled"; }; + nand: nand@1b000200 { + compatible = "qca,ar934x-nand"; + reg = <0x1b000200 0xb8>; + + interrupts = <21>; + interrupt-parent = <&miscintc>; + + resets = <&rst 14>; + reset-names = "nand"; + + nand-ecc-mode = "hw"; + + #address-cells = <1>; + #size-cells = <0>; + + status = "disabled"; + }; + spi: spi@1f000000 { compatible = "qca,ar934x-spi"; reg = <0x1f000000 0x1c>; diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi index ff8ac70d73..4883965db7 100644 --- a/target/linux/ath79/dts/qca955x.dtsi +++ b/target/linux/ath79/dts/qca955x.dtsi @@ -182,24 +182,6 @@ }; }; - nand: nand@1b800200 { - compatible = "qca,ar934x-nand"; - reg = <0x1b800200 0xb8>; - - interrupts = <21>; - interrupt-parent = <&miscintc>; - - resets = <&rst 14>; - reset-names = "nand"; - - nand-ecc-mode = "hw"; - - #address-cells = <1>; - #size-cells = <0>; - - status = "disabled"; - }; - gmac: gmac@18070000 { compatible = "qca,qca9550-gmac"; reg = <0x18070000 0x58>; @@ -301,6 +283,24 @@ status = "disabled"; }; + nand: nand@1b800200 { + compatible = "qca,ar934x-nand"; + reg = <0x1b800200 0xb8>; + + interrupts = <21>; + interrupt-parent = <&miscintc>; + + resets = <&rst 14>; + reset-names = "nand"; + + nand-ecc-mode = "hw"; + + #address-cells = <1>; + #size-cells = <0>; + + status = "disabled"; + }; + spi: spi@1f000000 { compatible = "qca,ar934x-spi"; reg = <0x1f000000 0x1c>;