diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst index 54a2b464..9748822c 100644 --- a/docs/user/supported_devices.rst +++ b/docs/user/supported_devices.rst @@ -40,6 +40,7 @@ ath79-generic - MR600 (v1, v2) - MR900 (v1, v2) - MR1750 (v1, v2) + - OM2P (v1) * Plasma Cloud diff --git a/patches/openwrt/0007-ath79-Allow-to-set-spi-nor-mtd-name-via-devicetree.patch b/patches/openwrt/0007-ath79-Allow-to-set-spi-nor-mtd-name-via-devicetree.patch new file mode 100644 index 00000000..6507aa7f --- /dev/null +++ b/patches/openwrt/0007-ath79-Allow-to-set-spi-nor-mtd-name-via-devicetree.patch @@ -0,0 +1,135 @@ +From: Sven Eckelmann +Date: Thu, 31 Dec 2020 00:25:10 +0100 +Subject: ath79: Allow to set spi-nor mtd name via devicetree + +On ar71xx, it was possible to overwrite the name of the spi-nor mtd device +identifier using the flash_platform_data which each mach-*.c could adjust +for its devices. A similar feature was introduced for mtd-physmap in +devicetree's. The property linux,mtd-name can be used to set the name and +provide a stable identifier for mtdpart from the bootloader. + +But this feature is not yet available upstream for spi-nor devices which +also might receive their partition layout from the bootloader. But the +OpenWrt pistachio support for this property can simply be imported into +ath79 to gain this support. + +Signed-off-by: Sven Eckelmann +(cherry picked from commit 7f074fe1a79f27d30560c35778d963bc520e9a3e) + +diff --git a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch +new file mode 100644 +index 0000000000000000000000000000000000000000..af032df51e6dbc3824a45a8efaa1ce8db2261b2a +--- /dev/null ++++ b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch +@@ -0,0 +1,51 @@ ++From f32bc2aa01edcba2f2ed5db151cf183eac9ef919 Mon Sep 17 00:00:00 2001 ++From: Abhimanyu Vishwakarma ++Date: Sat, 25 Feb 2017 16:42:50 +0000 ++Subject: mtd: nor: support mtd name from device tree ++ ++Signed-off-by: Abhimanyu Vishwakarma ++ ++--- a/drivers/mtd/spi-nor/core.c +++++ b/drivers/mtd/spi-nor/core.c ++@@ -3088,6 +3088,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, ++ struct device *dev = nor->dev; ++ struct mtd_info *mtd = &nor->mtd; ++ struct device_node *np = spi_nor_get_flash_node(nor); +++ const char __maybe_unused *of_mtd_name = NULL; ++ int ret; ++ int i; ++ ++@@ -3142,7 +3143,12 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, ++ if (ret) ++ return ret; ++ ++- if (!mtd->name) +++#ifdef CONFIG_MTD_OF_PARTS +++ of_property_read_string(np, "linux,mtd-name", &of_mtd_name); +++#endif +++ if (of_mtd_name) +++ mtd->name = of_mtd_name; +++ else if (!mtd->name) ++ mtd->name = dev_name(dev); ++ mtd->priv = nor; ++ mtd->type = MTD_NORFLASH; ++--- a/drivers/mtd/mtdcore.c +++++ b/drivers/mtd/mtdcore.c ++@@ -762,6 +762,17 @@ int del_mtd_device(struct mtd_info *mtd) ++ */ ++ static void mtd_set_dev_defaults(struct mtd_info *mtd) ++ { +++#ifdef CONFIG_MTD_OF_PARTS +++ const char __maybe_unused *of_mtd_name = NULL; +++ struct device_node *np; +++ +++ np = mtd_get_of_node(mtd); +++ if (np && !mtd->name) { +++ of_property_read_string(np, "linux,mtd-name", &of_mtd_name); +++ if (of_mtd_name) +++ mtd->name = of_mtd_name; +++ } else +++#endif ++ if (mtd->dev.parent) { ++ if (!mtd->owner && mtd->dev.parent->driver) ++ mtd->owner = mtd->dev.parent->driver->owner; +diff --git a/target/linux/ath79/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch +new file mode 100644 +index 0000000000000000000000000000000000000000..a02b632e8c48f4a2df7d66b732aa60dd6788b6b1 +--- /dev/null ++++ b/target/linux/ath79/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch +@@ -0,0 +1,54 @@ ++From f32bc2aa01edcba2f2ed5db151cf183eac9ef919 Mon Sep 17 00:00:00 2001 ++From: Abhimanyu Vishwakarma ++Date: Sat, 25 Feb 2017 16:42:50 +0000 ++Subject: mtd: nor: support mtd name from device tree ++ ++Signed-off-by: Abhimanyu Vishwakarma ++--- ++ drivers/mtd/spi-nor/spi-nor.c | 8 +++++++- ++ 1 file changed, 7 insertions(+), 1 deletion(-) ++ ++--- a/drivers/mtd/spi-nor/spi-nor.c +++++ b/drivers/mtd/spi-nor/spi-nor.c ++@@ -4937,6 +4937,7 @@ int spi_nor_scan(struct spi_nor *nor, co ++ struct mtd_info *mtd = &nor->mtd; ++ struct device_node *np = spi_nor_get_flash_node(nor); ++ struct spi_nor_flash_parameter *params = &nor->params; +++ const char __maybe_unused *of_mtd_name = NULL; ++ int ret; ++ int i; ++ ++@@ -4999,7 +5000,12 @@ int spi_nor_scan(struct spi_nor *nor, co ++ /* Init flash parameters based on flash_info struct and SFDP */ ++ spi_nor_init_params(nor); ++ ++- if (!mtd->name) +++#ifdef CONFIG_MTD_OF_PARTS +++ of_property_read_string(np, "linux,mtd-name", &of_mtd_name); +++#endif +++ if (of_mtd_name) +++ mtd->name = of_mtd_name; +++ else if (!mtd->name) ++ mtd->name = dev_name(dev); ++ mtd->priv = nor; ++ mtd->type = MTD_NORFLASH; ++--- a/drivers/mtd/mtdcore.c +++++ b/drivers/mtd/mtdcore.c ++@@ -778,6 +778,17 @@ out_error: ++ */ ++ static void mtd_set_dev_defaults(struct mtd_info *mtd) ++ { +++#ifdef CONFIG_MTD_OF_PARTS +++ const char __maybe_unused *of_mtd_name = NULL; +++ struct device_node *np; +++ +++ np = mtd_get_of_node(mtd); +++ if (np && !mtd->name) { +++ of_property_read_string(np, "linux,mtd-name", &of_mtd_name); +++ if (of_mtd_name) +++ mtd->name = of_mtd_name; +++ } else +++#endif ++ if (mtd->dev.parent) { ++ if (!mtd->owner && mtd->dev.parent->driver) ++ mtd->owner = mtd->dev.parent->driver->owner; diff --git a/patches/openwrt/0008-ath79-Add-support-for-OpenMesh-OM2P-v1.patch b/patches/openwrt/0008-ath79-Add-support-for-OpenMesh-OM2P-v1.patch new file mode 100644 index 00000000..1a7dba45 --- /dev/null +++ b/patches/openwrt/0008-ath79-Add-support-for-OpenMesh-OM2P-v1.patch @@ -0,0 +1,316 @@ +From: Sven Eckelmann +Date: Mon, 23 Nov 2020 13:41:34 +0100 +Subject: ath79: Add support for OpenMesh OM2P v1 + +Device specifications: +====================== + +* Qualcomm/Atheros AR7240 rev 2 +* 350/350/175 MHz (CPU/DDR/AHB) +* 32 MB of RAM +* 16 MB of SPI NOR flash + - 2x 7 MB available; but one of the 7 MB regions is the recovery image +* 2x 10/100 Mbps Ethernet +* 1T1R 2.4 GHz Wi-Fi +* 6x GPIO-LEDs (3x wifi, 2x ethernet, 1x power) +* 1x GPIO-button (reset) +* external h/w watchdog (enabled by default) +* TTL pins are on board (arrow points to VCC, then follows: GND, TX, RX) +* 2x fast ethernet + - eth0 + + 18-24V passive POE (mode B) + + used as WAN interface + - eth1 + + builtin switch port 4 + + used as LAN interface +* 12-24V 1A DC +* external antenna + +The device itself requires the mtdparts from the uboot arguments to +properly boot the flashed image and to support dual-boot (primary + +recovery image). Unfortunately, the name of the mtd device in mtdparts is +still using the legacy name "ar7240-nor0" which must be supplied using the +Linux-specfic DT parameter linux,mtd-name to overwrite the generic name +"spi0.0". + +Flashing instructions: +====================== + +Various methods can be used to install the actual image on the flash. +Two easy ones are: + +ap51-flash +---------- + +The tool ap51-flash (https://github.com/ap51-flash/ap51-flash) should be +used to transfer the image to the u-boot when the device boots up. + +initramfs from TFTP +------------------- + +The serial console must be used to access the u-boot shell during bootup. +It can then be used to first boot up the initramfs image from a TFTP server +(here with the IP 192.168.1.21): + + setenv serverip 192.168.1.21 + setenv ipaddr 192.168.1.1 + tftpboot 0c00000 .bin && bootm $fileaddr + +The actual sysupgrade image can then be transferred (on the LAN port) to the +device via + + scp .bin root@192.168.1.1:/tmp/ + +On the device, the sysupgrade must then be started using + + sysupgrade -n /tmp/.bin + +Signed-off-by: Sven Eckelmann +(cherry picked from commit 8143709c90c3aa0a84e14cf4a9dfbcb365b0d966) + +diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 +index a37057953bc1e9b7fdf2be02136142d0fc145054..f4ccb2faea4e5e6202413a76cd137065dc535fe7 100644 +--- a/package/boot/uboot-envtools/files/ath79 ++++ b/package/boot/uboot-envtools/files/ath79 +@@ -95,6 +95,7 @@ netgear,wndr4300tn|\ + netgear,wndr4300sw) + ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000" + ;; ++openmesh,om2p-v1|\ + openmesh,om2p-v2|\ + openmesh,om2p-v4|\ + openmesh,om2p-hs-v1|\ +diff --git a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts +new file mode 100644 +index 0000000000000000000000000000000000000000..24d406f7ecd2e14729587190de1aecf71029a1eb +--- /dev/null ++++ b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts +@@ -0,0 +1,154 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT ++ ++#include "ar7240.dtsi" ++ ++#include ++#include ++ ++/ { ++ compatible = "openmesh,om2p-v1", "qca,ar7240"; ++ model = "OpenMesh OM2P v1"; ++ ++ chosen { ++ /delete-property/ bootargs; ++ }; ++ ++ aliases { ++ 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 1 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ pinctrl-names = "default"; ++ pinctrl-0 = <&switch_led_disable_pins>; ++ ++ led_power_blue: power_blue { ++ label = "blue:power"; ++ gpios = <&gpio 0 GPIO_ACTIVE_LOW>; ++ default-state = "on"; ++ }; ++ ++ wifi_green { ++ label = "green:wifi"; ++ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "phy0tpt"; ++ }; ++ ++ wifi_red { ++ label = "red:wifi"; ++ gpios = <&gpio 14 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wifi_yellow { ++ label = "yellow:wifi"; ++ gpios = <&gpio 15 GPIO_ACTIVE_LOW>; ++ }; ++ ++ lan_blue { ++ label = "blue:lan"; ++ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; ++ }; ++ ++ wan_blue { ++ label = "blue:wan"; ++ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ watchdog { ++ compatible = "linux,wdt-gpio"; ++ gpios = <&gpio 12 GPIO_ACTIVE_LOW>; ++ hw_algo = "toggle"; ++ /* hw_margin_ms is actually 300s but driver limits it to 60s */ ++ hw_margin_ms = <60000>; ++ always-running; ++ }; ++}; ++ ++&spi { ++ status = "okay"; ++ ++ flash@0 { ++ compatible = "jedec,spi-nor"; ++ reg = <0>; ++ spi-max-frequency = <40000000>; ++ linux,mtd-name = "ar7240-nor0"; ++ ++ /* 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 0x040000>; ++ }; ++ ++ partition@80000 { ++ label = "custom"; ++ reg = <0x080000 0x140000>; ++ read-only; ++ }; ++ ++ partition@1c0000 { ++ label = "inactive"; ++ reg = <0x1c0000 0x700000>; ++ }; ++ ++ partition@8c0000 { ++ label = "inactive2"; ++ reg = <0x8c0000 0x700000>; ++ }; ++ ++ art: partition@fc0000 { ++ label = "ART"; ++ reg = <0xfc0000 0x040000>; ++ read-only; ++ }; ++ }; ++ }; ++}; ++ ++ð0 { ++ mtd-mac-address = <&art 0x0>; ++}; ++ ++ð1 { ++ status = "okay"; ++ ++ mtd-mac-address = <&art 0x6>; ++}; ++ ++&pcie { ++ status = "okay"; ++ ++ wifi@0,0 { ++ compatible = "pci168c,002a"; ++ reg = <0x0000 0 0 0 0>; ++ qca,no-eeprom; ++ #gpio-cells = <2>; ++ gpio-controller; ++ }; ++}; +diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds +index 3031b4703bfa885c5036856f0ba6a6dc332da4d8..f5384e7fc3859bab1d6c0422de7e173fad3abae2 100755 +--- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds ++++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds +@@ -253,6 +253,10 @@ openmesh,om2p-hs-v4) + ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0" + ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x02" + ;; ++openmesh,om2p-v1) ++ ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0" ++ ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x10" ++ ;; + pcs,cr3000) + ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" + ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x04" +diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network +index c2932c1737d97f3eb732620041664f5060d16946..5626f79ee199865df4e9a4f04ce2ff9580bce012 100755 +--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network ++++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network +@@ -174,6 +174,7 @@ ath79_setup_interfaces() + compex,wpj531-16m|\ + openmesh,a40|\ + openmesh,a60|\ ++ openmesh,om2p-v1|\ + openmesh,om2p-v4|\ + openmesh,om2p-hs-v4|\ + plasmacloud,pa300|\ +diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +index 08d9e017a734e29c9b3be4c865e32f109847b4f5..cf07f138260170bcac789e617e09978776b3d2c5 100644 +--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom ++++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +@@ -128,6 +128,9 @@ case "$FIRMWARE" in + openmesh,mr600-v2) + caldata_extract "ART" 0x5000 0x440 + ;; ++ openmesh,om2p-v1) ++ caldata_extract "ART" 0x1000 0x440 ++ ;; + wd,mynet-n750) + caldata_extract "art" 0x5000 0x440 + ath9k_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac") +diff --git a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh +index e979c11bb91cb20fd4168b8921499f03572d3512..e9203f3a5b624e1e9b46c474e95e27583bcb6765 100644 +--- a/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh ++++ b/target/linux/ath79/generic/base-files/lib/upgrade/platform.sh +@@ -73,6 +73,7 @@ platform_do_upgrade() { + openmesh,mr900-v2|\ + openmesh,mr1750-v1|\ + openmesh,mr1750-v2|\ ++ openmesh,om2p-v1|\ + openmesh,om2p-v2|\ + openmesh,om2p-v4|\ + openmesh,om2p-hs-v1|\ +diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk +index c63900dc701bbc21dce12086f7045d7d450fc5f3..8113b515368b253d0812fbbb86278e7fde63a038 100644 +--- a/target/linux/ath79/image/generic.mk ++++ b/target/linux/ath79/image/generic.mk +@@ -1722,6 +1722,16 @@ define Device/openmesh_mr1750-v2 + endef + TARGET_DEVICES += openmesh_mr1750-v2 + ++define Device/openmesh_om2p-v1 ++ $(Device/openmesh_common_256k) ++ SOC := ar7240 ++ DEVICE_MODEL := OM2P ++ DEVICE_VARIANT := v1 ++ OPENMESH_CE_TYPE := OM2P ++ SUPPORTED_DEVICES += om2p ++endef ++TARGET_DEVICES += openmesh_om2p-v1 ++ + define Device/openmesh_om2p-v2 + $(Device/openmesh_common_256k) + SOC := ar9330 diff --git a/targets/ath79-generic b/targets/ath79-generic index 6cb92e36..7be977df 100644 --- a/targets/ath79-generic +++ b/targets/ath79-generic @@ -139,6 +139,12 @@ device('openmesh-mr1750-v2', 'openmesh_mr1750-v2', { manifest_aliases = {'openmesh-mr1750v2'}, }) +device('openmesh-om2p-v1', 'openmesh_om2p-v1', { + factory = false, + -- old name from OpenWrt 19.07.x + manifest_aliases = {'openmesh-om2p'}, +}) + -- Plasma Cloud