From: Adrian Schmutzler Date: Tue, 19 Jan 2021 13:53:36 +0000 (+0100) Subject: ath79: make OpenMesh MR900 DTSI more general X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=847cda16eba23d4436a01b7313a21426b9c606fb;p=openwrt%2Fstaging%2Fthess.git ath79: make OpenMesh MR900 DTSI more general The OpenMesh MR900 and to-be-added MR1750 family are very similar. Make the existing MR900 DTSI more general so it can be used for the MR1750 devices as well. Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi new file mode 100644 index 0000000000..d51c587683 --- /dev/null +++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi @@ -0,0 +1,169 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qca955x.dtsi" + +#include +#include + +/ { + chosen { + /delete-property/ bootargs; + }; + + aliases { + serial0 = &uart; + led-boot = &led_power_blue; + led-failsafe = &led_power_blue; + led-running = &led_power_blue; + led-upgrade = &led_power_blue; + label-mac-device = ð0; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + + lan_blue { + label = "blue:lan"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + + led_wifi2g: wifi2g { + label = "blue:wifi2g"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + status_green { + label = "green:status"; + gpios = <&gpio 19 GPIO_ACTIVE_LOW>; + }; + + status_red { + label = "red:status"; + gpios = <&gpio 21 GPIO_ACTIVE_LOW>; + }; + + led_power_blue: power_blue { + label = "blue:power"; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + led_wifi5g: wifi5g { + label = "blue:wifi5g"; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; + }; + }; + + watchdog { + compatible = "linux,wdt-gpio"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + hw_algo = "toggle"; + /* hw_margin_ms is actually 300s but driver limits it to 60s */ + hw_margin_ms = <60000>; + always-running; + }; +}; + +&uart { + status = "okay"; +}; + +&spi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <40000000>; + + /* partitions are passed via bootloader */ + 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 0x060000>; + read-only; + }; + + partition@b0000 { + label = "inactive"; + reg = <0x0b0000 0x7a0000>; + }; + + partition@850000 { + label = "inactive2"; + reg = <0x850000 0x7a0000>; + }; + + art: partition@ff0000 { + label = "ART"; + reg = <0xff0000 0x010000>; + read-only; + }; + }; + }; +}; + +&mdio0 { + status = "okay"; + + phy-mask = <0x20>; + + phy5: ethernet-phy@5 { + reg = <5>; + eee-broken-100tx; + eee-broken-1000t; + }; +}; + +ð0 { + status = "okay"; + + pll-data = <0x82000000 0x80000101 0x80001313>; + + mtd-mac-address = <&art 0x0>; + + phy-mode = "rgmii-id"; + phy-handle = <&phy5>; + + gmac-config { + device = <&gmac>; + rgmii-enabled = <1>; + }; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&art 0x0>; + mtd-mac-address-increment = <1>; +}; + +&pcie0 { + status = "okay"; +}; diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts index 96fc9853cb..f7889b00cc 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts +++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts @@ -1,8 +1,25 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "qca9558_openmesh_mr900.dtsi" +#include "qca9558_openmesh_mr.dtsi" / { compatible = "openmesh,mr900-v1", "qca,qca9558"; model = "OpenMesh MR900 v1"; }; + +&led_wifi2g { + linux,default-trigger = "phy0tpt"; +}; + +&led_wifi5g { + linux,default-trigger = "phy1tpt"; +}; + +&pcie0 { + wifi@0,0 { + compatible = "pci168c,0033"; + reg = <0x0000 0 0 0 0>; + mtd-mac-address = <&art 0x0>; + mtd-mac-address-increment = <16>; + }; +}; diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts index 008caae2ec..1f54d2134a 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts +++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts @@ -1,8 +1,25 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "qca9558_openmesh_mr900.dtsi" +#include "qca9558_openmesh_mr.dtsi" / { compatible = "openmesh,mr900-v2", "qca,qca9558"; model = "OpenMesh MR900 v2"; }; + +&led_wifi2g { + linux,default-trigger = "phy0tpt"; +}; + +&led_wifi5g { + linux,default-trigger = "phy1tpt"; +}; + +&pcie0 { + wifi@0,0 { + compatible = "pci168c,0033"; + reg = <0x0000 0 0 0 0>; + mtd-mac-address = <&art 0x0>; + mtd-mac-address-increment = <16>; + }; +}; diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr900.dtsi deleted file mode 100644 index 8c612042c8..0000000000 --- a/target/linux/ath79/dts/qca9558_openmesh_mr900.dtsi +++ /dev/null @@ -1,178 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "qca955x.dtsi" - -#include -#include - -/ { - chosen { - /delete-property/ bootargs; - }; - - aliases { - serial0 = &uart; - led-boot = &led_power_blue; - led-failsafe = &led_power_blue; - led-running = &led_power_blue; - led-upgrade = &led_power_blue; - label-mac-device = ð0; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - linux,code = ; - gpios = <&gpio 17 GPIO_ACTIVE_LOW>; - }; - }; - - leds { - compatible = "gpio-leds"; - - lan_blue { - label = "blue:lan"; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - }; - - wifi2g_blue { - label = "blue:wifi2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - status_green { - label = "green:status"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - }; - - status_red { - label = "red:status"; - gpios = <&gpio 21 GPIO_ACTIVE_LOW>; - }; - - led_power_blue: power_blue { - label = "blue:power"; - gpios = <&gpio 22 GPIO_ACTIVE_LOW>; - default-state = "on"; - }; - - wifi5g_blue { - label = "blue:wifi5g"; - gpios = <&gpio 23 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - }; - - watchdog { - compatible = "linux,wdt-gpio"; - gpios = <&gpio 16 GPIO_ACTIVE_LOW>; - hw_algo = "toggle"; - /* hw_margin_ms is actually 300s but driver limits it to 60s */ - hw_margin_ms = <60000>; - always-running; - }; -}; - -&uart { - status = "okay"; -}; - -&spi { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <40000000>; - - /* partitions are passed via bootloader */ - 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 0x060000>; - read-only; - }; - - partition@b0000 { - label = "inactive"; - reg = <0x0b0000 0x7a0000>; - }; - - partition@850000 { - label = "inactive2"; - reg = <0x850000 0x7a0000>; - }; - - art: partition@ff0000 { - label = "ART"; - reg = <0xff0000 0x010000>; - read-only; - }; - }; - }; -}; - -&mdio0 { - status = "okay"; - - phy-mask = <0x20>; - - phy5: ethernet-phy@5 { - reg = <5>; - eee-broken-100tx; - eee-broken-1000t; - }; -}; - -ð0 { - status = "okay"; - - pll-data = <0x82000000 0x80000101 0x80001313>; - - mtd-mac-address = <&art 0x0>; - - phy-mode = "rgmii-id"; - phy-handle = <&phy5>; - - gmac-config { - device = <&gmac>; - rgmii-enabled = <1>; - }; -}; - -&wmac { - status = "okay"; - - mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&art 0x0>; - mtd-mac-address-increment = <1>; -}; - -&pcie0 { - status = "okay"; - - wifi@0,0 { - compatible = "pci168c,0033"; - reg = <0x0000 0 0 0 0>; - mtd-mac-address = <&art 0x0>; - mtd-mac-address-increment = <16>; - }; -};