Hi Adrian! Please see comments below!
Am 15.05.21 um 16:05 schrieb Adrian Schmutzler: > Hi, > > comments below. > >> -----Original Message----- >> From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] >> On Behalf Of André Valentin >> Sent: Samstag, 15. Mai 2021 02:12 >> To: openwrt-devel@lists.openwrt.org >> Cc: avalen...@marcant.net >> Subject: [PATCH 2/2] ramips: mt7621: Add support for ZyXEL LTE3301-Plus >> >> The ZyXEL LTE3301-Plus is an 4G indoor CPE with 2 external LTE antennas. >> >> Specifications: >> >> - SoC: MediaTek MT7621AT >> - RAM: 256 MB >> - Flash: 128 MB MB NAND (MX30LF1G18AC) >> - WiFi: MediaTek MT7615E >> - Switch: 4 LAN ports (Gigabit) >> - LTE: Quectel EG506 connected by USB3 to SoC >> - SIM: 1 micro-SIM slot >> - USB: USB3 port >> - Buttons: Reset, WPS >> - LEDs: Multicolour power, internet, LTE, signal, Wifi, USB >> - Power: 12V, 1.5A >> >> The device is built as an indoor ethernet to LTE bridge or router with Wifi. >> >> UART Serial: >> >> 57600N1 >> Located on populated 5 pin header J5: >> >> [o] GND >> [ ] key - no pin >> [o] 3.3V Vcc >> [o] RX >> [o] TX >> >> For more details about flashing see commit >> 2449a632084b29632605e5a79ce5d73028eb15dd . >> >> Signed-off-by: André Valentin <avalen...@marcant.net> >> --- >> .../ramips/dts/mt7621_zyxel_lte3301-plus.dts | 213 ++++++++++++++++++ >> target/linux/ramips/image/mt7621.mk | 16 ++ >> .../mt7621/base-files/etc/board.d/01_leds | 4 + >> .../mt7621/base-files/etc/board.d/02_network | 3 + >> .../base-files/etc/board.d/03_gpio_switches | 3 + >> .../mt7621/base-files/etc/init.d/bootcount | 1 + >> .../mt7621/base-files/lib/upgrade/platform.sh | 1 + >> 7 files changed, 241 insertions(+) >> create mode 100644 target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts >> >> diff --git a/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts >> b/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts >> new file mode 100644 >> index 0000000000..9f2939bb2b >> --- /dev/null >> +++ b/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts >> @@ -0,0 +1,213 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT >> + >> +#include "mt7621.dtsi" >> + >> +#include <dt-bindings/gpio/gpio.h> >> +#include <dt-bindings/input/input.h> >> + >> +/ { >> + compatible = "zyxel,lte3301-plus", "mediatek,mt7621-soc"; >> + model = "ZyXEL LTE3301-Plus"; >> + >> + aliases { >> + label-mac-device = &gmac0; >> + led-boot = &led_power; >> + led-failsafe = &led_power; >> + led-running = &led_power; >> + led-upgrade = &led_power; >> + }; >> + >> + chosen { >> + bootargs = "console=ttyS0,57600"; >> + }; > > IIRC, this is already in the DTSI and can be dropped. > >> + >> + leds { >> + compatible = "gpio-leds"; >> + >> + led_power: power { >> + label = "lte3301-plus:white:power"; > > drop model from LED labels, keeping just "white:power" etc. Thanks, fixed! > >> + gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; >> + }; >> + >> + wifi { >> + label = "lte3301-plus:white:wifi"; >> + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; >> + }; >> + >> + internet { >> + label = "lte3301-plus:white:internet"; >> + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; >> + }; >> + >> + usb { >> + label = "lte3301-plus:white:usb"; >> + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; >> + }; >> + >> + lte { >> + label = "lte3301-plus:white:lte"; >> + gpios = <&gpio 26 GPIO_ACTIVE_LOW>; >> + }; >> + >> + mobile_green { >> + label = "lte3301-plus:green:mobile"; >> + gpios = <&gpio 31 GPIO_ACTIVE_LOW>; >> + }; >> + >> + mobile_orange { >> + label = "lte3301-plus:orange:mobile"; >> + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; >> + }; > > Missing empty line between nodes. Thanks, fixed! > >> + mobile_red { >> + label = "lte3301-plus:red:mobile"; >> + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; >> + }; >> + }; >> + >> + keys { >> + compatible = "gpio-keys"; >> + >> + reset { >> + label = "reset"; >> + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; >> + linux,code = <KEY_RESTART>; >> + }; >> + >> + wps { >> + label = "wps"; >> + gpios = <&gpio 6 GPIO_ACTIVE_LOW>; >> + linux,code = <KEY_WPS_BUTTON>; >> + }; >> + }; >> +}; >> + >> +&gpio { >> + status = "okay"; >> + >> + lte_power { >> + gpio-hog; >> + gpios = <27 GPIO_ACTIVE_LOW>; >> + output-high; >> + line-name = "lte-power"; >> + }; >> + >> + usb_power { >> + gpio-hog; >> + gpios = <7 GPIO_ACTIVE_HIGH>; >> + output-high; >> + line-name = "usb-power"; >> + }; >> +}; >> + >> +&nand { >> + status = "okay"; >> + >> + partitions { >> + compatible = "fixed-partitions"; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + >> + partition@0 { >> + label = "Bootloader"; >> + reg = <0x0 0x80000>; >> + read-only; >> + }; >> + >> + partition@80000 { >> + label = "Config"; >> + reg = <0x80000 0x80000>; >> + }; >> + >> + factory: partition@100000 { >> + label = "Factory"; >> + reg = <0x100000 0x40000>; >> + read-only; >> + }; >> + >> + partition@140000 { >> + label = "Kernel"; >> + reg = <0x140000 0x1ec0000>; >> + }; > > "ubi" is part of kernel? see below > >> + >> + partition@540000 { >> + label = "ubi"; >> + reg = <0x540000 0x1ac0000>; >> + }; >> + >> + partition@2140000 { >> + label = "Kernel2"; >> + reg = <0x2140000 0x1ec0000>; >> + }; > > What's in 0x2000000 to 0x2140000? Or did I miscalculate? No, no miscalculation. This was taken from factory. But please wait, I'm working on an alternative! > >> + >> + partition@4000000 { >> + label = "wwan"; >> + reg = <0x4000000 0x100000>; >> + }; >> + >> + partition@4100000 { >> + label = "data"; >> + reg = <0x4100000 0x1000000>; >> + }; >> + >> + partition@5100000 { >> + label = "rom-d"; >> + reg = <0x5100000 0x100000>; >> + read-only; >> + }; >> + >> + partition@5200000 { >> + label = "reserve"; >> + reg = <0x5200000 0x80000>; >> + }; >> + }; >> +}; >> + >> +&pcie { >> + status = "okay"; >> +}; >> + >> +&pcie0 { >> + status = "okay"; > > Add empty line after status. Thanks, fixed! > >> + mt7615d@1,0 { > > wifi@1,0 > >> + compatible = "pci14c3,7615"; >> + reg = <0x0000 0 0 0 0>; >> + mediatek,firmware-eeprom = "mt7615e_eeprom.bin"; >> + mediatek,mtd-eeprom = <&factory 0x0000>; >> + mtd-mac-address = <&factory 0xfe6e>; >> + mtd-mac-address-increment = <1>; > > That's a very unusual location. Nothing in 0x4, 0x8004, 0x28, 0x2e, 0xe000 or > 0xe006? Yepp. I verified it before. But it's correct. > >> + }; >> +}; >> + >> +&gmac0 { >> + mtd-mac-address = <&factory 0xfe6e>; >> +}; >> + >> +&switch0 { >> + ports { >> + port@0 { >> + status = "okay"; >> + label = "lan4"; >> + }; >> + port@1 { >> + status = "okay"; >> + label = "lan3"; >> + }; >> + port@2 { >> + status = "okay"; >> + label = "lan2"; >> + }; >> + port@3 { >> + status = "okay"; >> + label = "lan1"; >> + }; >> + }; >> +}; >> + >> + > > Remove second empty line. Thanks, fixed! > >> +&state_default { >> + gpio { >> + groups = "uart2", "uart3", "rgmii2", "jtag"; > > "wdt" instead of "uart2"? Thanks, fixed! > >> + function = "gpio"; >> + }; >> + > > Remove empty line. Thanks, fixed! > >> +}; >> diff --git a/target/linux/ramips/image/mt7621.mk >> b/target/linux/ramips/image/mt7621.mk >> index 48448c2ab1..e2c9d23eee 100644 >> --- a/target/linux/ramips/image/mt7621.mk >> +++ b/target/linux/ramips/image/mt7621.mk >> @@ -1511,6 +1511,22 @@ define Device/zio_freezio endef >> TARGET_DEVICES += zio_freezio >> >> +define Device/zyxel_lte3301-plus >> + $(Device/dsa-migration) >> + BLOCKSIZE := 128k >> + PAGESIZE := 2048 >> + UBINIZE_OPTS := -E 5 >> + DEVICE_VENDOR := ZyXEL >> + DEVICE_MODEL := LTE3301-PLUS > > Plus instead of PLUS? Thanks, changed all to LTE3301-PLUS > >> + DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 >> +uboot-envtools kmod-usb-ledtrig-usbport kmod-usb-net-qmi-wwan >> +kmod-usb-serial-option uqmi > > Please wrap lines after 74 chars. Thanks, fixed! > >> + KERNEL := $(KERNEL_DTB) | uImage lzma | zytrx-header >> $$(DEVICE_MODEL) >> +$$(VERSION_DIST)-$$(REVISION) >> + KERNEL_INITRAMFS := $(KERNEL_DTB) | uImage lzma | zytrx-header >> +$$(DEVICE_MODEL) 9.99(ABQU.1)$$(VERSION_DIST)-recovery >> + KERNEL_INITRAMFS_SUFFIX := -recovery.bin >> + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata >> + SUPPORTED_DEVICES += lte3301-plus > > This line can be removed. Thanks, fixed! > >> +endef >> +TARGET_DEVICES += zyxel_lte3301-plus >> + >> define Device/zyxel_nr7101 >> $(Device/dsa-migration) >> BLOCKSIZE := 128k >> diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds >> b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds >> index 6743b7e6c3..65a808b885 100644 >> --- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds >> +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds >> @@ -98,6 +98,10 @@ xiaomi,redmi-router-ac2100) >> youhua,wr1200js) >> ucidef_set_led_netdev "internet" "INTERNET" "green:wan" "wan" >> ;; >> +zyxel,lte3301-plus) >> + ucidef_set_led_netdev "internet" "internet" >> "$boardname:white:internet" "wwan0" "link tx rx" > > Wrong indent. Use tabs. Thanks, fixed! > > "link tx rx" should be standard and can be removed. Thanks, fixed! > >> + ucidef_set_led_usbport "usb" "USB" "$boardname:white:usb" "usb1- >> port2" > > This can probably replaced by a DT trigger. You you give me a hint? > >> + ;; >> esac >> >> board_config_flush >> diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network >> b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network >> index cde3cba9bc..01a4faf3cc 100644 >> --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network >> +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network >> @@ -63,6 +63,9 @@ ramips_setup_interfaces() >> ubnt,edgerouter-x-sfp) >> ucidef_set_interfaces_lan_wan "eth1 eth2 eth3 eth4 eth5" >> "eth0" >> ;; >> + zyxel,lte3301-plus) >> + ucidef_set_interface_lan "lan1 lan2 lan3 lan4" >> + ;; > > This can be merged with linksys,re6500 etc. Note that indent is wrong here, > too. Thanks, fixed! > >> zyxel,nr7101) >> ucidef_set_interfaces_lan_wan "lan" "wan" >> ;; >> diff --git a/target/linux/ramips/mt7621/base- >> files/etc/board.d/03_gpio_switches b/target/linux/ramips/mt7621/base- >> files/etc/board.d/03_gpio_switches >> index ed728b07c4..1959d8c9d2 100644 >> --- a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches >> +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches >> @@ -22,6 +22,9 @@ ubnt,edgerouter-x-sfp) >> ucidef_add_gpio_switch "poe_power_port3" "PoE Power Port3" >> "403" >> ucidef_add_gpio_switch "poe_power_port4" "PoE Power Port4" >> "404" >> ;; >> +zyxel,lte3301-plus) >> + ucidef_add_gpio_switch "lte_power" "Power LTE modem" "507" >> + ;; > > Is this redundant with the lte_power hog? If yes, please decide for one of > the two settings. I've got some questions here. Personnally I use a special scripts for this modem, taking use of the lte_power line. I.E., reset the modem if it does not work anymore. So I do not want to set the GPIO alway to on. It should default to on, but be changable from userspace. What would be the correct implementation? > > Best > > Adrian > >> zyxel,nr7101) >> ucidef_add_gpio_switch "lte_reset" "Reset LTE/5G modem" "483" >> ;; >> diff --git a/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount >> b/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount >> index a155458d3f..03c6d8eea7 100755 >> --- a/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount >> +++ b/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount >> @@ -16,6 +16,7 @@ boot() { >> samknows,whitebox-v8) >> fw_setenv bootcount 0 >> ;; >> + zyxel,lte3301-plus|\ >> zyxel,nr7101) >> [ $(printf %d $(fw_printenv -n DebugFlag)) -gt 0 ] || >> fw_setenv DebugFlag 0x1 >> [ $(printf %d $(fw_printenv -n Image1Stable)) -gt 0 ] || >> fw_setenv Image1Stable 1 diff --git a/target/linux/ramips/mt7621/base- >> files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base- >> files/lib/upgrade/platform.sh >> index d30bc3db2e..88a92cf624 100755 >> --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh >> +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh >> @@ -82,6 +82,7 @@ platform_do_upgrade() { >> ubnt,edgerouter-x-sfp) >> platform_upgrade_ubnt_erx Thank you very much for taking a look at this. Kind regards, André
OpenPGP_signature
Description: OpenPGP digital signature
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
