airoha: an7581: generalize eMMC DTS and add Kite variant

Generalize the eMMC DTS to common node and add a variant with the Kite WiFi
chip installed. Also rename the eMMC model name and add the Eagle name to
it.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/airoha/dts/an7581-evb-emmc-eagle.dts b/target/linux/airoha/dts/an7581-evb-emmc-eagle.dts
new file mode 100644 (file)
index 0000000..c2e2bb9
--- /dev/null
+++ b/target/linux/airoha/dts/an7581-evb-emmc-eagle.dts
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/dts-v1/;
+
+#include "an7581-evb-emmc.dtsi"
+#include "an7581-npu-mt7996.dtsi"
+
+/ {
+       model = "Airoha AN7581 Evaluation Board (eMMC + Eagle)";
+       compatible = "airoha,an7581-evb", "airoha,an7581", "airoha,en7581";
+
+       aliases {
+               serial0 = &uart1;
+       };
+
+       chosen {
+               bootargs = "console=ttyS0,115200 earlycon";
+               stdout-path = "serial0:115200n8";
+       };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x0 0x80000000 0x2 0x00000000>;
+       };
+};
+
+&pcie2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pcie2_rst_pins>;
+       status = "okay";
+};
+
+&en7581_pinctrl {
+       pcie2_rst_pins: pcie2-rst-pins {
+               conf {
+                       pins = "pcie_reset2";
+                       drive-open-drain = <1>;
+               };
+       };
+};

diff --git a/target/linux/airoha/dts/an7581-evb-emmc-kite.dts b/target/linux/airoha/dts/an7581-evb-emmc-kite.dts
new file mode 100644 (file)
index 0000000..46a23d0
--- /dev/null
+++ b/target/linux/airoha/dts/an7581-evb-emmc-kite.dts
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/dts-v1/;
+
+#include "an7581-evb-emmc.dtsi"
+#include "an7581-npu-mt7992.dtsi"
+
+/ {
+       model = "Airoha AN7581 Evaluation Board (eMMC + Kite)";
+       compatible = "airoha,an7581-evb", "airoha,an7581", "airoha,en7581";
+
+       aliases {
+               serial0 = &uart1;
+       };
+
+       chosen {
+               bootargs = "console=ttyS0,115200 earlycon";
+               stdout-path = "serial0:115200n8";
+       };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x0 0x80000000 0x2 0x00000000>;
+       };
+};

diff --git a/target/linux/airoha/dts/an7581-evb-emmc.dts b/target/linux/airoha/dts/an7581-evb-emmc.dtsi
similarity index 86%
rename from target/linux/airoha/dts/an7581-evb-emmc.dts
rename to target/linux/airoha/dts/an7581-evb-emmc.dtsi
index df433906aa0d8caf6dd9b03a6952c93f98ba552c..d7ce37df2d5c74d67657524eb568921b1857534a 100644 (file)
--- a/target/linux/airoha/dts/an7581-evb-emmc.dts
+++ b/target/linux/airoha/dts/an7581-evb-emmc.dtsi
@@ -1,33 +1,9 @@
 // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 /dts-v1/;
 
-/* Bootloader installs ATF here */
-/memreserve/ 0x80000000 0x200000;
-
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
 #include "an7581.dtsi"
-#include "an7581-npu-mt7996.dtsi"
-
-/ {
-       model = "Airoha AN7581 Evaluation Board";
-       compatible = "airoha,an7581-evb", "airoha,an7581", "airoha,en7581";
-
-       aliases {
-               serial0 = &uart1;
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,115200 earlycon";
-               stdout-path = "serial0:115200n8";
-               linux,usable-memory-range = <0x0 0x80200000 0x0 0x1fe00000>;
-       };
-
-       memory@80000000 {
-               device_type = "memory";
-               reg = <0x0 0x80000000 0x2 0x00000000>;
-       };
-};
 
 &sound {
        audio-routing = "Headphone", "HP_L",
@@ -71,13 +47,6 @@
                };
        };
 
-       pcie2_rst_pins: pcie2-rst-pins {
-               conf {
-                       pins = "pcie_reset2";
-                       drive-open-drain = <1>;
-               };
-       };
-
        gswp1_led0_pins: gswp1-led0-pins {
                mux {
                        function = "phy1_led0";
@@ -213,12 +182,6 @@
        };
 };
 
-&pcie2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pcie2_rst_pins>;
-       status = "okay";
-};
-
 &mdio {
        as21xx_1: ethernet-phy@1d {
                compatible = "ethernet-phy-ieee802.3-c45";

diff --git a/target/linux/airoha/image/an7581.mk b/target/linux/airoha/image/an7581.mk
index 5e001cb8163d43963d9e16cd9a44e804010008ba..40e0a2ac2a37a2a78c56afec4e8fa30d0858383c 100644 (file)
--- a/target/linux/airoha/image/an7581.mk
+++ b/target/linux/airoha/image/an7581.mk
@@ -59,16 +59,29 @@ define Device/airoha_an7581-evb
 endef
 TARGET_DEVICES += airoha_an7581-evb
 
-define Device/airoha_an7581-evb-emmc
+define Device/airoha_an7581-evb-emmc-eagle
   DEVICE_VENDOR := Airoha
-  DEVICE_MODEL := AN7581 Evaluation Board (EMMC)
-  DEVICE_DTS := an7581-evb-emmc
-  DEVICE_PACKAGES := kmod-i2c-an7581
+  DEVICE_MODEL := AN7581 Evaluation Board (eMMC + Eagle)
+  DEVICE_DTS := an7581-evb-emmc-eagle
+  DEVICE_PACKAGES := kmod-i2c-an7581 airoha-en7581-mt7996-npu-firmware \
+                   kmod-mt7996-firmware wpad-basic-mbedtls
   ARTIFACT/preloader.bin := an7581-preloader rfb
   ARTIFACT/bl31-uboot.fip := an7581-bl31-uboot rfb
   ARTIFACTS := preloader.bin bl31-uboot.fip
 endef
-TARGET_DEVICES += airoha_an7581-evb-emmc
+TARGET_DEVICES += airoha_an7581-evb-emmc-eagle
+
+define Device/airoha_an7581-evb-emmc-kite
+  DEVICE_VENDOR := Airoha
+  DEVICE_MODEL := AN7581 Evaluation Board (eMMC + Kite)
+  DEVICE_DTS := an7581-evb-emmc-kite
+  DEVICE_PACKAGES := kmod-i2c-an7581 airoha-en7581-mt7992-npu-firmware \
+                   kmod-mt7992-firmware wpad-basic-mbedtls
+  ARTIFACT/preloader.bin := an7581-preloader rfb
+  ARTIFACT/bl31-uboot.fip := an7581-bl31-uboot rfb
+  ARTIFACTS := preloader.bin bl31-uboot.fip
+endef
+TARGET_DEVICES += airoha_an7581-evb-emmc-kite
 
 define Device/gemtek_w1700k-ubi
   DEVICE_VENDOR := Gemtek