[openwrt/openwrt] ipq40xx: add support for Cisco Meraki Z3

LEDE Commits lede-commits at lists.infradead.org
Sun Oct 19 10:33:22 PDT 2025


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/60bbf46930ffd661e0f9a52f2ba1ea2ccea15fd7

commit 60bbf46930ffd661e0f9a52f2ba1ea2ccea15fd7
Author: Hal Martin <hal.martin at gmail.com>
AuthorDate: Sun Oct 19 12:12:51 2025 +0200

    ipq40xx: add support for Cisco Meraki Z3
    
    This commit adds support for the Cisco Meraki Z3. The Z3 is a "teleworker"
    device with 802.11ac and an integrated 5 port Gigabit switch.
    
    Z3 hardware info:
    * CPU: Qualcomm IPQ4029
    * RAM: 512MB DDR3
    * Storage: 128 MB (S34ML01G200TFV00)
    * Networking: QCA8075 internal switch (5x 1GbE ports)
    * WiFi: QCA4019 802.11b/g/n/ac
    * USB: 1x USB3.0
    * Serial: Internal header (J8, 2.54mm, populated)
    
    Port 5 has POE output (802.3af). The Internet/WAN port is used for tftp booting
    in U-Boot.
    
    This device ships with secure boot, and cannot be flashed without
    external programmers (TSOP48 NAND and I2C EEEPROM)!
    
    Disassembly:
    
    * Remove the four T8 screws on the bottom of the device under the rubber feet.
    
    * Using a guitar pick or similar plastic tool, insert it on the side between
    the bottom case and the side, pry up gently. The plastic bottom has several
    latches around the perimeter (but none on the rear by the Ethernet ports).
    
    * The TSOP48 NAND flash (U30, Spansion S34ML01G200TFV00) is located on the
    bottom side of the PCB (facing you as you remove the bottom plastic).
    To flash, you will need to desolder the TSOP48. Attempts to flash in-circuit
    using a 360 clip were unsuccessful.
    
    * The SOIC8 I2C EEPROM (U32, Atmel 24C64) is located on the bottom side of
    the PCB (facing you as you remove the bottom plastic). It can be flashed in
    circuit using a SOIC8 chip clip.
    
    Installation:
    
    The dumps to flash can be found in this repository:
    https://github.com/halmartin/meraki-openwrt-docs/tree/main/z3_gx20
    
    The device has the following flash layout (offsets with OOB data):
    ```
    0x000000000000-0x000000100000 : "sbl1"
    0x000000100000-0x000000200000 : "mibib"
    0x000000200000-0x000000300000 : "bootconfig"
    0x000000300000-0x000000400000 : "qsee"
    0x000000400000-0x000000500000 : "qsee_alt"
    0x000000500000-0x000000580000 : "cdt"
    0x000000580000-0x000000600000 : "cdt_alt"
    0x000000600000-0x000000680000 : "ddrparams"
    0x000000700000-0x000000900000 : "u-boot"
    0x000000900000-0x000000b00000 : "u-boot-backup"
    0x000000b00000-0x000000b80000 : "ART"
    0x000000c00000-0x000007c00000 : "ubi"
    ```
    
    * Dump your original NAND (if using nanddump, include OOB data).
    
    * Decompress `u-boot.bin.gz` dump from the GitHub repository above (dump
    contains OOB data) and overwrite the `u-boot` portion of NAND from
    `0x738000`-`0x948000` (length `0x210000`). Offsets here include OOB data.
    
    * Decompress `ubi.bin.gz` dump from the GitHub repository above (dump
    contains OOB data) and overwrite the `ubi` portion of NAND from
    `0xc60000`-`0x8400000` (length `0x77a0000`). Offsets here include OOB data.
    
    * Dump your original EEPROM. Change the byte at offset `0x49` to `0x1e`
    (originally `0x24`). Remember to re-write the EEPROM with the modified data.
        * This can be done on Linux via the following command:
        `printf "\x1e" | dd of=/tmp/eeprom.bin bs=1 seek=$((0x49)) conv=notrunc`
    
    **Note**: the device will not boot if you modify the board major number and
    have not yet overwritten the `ubi` and `u-boot` regions of NAND.
    
    * Resolder the NAND after overwriting the `u-boot` and `ubi` regions.
    
    OpenWrt Installation:
    
    * After flashing NAND and EEPROM with external programmers. Plug an Ethernet
    cable into the Internet/WAN port. Power up the device.
    
    * The new U-Boot build uses the space character `" "` (without quotes) to
    interrupt boot.
    
    * Interrupt U-Boot and `tftpboot` the OpenWrt initramfs image from your
    tftp server
    ```
    dhcp
    setenv serverip <your_tftp>
    tftpboot openwrt-ipq40xx-generic-meraki_z3-initramfs-uImage.itb
    ```
    
    * Once booted into the OpenWrt initramfs, created the `ART` ubivol with
    the WiFi radio calibration from the mtd partition:
    ```
    cat /dev/mtd10 > /tmp/ART.bin
    ubimkvol /dev/ubi0 -N ART -s 524288
    ubiupdatevol /dev/ubi0_1 /tmp/ART.bin
    ```
    
    * `scp` the `sysupgrade` image to
    the device and run the normal `sysupgrade` procedure:
    ```
    scp -O openwrt-ipq40xx-generic-meraki_z3-squashfs-sysupgrade.bin root at 192.168.1.1:/tmp/
    ssh root at 192.168.1.1 "sysupgrade -n /tmp/openwrt-ipq40xx-generic-meraki_z3-squashfs-sysupgrade.bin"
    ```
    
    * OpenWrt should now be installed on the device.
    
    Signed-off-by: Hal Martin <hal.martin at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/17026
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 package/firmware/ipq-wifi/Makefile                 |   2 +
 .../linux/ipq40xx/base-files/etc/board.d/01_leds   |  12 +
 .../ipq40xx/base-files/etc/board.d/02_network      |   3 +
 .../base-files/etc/board.d/03_gpio_switches        |   3 +
 .../ipq40xx/base-files/lib/upgrade/platform.sh     |   7 +
 .../dts/qcom/qcom-ipq4029-wired-qca-common.dtsi    | 411 +++++++++++++++++++++
 .../arch/arm/boot/dts/qcom/qcom-ipq4029-z3.dts     | 110 ++++++
 target/linux/ipq40xx/image/generic.mk              |  23 ++
 8 files changed, 571 insertions(+)

diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 67bdc3acb6..9188baf4a5 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -57,6 +57,7 @@ ALLWIFIBOARDS:= \
 	linksys_mx8500 \
 	linksys_spnmx56 \
 	linksys_whw03 \
+	meraki_z3 \
 	netgear_lbr20 \
 	netgear_rax120v2 \
 	netgear_sxk80 \
@@ -230,6 +231,7 @@ $(eval $(call generate-ipq-wifi-package,linksys_mx5500,Linksys MX5500))
 $(eval $(call generate-ipq-wifi-package,linksys_mx8500,Linksys MX8500))
 $(eval $(call generate-ipq-wifi-package,linksys_spnmx56,Linksys SPNMX56))
 $(eval $(call generate-ipq-wifi-package,linksys_whw03,Linksys WHW03))
+$(eval $(call generate-ipq-wifi-package,meraki_z3,Meraki Z3))
 $(eval $(call generate-ipq-wifi-package,netgear_lbr20,Netgear LBR20))
 $(eval $(call generate-ipq-wifi-package,netgear_rax120v2,Netgear RAX120v2))
 $(eval $(call generate-ipq-wifi-package,netgear_sxk80,Netgear SXK80))
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
index 187bafccb9..9fd42a56ea 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -96,6 +96,18 @@ mobipromo,cm520-79f)
 	ucidef_set_led_netdev "lan1" "LAN1" "blue:lan1" "lan1"
 	ucidef_set_led_netdev "lan2" "LAN2" "blue:lan2" "lan2"
 	;;
+meraki,z3)
+	ucidef_set_led_netdev "wan_link" "WAN (link)" "green:wan-0" "wan" "link"
+	ucidef_set_led_netdev "wan_act" "WAN (txrx)" "green:wan-1" "wan" "tx rx"
+	ucidef_set_led_netdev "lan1_link" "LAN2 (link)" "green:lan-2" "lan2" "link"
+	ucidef_set_led_netdev "lan1_act" "LAN2 (txrx)" "green:lan-3" "lan2" "tx rx"
+	ucidef_set_led_netdev "lan2_link" "LAN3 (link)" "green:lan-4" "lan3" "link"
+	ucidef_set_led_netdev "lan2_act" "LAN3 (txrx)" "green:lan-5" "lan3" "tx rx"
+	ucidef_set_led_netdev "lan3_link" "LAN4 (link)" "green:lan-6" "lan4" "link"
+	ucidef_set_led_netdev "lan3_act" "LAN4 (txrx)" "green:lan-7" "lan4" "tx rx"
+	ucidef_set_led_netdev "lan4_link" "LAN5 (link)" "green:lan-8" "lan5" "link"
+	ucidef_set_led_netdev "lan4_act" "LAN5 (txrx)" "green:lan-9" "lan5" "tx rx"
+	;;
 netgear,ex6100v2 |\
 netgear,ex6150v2)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:router" "phy0tpt"
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 57dca0e1a2..3f4ca99b0f 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -29,6 +29,9 @@ ipq40xx_setup_interfaces()
 	zyxel,nbg6617)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
 		;;
+	meraki,z3)
+		ucidef_set_interfaces_lan_wan "lan2 lan3 lan4 lan5" "wan"
+		;;
 	8dev,jalapeno|\
 	alfa-network,ap120c-ac|\
 	asus,map-ac2200|\
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches b/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches
index 43ed32fc2b..fc43ae3d0f 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches
@@ -21,6 +21,9 @@ cilab,meshpoint-one)
 compex,wpj428)
 	ucidef_add_gpio_switch "sim_card_select" "SIM card select" "3" "0"
 	;;
+meraki,z3)
+	ucidef_add_gpio_switch "lan5_poe_disable" "LAN5 PoE disable" "540" "0"
+	;;
 mikrotik,cap-ac)
 	ucidef_add_gpio_switch "poe_passtrough" "POE passtrough enable" "514" "0"
 	;;
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index 53a9561148..298ba6eb9c 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -183,6 +183,13 @@ platform_do_upgrade() {
 		CI_KERNPART="part.safe"
 		nand_do_upgrade "$1"
 		;;
+	meraki,z3)
+		# DO NOT set CI_KERNPART to part.safe,
+		# that is used for chain-loading an unlocked u-boot
+		# if part.safe is overwritten, then u-boot is lost!
+		CI_KERNPART="part.old"
+		nand_do_upgrade "$1"
+		;;
 	mikrotik,cap-ac|\
 	mikrotik,hap-ac2|\
 	mikrotik,hap-ac3-lte6-kit|\
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-wired-qca-common.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-wired-qca-common.dtsi
new file mode 100644
index 0000000000..cce0703f07
--- /dev/null
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-wired-qca-common.dtsi
@@ -0,0 +1,411 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Device Tree Source for Meraki "wired-arm-qca" series
+ *
+ * Copyright (C) 2017 Chris Blake <chrisrblake93 at gmail.com>
+ * Copyright (C) 2017 Christian Lamparter <chunkeey at googlemail.com>
+ * Copyright (C) 2025 Hal Martin <halmartin at googlemail.com>
+ *
+ */
+
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+#include <dt-bindings/leds/common.h>
+
+/ {
+	aliases {
+		led-boot = &status_green;
+		led-failsafe = &status_red;
+		led-running = &status_green;
+		led-upgrade = &power_orange;
+	};
+
+	soc {
+		/* It is a 56-bit counter that supplies the count to the ARM arch
+		   timers and without upstream driver */
+		counter at 4a1000 {
+			compatible = "qcom,qca-gcnt";
+			reg = <0x4a1000 0x4>;
+		};
+
+		ess_tcsr at 1953000 {
+			compatible = "qcom,tcsr";
+			reg = <0x1953000 0x1000>;
+			qcom,ess-interface-select = <TCSR_ESS_PSGMII>;
+		};
+
+		tcsr at 1949000 {
+			compatible = "qcom,tcsr";
+			reg = <0x1949000 0x100>;
+			qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+		};
+
+		tcsr at 194b000 {
+			/* select hostmode */
+			compatible = "qcom,tcsr";
+			reg = <0x194b000 0x100>;
+			qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
+			status = "okay";
+		};
+
+		tcsr at 1957000 {
+			compatible = "qcom,tcsr";
+			reg = <0x1957000 0x100>;
+			qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+		};
+
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "reset";
+			gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
+
+};
+
+&blsp_dma {
+	status = "okay";
+};
+
+&blsp1_uart1 {
+	pinctrl-0 = <&serial_0_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&cryptobam {
+	status = "okay";
+};
+
+&blsp1_i2c3 {
+	pinctrl-0 = <&i2c_0_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	eeprom at 50 {
+		compatible = "atmel,24c64";
+		pagesize = <32>;
+		reg = <0x50>;
+		read-only; /* This holds our MAC & Meraki board-data */
+
+		nvmem-layout {
+			compatible = "fixed-layout";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			mac_address: mac-address at 66 {
+				compatible = "mac-base";
+				reg = <0x66 0x6>;
+				#nvmem-cell-cells = <1>;
+			};
+		};
+	};
+};
+
+&blsp1_i2c4 {
+	pinctrl-0 = <&i2c_1_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	tricolor: led-controller at 30 {
+		compatible = "ti,lp5562";
+		reg = <0x30>;
+		clock-mode = /bits/8 <2>;
+		enable-gpio = <&tlmm 48 GPIO_ACTIVE_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		/* RGB led */
+		status_red: chan at 0 {
+			chan-name = "red:status";
+			led-cur = /bits/ 8 <0x20>;
+			max-cur = /bits/ 8 <0x60>;
+			reg = <0>;
+			color = <LED_COLOR_ID_RED>;
+		};
+
+		status_green: chan at 1 {
+			chan-name = "green:status";
+			led-cur = /bits/ 8 <0x20>;
+			max-cur = /bits/ 8 <0x60>;
+			reg = <1>;
+			color = <LED_COLOR_ID_GREEN>;
+		};
+
+		chan at 2 {
+			chan-name = "blue:status";
+			led-cur = /bits/ 8 <0x20>;
+			max-cur = /bits/ 8 <0x60>;
+			reg = <2>;
+			color = <LED_COLOR_ID_BLUE>;
+		};
+
+		chan at 3 {
+			chan-name = "white:status";
+			led-cur = /bits/ 8 <0x20>;
+			max-cur = /bits/ 8 <0x60>;
+			reg = <3>;
+			color = <LED_COLOR_ID_WHITE>;
+		};
+	};
+};
+
+&nand {
+	pinctrl-0 = <&nand_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	nand at 0 {
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition at 0 {
+				label = "sbl1";
+				reg = <0x00000000 0x00100000>;
+				read-only;
+			};
+			partition at 100000 {
+				label = "mibib";
+				reg = <0x00100000 0x00100000>;
+				read-only;
+			};
+			partition at 200000 {
+				label = "bootconfig";
+				reg = <0x00200000 0x00100000>;
+				read-only;
+			};
+			partition at 300000 {
+				label = "qsee";
+				reg = <0x00300000 0x00100000>;
+				read-only;
+			};
+			partition at 400000 {
+				label = "qsee_alt";
+				reg = <0x00400000 0x00100000>;
+				read-only;
+			};
+			partition at 500000 {
+				label = "cdt";
+				reg = <0x00500000 0x00080000>;
+				read-only;
+			};
+			partition at 580000 {
+				label = "cdt_alt";
+				reg = <0x00580000 0x00080000>;
+				read-only;
+			};
+			partition at 600000 {
+				label = "ddrparams";
+				reg = <0x00600000 0x00080000>;
+				read-only;
+			};
+			partition at 700000 {
+				label = "u-boot";
+				reg = <0x00700000 0x00200000>;
+				read-only;
+			};
+			partition at 900000 {
+				label = "u-boot-backup";
+				reg = <0x00900000 0x00200000>;
+				read-only;
+			};
+			partition at b00000 {
+				label = "ART";
+				reg = <0x00b00000 0x00080000>;
+				read-only;
+			};
+			partition at c00000 {
+				compatible = "linux,ubi";
+				reg = <0x00c00000 0x07000000>;
+				label = "ubi";
+				/*
+				 * Do not try to allocate the remaining
+				 * 4 MiB to this ubi partition. It will
+				 * confuse the u-boot and it might not
+				 * find the kernel partition anymore.
+				 */
+				volumes {
+					ubi_art: ubi-volume-art {
+						volname = "ART";
+					};
+				};
+			};
+		};
+	};
+};
+
+&qpic_bam {
+	status = "okay";
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&mdio_pins>;
+	pinctrl-names = "default";
+};
+
+&tlmm {
+	mdio_pins: mdio_pinmux {
+		mux_1 {
+			pins = "gpio6";
+			function = "mdio";
+			bias-pull-up;
+		};
+		mux_2 {
+			pins = "gpio7";
+			function = "mdc";
+			bias-pull-up;
+		};
+	};
+
+	serial_0_pins: serial_pinmux {
+		pins = "gpio16", "gpio17";
+		function = "blsp_uart0";
+		bias-disable;
+	};
+
+	serial_1_pins: serial1_pinmux {
+		/* We use the i2c-0 pins for serial_1 */
+		pins = "gpio8", "gpio9";
+		function = "blsp_uart1";
+		bias-disable;
+	};
+
+	i2c_0_pins: i2c_0_pinmux {
+		function = "blsp_i2c0";
+		pins = "gpio20", "gpio21";
+		drive-strength = <16>;
+		bias-disable;
+	};
+
+	i2c_1_pins: i2c_1_pinmux {
+		function = "blsp_i2c1";
+		pins = "gpio34", "gpio35";
+		drive-strength = <16>;
+		bias-disable;
+	};
+
+	nand_pins: nand_pins {
+		/*
+		 * There are 18 pins. 15 pins are common between LCD and NAND.
+		 * The QPIC controller arbitrates between LCD and NAND. Of the
+		 * remaining 4, 2 are for NAND and 2 are for LCD exclusively.
+		 *
+		 * The meraki source hints that the bluetooth module claims
+		 * pin 52 as well. But sadly, there's no data whenever this
+		 * is a NAND or LCD exclusive pin or not.
+		 */
+
+		pullups {
+			pins = "gpio53", "gpio58", "gpio59";
+			function = "qpic";
+			bias-pull-up;
+		};
+
+		pulldowns {
+			pins = "gpio55", "gpio56",
+				"gpio57", "gpio60", "gpio62",
+				"gpio63", "gpio64", "gpio65",
+				"gpio66", "gpio67", "gpio68",
+				"gpio69";
+			function = "qpic";
+			bias-pull-down;
+		};
+	};
+};
+
+&usb2_hs_phy {
+		status = "okay";
+};
+
+&usb2 {
+		status = "okay";
+};
+
+&usb3_hs_phy {
+		status = "okay";
+};
+
+&usb3_ss_phy {
+		status = "okay";
+};
+
+&usb3 {
+		status = "okay";
+};
+
+&ubi_art {
+	nvmem-layout {
+		compatible = "fixed-layout";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		precal_factory_1000: precal at 1000 {
+			reg = <0x1000 0x2f20>;
+		};
+
+		precal_factory_5000: precal at 5000 {
+			reg = <0x5000 0x2f20>;
+		};
+
+		cal_factory_9000: cal at 9000 {
+			reg = <0x9000 0x844>;
+		};
+	};
+};
+
+&wifi0 {
+	status = "okay";
+	nvmem-cells = <&precal_factory_1000>;
+	nvmem-cell-names = "pre-calibration";
+};
+
+&wifi1 {
+	status = "okay";
+	nvmem-cells = <&precal_factory_5000>;
+	nvmem-cell-names = "pre-calibration";
+};
+
+&gmac {
+	status = "okay";
+	nvmem-cells = <&mac_address 0>;
+	nvmem-cell-names = "mac-address";
+};
+
+&switch {
+	status = "okay";
+};
+
+&swport1 {
+	label = "wan";
+	status = "okay";
+};
+
+&swport2 {
+	label = "lan2";
+	status = "okay";
+};
+
+&swport3 {
+	label = "lan3";
+	status = "okay";
+};
+
+&swport4 {
+	label = "lan4";
+	status = "okay";
+};
+
+&swport5 {
+	label = "lan5";
+	status = "okay";
+};
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-z3.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-z3.dts
new file mode 100644
index 0000000000..6ed70dc0a2
--- /dev/null
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-z3.dts
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// Device Tree Source for Meraki Z3 (Fuzzy Cricket)
+
+#include "qcom-ipq4029-wired-qca-common.dtsi"
+
+/ {
+	model = "Meraki Z3 Router";
+	compatible = "meraki,z3";
+
+	leds {
+		compatible = "gpio-leds";
+
+		power_orange: power {
+			color = <LED_COLOR_ID_AMBER>;
+			function = LED_FUNCTION_POWER;
+			gpios = <&tlmm 49 GPIO_ACTIVE_LOW>;
+			panic-indicator;
+		};
+
+		led-1 {
+			/* WAN left */
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WAN;
+			function-enumerator = <0>;
+			gpios = <&tlmm 46 GPIO_ACTIVE_LOW>;
+		};
+
+		led-2 {
+			/* WAN right */
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WAN;
+			function-enumerator = <1>;
+			gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
+		};
+
+		led-3 {
+			/* port 2 left */
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <2>;
+			gpios = <&tlmm 23 GPIO_ACTIVE_LOW>;
+		};
+
+		led-4 {
+			/* port 2 right */
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <3>;
+			gpios = <&tlmm 22 GPIO_ACTIVE_LOW>;
+		};
+
+		led-5 {
+			/* port 3 left */
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <4>;
+			gpios = <&tlmm 25 GPIO_ACTIVE_LOW>;
+		};
+
+		led-6 {
+			/* port 3 right */
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <5>;
+			gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
+		};
+
+		led-7 {
+			/* port 4 left */
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <6>;
+			gpios = <&tlmm 29 GPIO_ACTIVE_LOW>;
+		};
+
+		led-8 {
+			/* port 4 right */
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <7>;
+			gpios = <&tlmm 26 GPIO_ACTIVE_LOW>;
+		};
+
+		led-9 {
+			/* port 5 left */
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <8>;
+			gpios = <&tlmm 33 GPIO_ACTIVE_LOW>;
+		};
+
+		led-10 {
+			/* port 5 right */
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <9>;
+			gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&wifi0 {
+	status = "okay";
+	qcom,ath10k-calibration-variant = "Meraki-Z3";
+};
+
+&wifi1 {
+	status = "okay";
+	qcom,ath10k-calibration-variant = "Meraki-Z3";
+};
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index bbc4e390a0..648e73d030 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -794,6 +794,13 @@ define Device/meraki_common
 	DEVICE_PACKAGES := ath10k-firmware-qca9887-ct
 endef
 
+define Device/meraki_mr30h
+	$(call Device/meraki_common)
+	DEVICE_MODEL := MR30H
+	DEVICE_DTS_CONFIG := config at 2
+endef
+TARGET_DEVICES += meraki_mr30h
+
 define Device/meraki_mr33
 	$(call Device/meraki_common)
 	DEVICE_MODEL := MR33
@@ -807,6 +814,22 @@ define Device/meraki_mr74
 endef
 TARGET_DEVICES += meraki_mr74
 
+define Device/meraki_z3
+	$(call Device/meraki_common)
+	DEVICE_MODEL := Z3
+	DEVICE_DTS_CONFIG := config at 1
+	DEVICE_PACKAGES := -ath10k-firmware-qca9887-ct ipq-wifi-meraki_z3
+endef
+TARGET_DEVICES += meraki_z3
+
+define Device/meraki_gx20
+	$(call Device/meraki_common)
+	DEVICE_MODEL := GX20
+	DEVICE_DTS_CONFIG := config at 2
+	DEVICE_PACKAGES := -ath10k-board-qca4019 -ath10k-firmware-qca9887-ct
+endef
+TARGET_DEVICES += meraki_gx20
+
 define Device/mobipromo_cm520-79f
 	$(call Device/FitzImage)
 	$(call Device/UbiFit)




More information about the lede-commits mailing list