From: Michael Pratt <mcpratt@pm.me> Date: Mon, 15 Feb 2021 20:37:06 +0000 (-0500) Subject: ath79: cleanup DTS for ALLNET ALL-WAP02860AC X-Git-Tag: v21.02.0-rc3~13 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=518adcfe777d7d954e65548ed7d0a174e6be32dd;p=openwrt%2Fopenwrt.git ath79: cleanup DTS for ALLNET ALL-WAP02860AC use qca955x_senao_loader.dtsi because it is the same hardware / partitioning and some cleanup Effects: nodes to match similar boards - keys - eth0 - pcie0 bumps SPI frequency to 40 MHz removes &pll node: the property is defined in qca955x.dtsi removes qca,no-eeprom: has no effect with mtd-cal-data property (also spelling) Tested-by: Tomasz Maciej Nowak <tmn505@gmail.com> Signed-off-by: Michael Pratt <mcpratt@pm.me> (cherry picked from commit e800da9d5c87d276806284cf2183994ea7fe083e) --- diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts index 3afbc04ddf..5c6051d6f4 100644 --- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts +++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts @@ -1,14 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "qca955x.dtsi" +#include "qca955x_senao_loader.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> -#include <dt-bindings/mtd/partitions/uimage.h> / { - model = "ALLNET ALL-WAP02860AC"; compatible = "allnet,all-wap02860ac", "qca,qca9558"; + model = "ALLNET ALL-WAP02860AC"; aliases { label-mac-device = ð0; @@ -23,8 +22,9 @@ reset { label = "reset"; - linux,code = <KEY_RESTART>; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + linux,code = <KEY_RESTART>; }; }; @@ -54,35 +54,17 @@ gpios = <&gpio 19 GPIO_ACTIVE_LOW>; }; }; - - virtual_flash { - compatible = "mtd-concat"; - - devices = <&fwconcat0 &fwconcat1>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - compatible = "openwrt,uimage", "denx,uimage"; - openwrt,ih-magic = <0x73714f4b>; - label = "firmware"; - reg = <0x0 0x0>; - }; - }; - }; }; ð0 { status = "okay"; - pll-data = <0x8e000000 0x80000101 0x80001313>; + mtd-mac-address = <&art 0x0>; + phy-handle = <&phy5>; - phy-mode = "rgmii-rxid"; + phy-mode = "rgmii-id"; - mtd-mac-address = <&art 0x0>; + pll-data = <0x82000000 0x80000101 0x80001313>; }; &mdio0 { @@ -95,76 +77,20 @@ }; }; -&pcie0 { - status = "okay"; - - wifi@0,0 { - compatible = "qcom,ath10k"; - reg = <0 0 0 0 0>; +&partitions { + art: partition@ff0000 { + label = "art"; + reg = <0xff0000 0x010000>; + read-only; }; }; -&pll { - clocks = <&extosc>; -}; - -&spi { +&pcie0 { status = "okay"; - 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 0x040000>; - read-only; - }; - - partition@40000 { - label = "u-boot-env"; - reg = <0x040000 0x010000>; - }; - - partition@50000 { - label = "custom"; - reg = <0x050000 0x050000>; - read-only; - }; - - partition@a0000 { - label = "loader"; - reg = <0x0a0000 0x010000>; - }; - - fwconcat1: partition@b0000 { - label = "fwconcat1"; - reg = <0x0b0000 0x170000>; - }; - - fwconcat0: partition@220000 { - label = "fwconcat0"; - reg = <0x220000 0xb50000>; - }; - - partition@d70000 { - label = "failsafe"; - reg = <0xd70000 0x280000>; - read-only; - }; - - art: partition@ff0000 { - label = "art"; - reg = <0xff0000 0x010000>; - read-only; - }; - }; + wifi@0,0,0 { + compatible = "qcom,ath10k"; + reg = <0x0 0 0 0 0>; }; }; @@ -174,5 +100,4 @@ mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&art 0x0>; mtd-mac-address-increment = <1>; - qca-no-eeprom; };