From 696e6069a4ccfffab3c11e7b2a9c44ed7447e448 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 7 May 2019 13:49:33 +0200 Subject: [PATCH] ath79: Move settings specific for TP-Link TL-WR1043ND v4 to DTS This prepares for support of v5. Signed-off-by: Adrian Schmutzler --- .../ath79/dts/qca9563_tplink_tl-wr1043n.dtsi | 70 ------------------ .../dts/qca9563_tplink_tl-wr1043nd-v4.dts | 73 ++++++++++++++++++- 2 files changed, 70 insertions(+), 73 deletions(-) diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi index fc23ee1dd8e9..c778cf90bafd 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi @@ -86,17 +86,6 @@ debounce-interval = <60>; }; }; - - gpio-export { - compatible = "gpio-export"; - #size-cells = <0>; - - gpio_usb_power { - gpio-export,name = "tp-link:power:usb"; - gpio-export,output = <1>; - gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; - }; - }; }; &uart { @@ -107,65 +96,6 @@ status = "okay"; }; -&spi { - status = "okay"; - num-cs = <1>; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x000000 0x020000>; - read-only; - }; - - partition@20000 { - compatible = "tplink,firmware"; - label = "firmware"; - reg = <0x020000 0xf30000>; - }; - - info: partition@f50000 { - label = "product-info"; - reg = <0xf50000 0x020000>; - read-only; - }; - - partition@f70000 { - label = "config"; - reg = <0xf70000 0x050000>; - read-only; - }; - - partition@fc0000 { - label = "partition-table"; - reg = <0xfc0000 0x010000>; - read-only; - }; - - partition@fd0000 { - label = "logs"; - reg = <0xfd0000 0x020000>; - read-only; - }; - - art: partition@ff0000 { - label = "ART"; - reg = <0xff0000 0x010000>; - read-only; - }; - }; - }; -}; - &mdio0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts index e51bb7f834b0..07361ea2d230 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts @@ -1,14 +1,81 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include -#include - #include "qca9563_tplink_tl-wr1043n.dtsi" / { compatible = "tplink,tl-wr1043nd-v4", "qca,qca9563"; model = "TP-Link TL-WR1043ND v4"; + + gpio-export { + compatible = "gpio-export"; + #size-cells = <0>; + + gpio_usb_power { + gpio-export,name = "tp-link:power:usb"; + gpio-export,output = <1>; + gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&spi { + status = "okay"; + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x000000 0x020000>; + read-only; + }; + + partition@20000 { + compatible = "tplink,firmware"; + label = "firmware"; + reg = <0x020000 0xf30000>; + }; + + info: partition@f50000 { + label = "product-info"; + reg = <0xf50000 0x020000>; + read-only; + }; + + partition@f70000 { + label = "config"; + reg = <0xf70000 0x050000>; + read-only; + }; + + partition@fc0000 { + label = "partition-table"; + reg = <0xfc0000 0x010000>; + read-only; + }; + + partition@fd0000 { + label = "logs"; + reg = <0xfd0000 0x020000>; + read-only; + }; + + art: partition@ff0000 { + label = "ART"; + reg = <0xff0000 0x010000>; + read-only; + }; + }; + }; }; &gpio_leds { -- 2.30.2