ipq40xx: add support for ZyXEL WRE6606
Specifications:
SOC:	Qualcomm IPQ4018 (DAKOTA) ARM Quad-Core
RAM:	128 MB Nanya NT5CC64M16GP-DI
FLASH:	16 MiB Macronix MX25L12845EMI-12G
ETH:	Qualcomm QCA8072
WLAN1:  Qualcomm Atheros QCA4018 2.4GHz 802.11b/g/n 2x2
WLAN2:  Qualcomm Atheros QCA4018 5GHz 802.11n/ac W2 2x2
INPUT:  WPS, Mode-toggle-switch
LED:	Power, WLAN 2.4GHz, WLAN 5GHz, LAN, WPS
        (LAN not controllable by software)
        (WLAN each green / red)
SERIAL:	Header next to eth-phy.
        VCC, TX, GND, RX (Square hole is VCC)
        The Serial setting is 115200-8-N-1.
Tested and working:
 - Ethernet (Correct MAC-address)
 - 2.4 GHz WiFi (Correct MAC-address)
 - 5 GHz WiFi (Correct MAC-address)
 - Factory installation from tftp
 - OpenWRT sysupgrade
 - LEDs
 - WPS Button
Not Working:
 - Mode-toggle-switch
Install via TFTP:
Connect to the devices serial. Hit Enter-Key in bootloader to stop
autobooting. Command `tftpboot` will pull an initramfs image named
`C0A86302.img` from a tftp server at `192.168.99.08/24`.
After successfull transfer, boot the image with `bootm`.
To persistently write the firmware, flash an openwrt sysupgrade image
from inside the initramfs, for example transfer
via `scp <sysupgrade> root@192.168.1.1:/tmp` and flash on the device
with `sysupgrade -n /tmp/<sysupgrade>`.
append-cmdline patch taken from chunkeeys work on the NBG6617.
Signed-off-by: Magnus Frühling <skorpy@frankfurt.ccc.de>
Co-authored-by: David Bauer <mail@david-bauer.net>
Co-authored-by: Christian Lamparter <chunkeey@googlemail.com>
			
			
This commit is contained in:
		 Magnus Frühling
					Magnus Frühling
				
			
				
					committed by
					
						 John Crispin
						John Crispin
					
				
			
			
				
	
			
			
			 John Crispin
						John Crispin
					
				
			
						parent
						
							71ae0792ba
						
					
				
				
					commit
					4b280ad91a
				
			| @@ -14,7 +14,7 @@ define Build/Compile | ||||
| endef | ||||
|  | ||||
| #ALLWIFIBOARDS:=<devicename> | ||||
| ALLWIFIBOARDS:= | ||||
| ALLWIFIBOARDS:=zyxel_wre6606 | ||||
| ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD)) | ||||
|  | ||||
| define Package/ipq-wifi-default | ||||
| @@ -48,6 +48,7 @@ Don't install it for any other device! | ||||
|   PREV_BOARD+=ipq-wifi-$(1) | ||||
| endef | ||||
|  | ||||
| $(eval $(call generate-ipq-wifi-package,zyxel_wre6606,board-zyxel_wre6606.bin,ZyXEL WRE6606)) | ||||
| #$(eval $(call generate-ipq-wifi-package,<devicename>,<filename>,<displayname>)) | ||||
|  | ||||
| $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE)))) | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								package/firmware/ipq-wifi/board-zyxel_wre6606.bin
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								package/firmware/ipq-wifi/board-zyxel_wre6606.bin
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| @@ -34,6 +34,10 @@ netgear,ex6150v2) | ||||
| meraki,mr33) | ||||
| 	ucidef_set_interface_lan "eth0" | ||||
| 	;; | ||||
| zyxel,wre6606) | ||||
| 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2g" "phy0tpt" | ||||
| 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5g" "phy1tpt" | ||||
| 	;; | ||||
| *) | ||||
| 	;; | ||||
| esac | ||||
|   | ||||
| @@ -44,7 +44,8 @@ openmesh,a62) | ||||
| 	;; | ||||
| meraki,mr33 |\ | ||||
| netgear,ex6100v2 |\ | ||||
| netgear,ex6150v2) | ||||
| netgear,ex6150v2 |\ | ||||
| zyxel,wre6606) | ||||
| 	ucidef_set_interface_lan "eth0" | ||||
| 	;; | ||||
| *) | ||||
|   | ||||
| @@ -146,6 +146,10 @@ case "$FIRMWARE" in | ||||
| 	openmesh,a62) | ||||
| 		ath10kcal_extract "0:ART" 4096 12064 | ||||
| 		;; | ||||
| 	zyxel,wre6606) | ||||
| 		ath10kcal_extract "ART" 4096 12064 | ||||
| 		ath10kcal_patch_mac_crc $(macaddr_add $(cat /sys/class/net/eth0/address) -2) | ||||
| 		;; | ||||
| 	esac | ||||
| 	;; | ||||
| "ath10k/pre-cal-ahb-a800000.wifi.bin") | ||||
| @@ -177,6 +181,10 @@ case "$FIRMWARE" in | ||||
| 	openmesh,a62) | ||||
| 		ath10kcal_extract "0:ART" 20480 12064 | ||||
| 		;; | ||||
| 	zyxel,wre6606) | ||||
| 		ath10kcal_extract "ART" 20480 12064 | ||||
| 		ath10kcal_patch_mac_crc $(macaddr_add $(cat /sys/class/net/eth0/address) -1) | ||||
| 		;; | ||||
| 	esac | ||||
| 	;; | ||||
| *) | ||||
|   | ||||
| @@ -0,0 +1,261 @@ | ||||
| /* Copyright (c) 2015, The Linux Foundation. All rights reserved. | ||||
|  * Copyright (c) 2018, David Bauer <mail@david-bauer.net> | ||||
|  * | ||||
|  * Permission to use, copy, modify, and/or distribute this software for any | ||||
|  * purpose with or without fee is hereby granted, provided that the above | ||||
|  * copyright notice and this permission notice appear in all copies. | ||||
|  * | ||||
|  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||||
|  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||||
|  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||||
|  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||||
|  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||||
|  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||||
|  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||||
|  * | ||||
|  */ | ||||
|  | ||||
| #include "qcom-ipq4019.dtsi" | ||||
| #include "qcom-ipq4019-bus.dtsi" | ||||
| #include <dt-bindings/gpio/gpio.h> | ||||
| #include <dt-bindings/input/input.h> | ||||
| #include <dt-bindings/soc/qcom,tcsr.h> | ||||
|  | ||||
| / { | ||||
| 	model = "ZyXEL WRE6606"; | ||||
| 	compatible = "zyxel,wre6606", "qcom,ipq4019"; | ||||
|  | ||||
| 	aliases { | ||||
| 		led-boot = &power; | ||||
| 		led-failsafe = &power; | ||||
| 		led-running = &power; | ||||
| 		led-upgrade = &power; | ||||
| 	}; | ||||
|  | ||||
| 	chosen { | ||||
| 		bootargs-append = " mtdparts="; | ||||
| 	}; | ||||
|  | ||||
| 	soc { | ||||
| 		mdio@90000 { | ||||
| 			status = "okay"; | ||||
| 		}; | ||||
|  | ||||
| 		ess-psgmii@98000 { | ||||
| 			status = "okay"; | ||||
| 		}; | ||||
|  | ||||
| 		tcsr@1949000 { | ||||
| 			compatible = "qcom,tcsr"; | ||||
| 			reg = <0x1949000 0x100>; | ||||
| 			qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>; | ||||
| 		}; | ||||
|  | ||||
| 		ess_tcsr@1953000 { | ||||
| 			compatible = "qcom,tcsr"; | ||||
| 			reg = <0x1953000 0x1000>; | ||||
| 			qcom,ess-interface-select = <TCSR_ESS_PSGMII>; | ||||
| 		}; | ||||
|  | ||||
| 		tcsr@1957000 { | ||||
| 			compatible = "qcom,tcsr"; | ||||
| 			reg = <0x1957000 0x100>; | ||||
| 			qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>; | ||||
| 		}; | ||||
|  | ||||
| 		serial@78af000 { | ||||
| 			pinctrl-0 = <&serial_pins>; | ||||
| 			pinctrl-names = "default"; | ||||
| 			status = "okay"; | ||||
| 		}; | ||||
|  | ||||
| 		crypto@8e3a000 { | ||||
| 			status = "okay"; | ||||
| 		}; | ||||
|  | ||||
| 		watchdog@b017000 { | ||||
| 			status = "okay"; | ||||
| 		}; | ||||
|  | ||||
| 		ess-switch@c000000 { | ||||
| 			status = "okay"; | ||||
| 		}; | ||||
|  | ||||
| 		edma@c080000 { | ||||
| 			status = "okay"; | ||||
| 			qcom,num_gmac = <1>; | ||||
| 		}; | ||||
| 	}; | ||||
|  | ||||
| 	gpio-leds { | ||||
| 		compatible = "gpio-leds"; | ||||
|  | ||||
| 		wps { | ||||
| 			label = "wre6606:green:wps"; | ||||
| 			gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; | ||||
| 		}; | ||||
|  | ||||
| 		wlan5g_green { | ||||
| 			label = "wre6606:green:wlan5g"; | ||||
| 			gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; | ||||
| 		}; | ||||
|  | ||||
| 		power: power { | ||||
| 			label = "wre6606:green:power"; | ||||
| 			gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>; | ||||
| 		}; | ||||
|  | ||||
| 		wlan5g_red { | ||||
| 			label = "wre6606:red:wlan5g"; | ||||
| 			gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; | ||||
| 		}; | ||||
|  | ||||
| 		wlan2g_red { | ||||
| 			label = "wre6606:red:wlan2g"; | ||||
| 			gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>; | ||||
| 		}; | ||||
|  | ||||
| 		wlan2g_green { | ||||
| 			label = "wre6606:green:wlan2g"; | ||||
| 			gpios = <&tlmm 59 GPIO_ACTIVE_HIGH>; | ||||
| 		}; | ||||
| 	}; | ||||
|  | ||||
| 	gpio-keys { | ||||
| 		compatible = "gpio-keys"; | ||||
|  | ||||
| 		wps { | ||||
| 			label = "wps"; | ||||
| 			gpios = <&tlmm 63 GPIO_ACTIVE_LOW>; | ||||
| 			linux,code = <KEY_WPS_BUTTON>; | ||||
| 		}; | ||||
| 	}; | ||||
| }; | ||||
|  | ||||
| &tlmm { | ||||
| 	serial_pins: serial_pinmux { | ||||
| 		mux { | ||||
| 			pins = "gpio60", "gpio61"; | ||||
| 			function = "blsp_uart0"; | ||||
| 			bias-disable; | ||||
| 		}; | ||||
| 	}; | ||||
|  | ||||
| 	spi_0_pins: spi_0_pinmux { | ||||
| 		pin { | ||||
| 			function = "blsp_spi0"; | ||||
| 			pins = "gpio55", "gpio56", "gpio57"; | ||||
| 			drive-strength = <12>; | ||||
| 			bias-disable; | ||||
| 		}; | ||||
| 		pin_cs { | ||||
| 			function = "gpio"; | ||||
| 			pins = "gpio54"; | ||||
| 			drive-strength = <2>; | ||||
| 			bias-disable; | ||||
| 			output-high; | ||||
| 		}; | ||||
| 	}; | ||||
| }; | ||||
|  | ||||
| &spi_0 { | ||||
| 	pinctrl-0 = <&spi_0_pins>; | ||||
| 	pinctrl-names = "default"; | ||||
| 	status = "okay"; | ||||
| 	cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>; | ||||
|  | ||||
| 	mx25l12805d@0 { | ||||
| 		compatible = "jedec,spi-nor"; | ||||
| 		reg = <0>; | ||||
| 		spi-max-frequency = <24000000>; | ||||
|  | ||||
| 		partitions { | ||||
| 			compatible = "fixed-partitions"; | ||||
| 			#address-cells = <1>; | ||||
| 			#size-cells = <1>; | ||||
|  | ||||
| 			partition0@0 { | ||||
| 				label = "SBL1"; | ||||
| 				reg = <0x00000000 0x00040000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
|  | ||||
| 			partition1@40000 { | ||||
| 				label = "MIBIB"; | ||||
| 				reg = <0x00040000 0x00020000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
|  | ||||
| 			partition2@60000 { | ||||
| 				label = "QSEE"; | ||||
| 				reg = <0x00060000 0x00060000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
|  | ||||
| 			partition3@c0000 { | ||||
| 				label = "CDT"; | ||||
| 				reg = <0x000c0000 0x00010000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
|  | ||||
| 			partition4@d0000 { | ||||
| 				label = "DDRPARAMS"; | ||||
| 				reg = <0x000d0000 0x00010000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
|  | ||||
| 			partition5@E0000 { | ||||
| 				label = "APPSBLENV"; | ||||
| 				reg = <0x000e0000 0x00010000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
|  | ||||
| 			partition6@F0000 { | ||||
| 				label = "APPSBL"; | ||||
| 				reg = <0x000f0000 0x00080000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
|  | ||||
| 			partition7@170000 { | ||||
| 				label = "ART"; | ||||
| 				reg = <0x00170000 0x00010000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
|  | ||||
| 			partition8@180000 { | ||||
| 				label = "firmware"; | ||||
| 				reg = <0x00180000 0x00ce0000>; | ||||
| 			}; | ||||
|  | ||||
| 			partition9@e60000 { | ||||
| 				label = "manufacture"; | ||||
| 				reg = <0x00e60000 0x00050000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
|  | ||||
| 			partition10@eb0000 { | ||||
| 				label = "storage"; | ||||
| 				reg = <0x00eb0000 0x00150000>; | ||||
| 				read-only; | ||||
| 			}; | ||||
| 		}; | ||||
| 	}; | ||||
| }; | ||||
|  | ||||
| &blsp_dma { | ||||
| 	status = "okay"; | ||||
| }; | ||||
|  | ||||
| &cryptobam { | ||||
| 	status = "okay"; | ||||
| }; | ||||
|  | ||||
| &wifi0 { | ||||
| 	status = "okay"; | ||||
| 	qcom,ath10k-calibration-variant = "ZyXEL-WRE6606"; | ||||
| }; | ||||
|  | ||||
| &wifi1 { | ||||
| 	status = "okay"; | ||||
| 	qcom,ath10k-calibration-variant = "ZyXEL-WRE6606"; | ||||
| }; | ||||
| @@ -205,4 +205,15 @@ define Device/qcom_ap-dk04.1-c1 | ||||
| endef | ||||
| TARGET_DEVICES += qcom_ap-dk04.1-c1 | ||||
|  | ||||
| define Device/zyxel_wre6606 | ||||
| 	$(call Device/FitImage) | ||||
| 	DEVICE_TITLE := ZyXEL WRE6606 | ||||
| 	DEVICE_DTS_CONFIG := config@4 | ||||
| 	DEVICE_DTS := qcom-ipq4018-wre6606 | ||||
| 	DEVICE_PACKAGES := ipq-wifi-zyxel_wre6606 | ||||
| 	IMAGES := sysupgrade.bin | ||||
| 	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | ||||
| endef | ||||
| TARGET_DEVICES += zyxel_wre6606 | ||||
|  | ||||
| $(eval $(call BuildImage)) | ||||
|   | ||||
| @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org> | ||||
|  | ||||
| --- a/arch/arm/boot/dts/Makefile | ||||
| +++ b/arch/arm/boot/dts/Makefile | ||||
| @@ -697,7 +697,18 @@ dtb-$(CONFIG_ARCH_QCOM) += \ | ||||
| @@ -697,7 +697,19 @@ dtb-$(CONFIG_ARCH_QCOM) += \ | ||||
|  	qcom-apq8074-dragonboard.dtb \ | ||||
|  	qcom-apq8084-ifc6540.dtb \ | ||||
|  	qcom-apq8084-mtp.dtb \ | ||||
| @@ -20,6 +20,7 @@ Signed-off-by: John Crispin <john@phrozen.org> | ||||
| +	qcom-ipq4018-fritz4040.dtb \ | ||||
| +	qcom-ipq4018-jalapeno.dtb \ | ||||
| +	qcom-ipq4018-rt-ac58u.dtb \ | ||||
| +	qcom-ipq4018-wre6606.dtb \ | ||||
|  	qcom-ipq4019-ap.dk01.1-c1.dtb \ | ||||
| +	qcom-ipq4019-a62.dtb \ | ||||
| +	qcom-ipq4019-ap.dk04.1-c1.dtb \ | ||||
|   | ||||
| @@ -0,0 +1,12 @@ | ||||
| --- a/drivers/of/fdt.c | ||||
| +++ b/drivers/of/fdt.c | ||||
| @@ -1127,6 +1127,9 @@ int __init early_init_dt_scan_chosen(uns | ||||
|  	p = of_get_flat_dt_prop(node, "bootargs", &l); | ||||
|  	if (p != NULL && l > 0) | ||||
|  		strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); | ||||
| +	p = of_get_flat_dt_prop(node, "bootargs-append", &l); | ||||
| +	if (p != NULL && l > 0) | ||||
| +		strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); | ||||
|  | ||||
|  	/* | ||||
|  	 * CONFIG_CMDLINE is meant to be a default in case nothing else | ||||
		Reference in New Issue
	
	Block a user