From: Adrian Schmutzler Date: Sun, 3 Jan 2021 23:56:57 +0000 (+0100) Subject: ath79: keep DTSI files for D-Link SoC-specific X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=acdf07cd3eb3d4aff09e0908c492859127524ab5;p=openwrt%2Fstaging%2Fdangole.git ath79: keep DTSI files for D-Link SoC-specific It is good practice to define device tree files based on specific SoCs. Thus, let's not start to create files that are used across different architectures. Duplicate the DTSI file for D-Link DAP-2xxx in order to have one for qca953x and one for qca955x, respectively. Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/ath79/dts/qca9533_dlink_dap-2230-a1.dts b/target/linux/ath79/dts/qca9533_dlink_dap-2230-a1.dts index 61b6453842..3717a35ae3 100644 --- a/target/linux/ath79/dts/qca9533_dlink_dap-2230-a1.dts +++ b/target/linux/ath79/dts/qca9533_dlink_dap-2230-a1.dts @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "qca953x.dtsi" -#include "qca95xx_dlink_dap-2xxx.dtsi" +#include "qca953x_dlink_dap-2xxx.dtsi" / { compatible = "dlink,dap-2230-a1", "qca,qca9533"; diff --git a/target/linux/ath79/dts/qca9533_dlink_dap-3320-a1.dts b/target/linux/ath79/dts/qca9533_dlink_dap-3320-a1.dts index 97f2f62b4a..c186a7ee44 100644 --- a/target/linux/ath79/dts/qca9533_dlink_dap-3320-a1.dts +++ b/target/linux/ath79/dts/qca9533_dlink_dap-3320-a1.dts @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "qca953x.dtsi" -#include "qca95xx_dlink_dap-2xxx.dtsi" +#include "qca953x_dlink_dap-2xxx.dtsi" / { compatible = "dlink,dap-3320-a1", "qca,qca9533"; diff --git a/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi new file mode 100644 index 0000000000..aff6eb2871 --- /dev/null +++ b/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi @@ -0,0 +1,56 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qca953x.dtsi" + +#include +#include + +&spi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <50000000>; + + partitions: partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x40000>; + read-only; + }; + + partition@40000 { + label = "bdcfg"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "rgdb"; + reg = <0x50000 0x10000>; + read-only; + }; + + partition@60000 { + label = "unused"; + reg = <0x60000 0x10000>; + read-only; + }; + }; + }; +}; + +&uart { + status = "okay"; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; +}; diff --git a/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts b/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts index 8ef07e42e8..622f4410b3 100644 --- a/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts +++ b/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "qca955x.dtsi" -#include "qca95xx_dlink_dap-2xxx.dtsi" +#include "qca955x_dlink_dap-2xxx.dtsi" / { compatible = "dlink,dap-2660-a1", "qca,qca9557"; diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts index c3c82937a8..7549c0a697 100644 --- a/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts +++ b/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "qca955x.dtsi" -#include "qca95xx_dlink_dap-2xxx.dtsi" +#include "qca955x_dlink_dap-2xxx.dtsi" / { compatible = "dlink,dap-2680-a1", "qca,qca9558"; diff --git a/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi new file mode 100644 index 0000000000..ac7a0c85f0 --- /dev/null +++ b/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi @@ -0,0 +1,56 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qca955x.dtsi" + +#include +#include + +&spi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <50000000>; + + partitions: partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x40000>; + read-only; + }; + + partition@40000 { + label = "bdcfg"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "rgdb"; + reg = <0x50000 0x10000>; + read-only; + }; + + partition@60000 { + label = "unused"; + reg = <0x60000 0x10000>; + read-only; + }; + }; + }; +}; + +&uart { + status = "okay"; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; +}; diff --git a/target/linux/ath79/dts/qca95xx_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca95xx_dlink_dap-2xxx.dtsi deleted file mode 100644 index 82d50b85e8..0000000000 --- a/target/linux/ath79/dts/qca95xx_dlink_dap-2xxx.dtsi +++ /dev/null @@ -1,54 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include -#include - -&spi { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <50000000>; - - partitions: partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x40000>; - read-only; - }; - - partition@40000 { - label = "bdcfg"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - label = "rgdb"; - reg = <0x50000 0x10000>; - read-only; - }; - - partition@60000 { - label = "unused"; - reg = <0x60000 0x10000>; - read-only; - }; - }; - }; -}; - -&uart { - status = "okay"; -}; - -&wmac { - status = "okay"; - - mtd-cal-data = <&art 0x1000>; -};