ath79: Unify Sophos AP15/AP15C dts files

The recently added AP15C dts file only differs by the definition of the
reset button. Unify the shared definition into a dtsi to reduce code
duplication.

Signed-off-by: Christoph Krapp <achterin@gmail.com>
Tested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://github.com/openwrt/openwrt/pull/16998
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/ath79/dts/qca9557_sophos_ap15.dts b/target/linux/ath79/dts/qca9557_sophos_ap15.dts
index 773b423cde1bbca17e9e17bca9bb177b7c5dfe0e..d6c0a65ebecb370ac338a7c30663fab369f77834 100644 (file)
--- a/target/linux/ath79/dts/qca9557_sophos_ap15.dts
+++ b/target/linux/ath79/dts/qca9557_sophos_ap15.dts
@@ -1,148 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca955x.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
+#include "qca9557_sophos_ap15.dtsi"
 
 / {
        compatible = "sophos,ap15", "qca,qca9557";
        model = "Sophos AP15";
-
-       aliases {
-               led-boot = &led_status_green;
-               led-failsafe = &led_status_yellow;
-               led-running = &led_status_green;
-               led-upgrade = &led_status_yellow;
-               label-mac-device = &eth0;
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led_status_green: status_green {
-                       function = LED_FUNCTION_STATUS;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       default-state = "on";
-               };
-
-               led_status_yellow: status_yellow {
-                       function = LED_FUNCTION_STATUS;
-                       color = <LED_COLOR_ID_YELLOW>;
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-&spi {
-       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 = "art";
-                               reg = <0x050000 0x010000>;
-                               read-only;
-
-                               nvmem-layout {
-                                       compatible = "fixed-layout";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       cal_art_1000: calibration@1000 {
-                                               reg = <0x1000 0x440>;
-                                       };
-                               };
-                       };
-
-                       partition@60000 {
-                               label = "config";
-                               reg = <0x060000 0x010000>;
-                               read-only;
-
-                               nvmem-layout {
-                                       compatible = "fixed-layout";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       macaddr_config_201a: macaddr@201a {
-                                               reg = <0x201a 0x6>;
-                                       };
-                               };
-                       };
-
-                       partition@70000 {
-                               compatible = "denx,uimage";
-                               label = "firmware";
-                               reg = <0x070000 0xf90000>;
-                       };
-               };
-       };
-};
-
-&mdio0 {
-       status = "okay";
-
-       phy-mask = <0x10>;
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               eee-broken-100tx;
-               eee-broken-1000t;
-       };
-};
-
-&eth0 {
-       status = "okay";
-
-       pll-data = <0xa6000000 0xa0000101 0xa0001313>;
-
-       nvmem-cells = <&macaddr_config_201a>;
-       nvmem-cell-names = "mac-address";
-
-       phy-mode = "rgmii-id";
-       phy-handle = <&phy4>;
-
-       gmac_config: gmac-config {
-               device = <&gmac>;
-
-               rgmii-enabled = <1>;
-
-               rxdv-delay = <3>;
-               rxd-delay = <3>;
-               txen-delay = <3>;
-               txd-delay = <3>;
-       };
-};
-
-&wmac {
-       status = "okay";
-
-       nvmem-cells = <&cal_art_1000>;
-       nvmem-cell-names = "calibration";
 };

diff --git a/target/linux/ath79/dts/qca9557_sophos_ap15.dtsi b/target/linux/ath79/dts/qca9557_sophos_ap15.dtsi
new file mode 100644 (file)
index 0000000..c5ac5e3
--- /dev/null
+++ b/target/linux/ath79/dts/qca9557_sophos_ap15.dtsi
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qca955x.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+
+/ {
+       aliases {
+               led-boot = &led_status_green;
+               led-failsafe = &led_status_yellow;
+               led-running = &led_status_green;
+               led-upgrade = &led_status_yellow;
+               label-mac-device = &eth0;
+       };
+
+       chosen {
+               bootargs = "console=ttyS0,115200n8";
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led_status_green: status_green {
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+                       default-state = "on";
+               };
+
+               led_status_yellow: status_yellow {
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_YELLOW>;
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+&spi {
+       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 = "art";
+                               reg = <0x050000 0x010000>;
+                               read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: calibration@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+                               };
+                       };
+
+                       partition@60000 {
+                               label = "config";
+                               reg = <0x060000 0x010000>;
+                               read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_201a: macaddr@201a {
+                                               reg = <0x201a 0x6>;
+                                       };
+                               };
+                       };
+
+                       partition@70000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x070000 0xf90000>;
+                       };
+               };
+       };
+};
+
+&mdio0 {
+       status = "okay";
+
+       phy-mask = <0x10>;
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               eee-broken-100tx;
+               eee-broken-1000t;
+       };
+};
+
+&eth0 {
+       status = "okay";
+
+       pll-data = <0xa6000000 0xa0000101 0xa0001313>;
+
+       nvmem-cells = <&macaddr_config_201a>;
+       nvmem-cell-names = "mac-address";
+
+       phy-mode = "rgmii-id";
+       phy-handle = <&phy4>;
+
+       gmac_config: gmac-config {
+               device = <&gmac>;
+
+               rgmii-enabled = <1>;
+
+               rxdv-delay = <3>;
+               rxd-delay = <3>;
+               txen-delay = <3>;
+               txd-delay = <3>;
+       };
+};
+
+&wmac {
+       status = "okay";
+
+       nvmem-cells = <&cal_art_1000>;
+       nvmem-cell-names = "calibration";
+};

diff --git a/target/linux/ath79/dts/qca9557_sophos_ap15c.dts b/target/linux/ath79/dts/qca9557_sophos_ap15c.dts
index 68d02e97a54a1454f6bc7097072ba7913bc963da..464bdd5a45e1adf5a679b4cbde07fc22873424a8 100644 (file)
--- a/target/linux/ath79/dts/qca9557_sophos_ap15c.dts
+++ b/target/linux/ath79/dts/qca9557_sophos_ap15c.dts
@@ -1,27 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca955x.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
+#include "qca9557_sophos_ap15.dtsi"
 
 / {
        compatible = "sophos,ap15c", "qca,qca9557";
        model = "Sophos AP15C";
 
-       aliases {
-               led-boot = &led_status_green;
-               led-failsafe = &led_status_yellow;
-               led-running = &led_status_green;
-               led-upgrade = &led_status_yellow;
-               label-mac-device = &eth0;
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        keys {
                compatible = "gpio-keys";
 
@@ -32,128 +16,4 @@
                        debounce-interval = <60>;
                };
        };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led_status_green: status_green {
-                       function = LED_FUNCTION_STATUS;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       default-state = "on";
-               };
-
-               led_status_yellow: status_yellow {
-                       function = LED_FUNCTION_STATUS;
-                       color = <LED_COLOR_ID_YELLOW>;
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-               };
-       };
-};
-
-&spi {
-       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 = "art";
-                               reg = <0x050000 0x010000>;
-                               read-only;
-
-                               nvmem-layout {
-                                       compatible = "fixed-layout";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       cal_art_1000: calibration@1000 {
-                                               reg = <0x1000 0x440>;
-                                       };
-                               };
-                       };
-
-                       partition@60000 {
-                               label = "config";
-                               reg = <0x060000 0x010000>;
-                               read-only;
-
-                               nvmem-layout {
-                                       compatible = "fixed-layout";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       macaddr_config_201a: macaddr@201a {
-                                               reg = <0x201a 0x6>;
-                                       };
-                               };
-                       };
-
-                       partition@70000 {
-                               compatible = "denx,uimage";
-                               label = "firmware";
-                               reg = <0x070000 0xf90000>;
-                       };
-               };
-       };
-};
-
-&mdio0 {
-       status = "okay";
-
-       phy-mask = <0x10>;
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               eee-broken-100tx;
-               eee-broken-1000t;
-       };
-};
-
-&eth0 {
-       status = "okay";
-
-       pll-data = <0xa6000000 0xa0000101 0xa0001313>;
-
-       nvmem-cells = <&macaddr_config_201a>;
-       nvmem-cell-names = "mac-address";
-
-       phy-mode = "rgmii-id";
-       phy-handle = <&phy4>;
-
-       gmac_config: gmac-config {
-               device = <&gmac>;
-
-               rgmii-enabled = <1>;
-
-               rxdv-delay = <3>;
-               rxd-delay = <3>;
-               txen-delay = <3>;
-               txd-delay = <3>;
-       };
-};
-
-&wmac {
-       status = "okay";
-
-       nvmem-cells = <&cal_art_1000>;
-       nvmem-cell-names = "calibration";
 };