| Message ID | 20191113182238.1921-1-admin@kryma.net |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [OpenWrt-Devel,v2] ath79: add support for COMFAST CF-E130N v2 | expand |
Hi Pavel, > Specifications: > > - QCA9531 SoC > - 1x 10/100 Mbps Ethernet, both with PoE-in support If it has one Ethernet, then there's only one PoE-in. Cheers!
Hi, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] On > Behalf Of admin@kryma.net > Sent: Mittwoch, 13. November 2019 19:23 > To: openwrt-devel@lists.openwrt.org > Cc: Pavel Balan <admin@kryma.net> > Subject: [OpenWrt-Devel] [PATCH v2] ath79: add support for COMFAST CF-E130N > v2 > > From: Pavel Balan <admin@kryma.net> > > This patch adds support for the COMFAST CF-E130N v2, an outdoor wireless > CPE with a single Ethernet port and a 802.11bgn radio. > > Specifications: > > - QCA9531 SoC > - 1x 10/100 Mbps Ethernet, both with PoE-in support > - 64 MB of RAM (DDR2) > - 16 MB of FLASH > - 5 dBi built-in antenna > - POWER/LAN/WLAN green LEDs > - 4x RSSI LEDs (2x red, 2x green) > - UART (115200 8N1) and GPIO (J9) headers on PCB > > Flashing instructions: > > The original firmware is based on OpenWrt so a sysupgrade image can be > installed via the stock web GUI. > > The U-boot bootloader also contains a backup TFTP client to upload the > firmware from. Upon boot, it checks its ethernet network for the IP > 192.168.1.10. Host a TFTP server and provide the image to be flashed as > file firmware_auto.bin. > > Changes since v1: > > -Formatting fixes. > -Looked into rssi_medium_high more - found the correct GPIO pin. > -Removed the pin muxer. > -Changed 802.11an to 802.11bgn in the patch description. > > Open questions: > > -LED menu in LUCI does not show the list of LEDs properly. > A LUCI issue or a device config one? Please put patch revision changes and questions after a line with "---" mark in your commit message. This automatically cuts off those when the patch is applied to a repository with git am. > > > Signed-off-by: Pavel Balan <admin@kryma.net> > --- > .../ath79/dts/qca9531_comfast_cf-e130n-v2.dts | 139 ++++++++++++++++++ > .../generic/base-files/etc/board.d/01_leds | 8 + > target/linux/ath79/image/generic.mk | 10 ++ > 3 files changed, 157 insertions(+) > create mode 100644 target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts > > diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts > b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts > new file mode 100644 > index 0000000000..b5527c0a49 > --- /dev/null > +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts > @@ -0,0 +1,139 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT > +/dts-v1/; > + > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > + > +#include "qca953x.dtsi" > + > +/ { > + compatible = "comfast,cf-e130n-v2", "qca,qca9531"; > + model = "COMFAST CF-E130N v2"; > + > + aliases { > + serial0 = &uart; > + led-boot = &led_rssihigh; > + led-failsafe = &led_rssihigh; > + led-upgrade = &led_rssihigh; > + label-mac-device = ð0; > + }; > + > + leds { > + compatible = "gpio-leds"; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&led_rssimediumhigh_pin>; I do not see the node corresponding to this reference. So, you haven't even build-tested that one (it should produce an error during build...). > + > + led_wlan { > + label = "cf-e130n-v2:green:wlan"; > + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; > + linux,default-trigger = "phy0tpt"; > + }; > + > + led_lan { > + label = "cf-e130n-v2:green:lan"; > + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; > + }; > + > + led_unused { > + label = "cf-e130n-v2:green:unused"; > + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; > + }; > + > + led_rssilow { > + label = "cf-e130n-v2:red:rssilow"; > + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; > + }; > + > + led_rssimediumlow { > + label = "cf-e130n-v2:red:rssimediumlow"; > + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; > + }; > + > + led_rssimediumhigh { > + label = "cf-e130n-v2:green:rssimediumhigh"; > + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; > + }; > + > + led_rssihigh: led_rssihigh { > + label = "cf-e130n-v2:green:rssihigh"; > + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; > + }; Sorry, maybe I wasn't precise enough here: The _node label_ should be prefixed by "led_", but the _node name_ should not include it: " led_rssihigh: rssihigh {" " rssimediumhigh {" etc. > + }; > + > + keys { > + compatible = "gpio-keys"; > + > + reset { > + label = "reset"; > + linux,code = <KEY_RESTART>; > + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; > + debounce-interval = <60>; > + }; > + }; > +}; > + > +&spi { > + status = "okay"; > + > + num-cs = <1>; > + > + 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 0x010000>; > + read-only; > + }; > + > + art: partition@10000 { > + label = "art"; > + reg = <0x010000 0x010000>; > + read-only; > + }; > + > + partition@20000 { > + compatible = "denx,uimage"; > + label = "firmware"; > + reg = <0x020000 0x7d0000>; > + }; > + > + partition@7f0000 { > + label = "nvram"; > + reg = <0x7f0000 0x010000>; > + read-only; > + }; > + }; > + }; > +}; > + > +&uart { > + status = "okay"; > + > +}; Remove empty line. > + > +ð0 { > + status = "okay"; > + phy-handle = <&swphy0>; Add empty line after status. > + > + mtd-mac-address = <&art 0x0>; > + > + gmac-config { > + device = <&gmac>; > + switch-phy-swap = <1>; > + }; > +}; > + > +&wmac { > + status = "okay"; Add empty line after status. > + mtd-cal-data = <&art 0x1000>; > +}; > + Remove empty line at the end. Best Adrian
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts new file mode 100644 index 0000000000..b5527c0a49 --- /dev/null +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts @@ -0,0 +1,139 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +#include "qca953x.dtsi" + +/ { + compatible = "comfast,cf-e130n-v2", "qca,qca9531"; + model = "COMFAST CF-E130N v2"; + + aliases { + serial0 = &uart; + led-boot = &led_rssihigh; + led-failsafe = &led_rssihigh; + led-upgrade = &led_rssihigh; + label-mac-device = ð0; + }; + + leds { + compatible = "gpio-leds"; + + pinctrl-names = "default"; + pinctrl-0 = <&led_rssimediumhigh_pin>; + + led_wlan { + label = "cf-e130n-v2:green:wlan"; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + led_lan { + label = "cf-e130n-v2:green:lan"; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; + }; + + led_unused { + label = "cf-e130n-v2:green:unused"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + }; + + led_rssilow { + label = "cf-e130n-v2:red:rssilow"; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + }; + + led_rssimediumlow { + label = "cf-e130n-v2:red:rssimediumlow"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + + led_rssimediumhigh { + label = "cf-e130n-v2:green:rssimediumhigh"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + led_rssihigh: led_rssihigh { + label = "cf-e130n-v2:green:rssihigh"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = <KEY_RESTART>; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + 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 0x010000>; + read-only; + }; + + art: partition@10000 { + label = "art"; + reg = <0x010000 0x010000>; + read-only; + }; + + partition@20000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x020000 0x7d0000>; + }; + + partition@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + read-only; + }; + }; + }; +}; + +&uart { + status = "okay"; + +}; + +ð0 { + status = "okay"; + phy-handle = <&swphy0>; + + mtd-mac-address = <&art 0x0>; + + gmac-config { + device = <&gmac>; + switch-phy-swap = <1>; + }; +}; + +&wmac { + status = "okay"; + mtd-cal-data = <&art 0x1000>; +}; + 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 fbb0d0ea03..3046d34605 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 @@ -47,6 +47,14 @@ comfast,cf-e120a-v3) ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssimediumhigh" "wlan0" "51" "100" ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan0" "76" "100" ;; +comfast,cf-e130n-v2) + ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0" + ucidef_set_rssimon "wlan0" "200000" "1" + ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:red:rssilow" "wlan0" "1" "100" + ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:red:rssimediumlow" "wlan0" "26" "100" + ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssimediumhigh" "wlan0" "51" "100" + ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan0" "76" "100" + ;; comfast,cf-e313ac) ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x02" ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 70631c20d0..256481ece3 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -258,6 +258,16 @@ define Device/comfast_cf-e120a-v3 endef TARGET_DEVICES += comfast_cf-e120a-v3 +define Device/comfast_cf-e130n-v2 + ATH_SOC := qca9531 + DEVICE_VENDOR := COMFAST + DEVICE_MODEL := CF-E130N + DEVICE_VARIANT := v2 + DEVICE_PACKAGES := rssileds kmod-leds-gpio -swconfig -uboot-envtools + IMAGE_SIZE := 8000k +endef +TARGET_DEVICES += comfast_cf-e130n-v2 + define Device/comfast_cf-e313ac ATH_SOC := qca9531 DEVICE_VENDOR := COMFAST