[OpenWrt-Devel] [PATCH] ath79: add support for GL.iNet GL-AR750S

Mathias Kresin dev at kresin.me
Sun Dec 30 05:07:55 EST 2018


Hey Christoph,

find my comments inline.

Mathias


30/12/2018 10:53, Christoph Krapp:
> This patch adds supports for GL-AR750S.
> 
> Specification:
> - SOC: QCA9563 (775MHz)
> - Flash: 16 MiB (W25Q128FVSG)
> - RAM: 128 MiB DDR2
> - Ethernet: 2x 1Gbps LAN + 1x 1Gbps WAN
> - Wireless: 2.4GHz (bgn) and 5GHz (ac)
> - USB: 1x USB 2.0 port
> - Button: 1x switch button, 1x reset button
> - LED: 3x LEDS (green)
> 
> Flash instruction:
> Upload image via uboot web recovery

And how to get into the uboot web recovery mode?

> 
> Signed-off-by: Christoph Krapp <achterin at googlemail.com>
> ---
>   .../ath79/base-files/etc/board.d/02_network   |   4 +
>   .../etc/hotplug.d/firmware/11-ath10k-caldata  |   9 +-
>   .../linux/ath79/dts/qca9563_glinet_ar750s.dts | 153 ++++++++++++++++++
>   target/linux/ath79/image/generic.mk           |  12 ++
>   4 files changed, 174 insertions(+), 4 deletions(-)
>   create mode 100644 target/linux/ath79/dts/qca9563_glinet_ar750s.dts
> 
> diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network
> index 004ab59573..b9a0f356bf 100755
> --- a/target/linux/ath79/base-files/etc/board.d/02_network
> +++ b/target/linux/ath79/base-files/etc/board.d/02_network
> @@ -93,6 +93,10 @@ ath79_setup_interfaces()
>   	glinet,gl-x750)
>   		ucidef_set_interfaces_lan_wan "eth1" "eth0"
>   		;;
> +	glinet,ar750s)
> +		ucidef_add_switch "switch0" \
> +			"0 at eth0" "2:lan:2" "3:lan:1" "1:wan"
> +		;;
>   	nec,wg800hp)
>   		ucidef_add_switch "switch0" \
>   			"0 at eth0" "2:lan" "3:lan" "4:lan" "1:wan"
> diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
> index 53f57be824..2118d2b06b 100644
> --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
> +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
> @@ -92,6 +92,11 @@ case "$FIRMWARE" in
>   		ath10kcal_extract "art" 20480 2116
>   		ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0) -1)
>   		;;
> +	glinet,ar750s|\
> +	tplink,re450-v2)
> +		ath10kcal_extract "art" 20480 2116
> +		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
> +		;;
>   	glinet,gl-x750)
>   		ath10kcal_extract "art" 20480 2116
>   		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
> @@ -122,10 +127,6 @@ case "$FIRMWARE" in
>   		ath10kcal_extract "art" 20480 2116
>   		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
>   		;;
> -	tplink,re450-v2)
> -		ath10kcal_extract "art" 20480 2116
> -		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
> -		;;
>   	ubnt,unifiac-lite|\
>   	ubnt,unifiac-mesh|\
>   	ubnt,unifiac-mesh-pro|\
> diff --git a/target/linux/ath79/dts/qca9563_glinet_ar750s.dts b/target/linux/ath79/dts/qca9563_glinet_ar750s.dts
> new file mode 100644
> index 0000000000..64b346ae9c
> --- /dev/null
> +++ b/target/linux/ath79/dts/qca9563_glinet_ar750s.dts
> @@ -0,0 +1,153 @@
> +// 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 "qca956x.dtsi"
> +
> +/ {
> +	compatible = "glinet,ar750s", "qca,qca9563";
> +	model = "GL.iNet GL-AR750S";
> +
> +  chosen {
> +		bootargs = "console=ttyS0,115200n8";
> +	};

You have a lot of spaces vs. tabs issues at least in the dts file. 
Please make sure to use tabs everywhere.

> +
> +	keys {
> +		compatible = "gpio-keys-polled";
> +		poll-interval = <20>;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&jtag_disable_pins>;
> +
> +		button0 {
> +			label = "reset";
> +			linux,code = <KEY_RESTART>;
> +			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
> +		};
> +
> +    button1 {
> +			label = "button right";
> +			linux,code = <BTN_0>;
> +			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
> +		};
> +
> +	};
> +
> +	leds {
> +		compatible = "gpio-leds";
> +
> +		power {

Please add an aliases node, to configure boot status indication via this 
led. Have a look at the other dts files for examples.

> +			label = "gl-ar750s:green:power";
> +			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
> +			default-state = "keep";
> +		};
> +
> +    usbpower {

green:wan vs. usbpower. Either is wrong here.

> +			label = "gl-ar750s:green:wan";
> +			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
> +		};
> +
> +		wlan2g {
> +			label = "gl-ar750s:green:wlan2g";
> +			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
> +			linux,default-trigger = "phy1tpt";
> +		};
> +
> +		wlan5g {
> +			label = "gl-ar750s:green:wlan5g";
> +			gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
> +			linux,default-trigger = "phy0tpt";
> +		};
> +	};
> +};
> +
> +&spi {
> +	status = "okay";
> +	num-cs = <0>;
> +
> +	flash at 0 {
> +		compatible = "jedec,spi-nor";
> +		reg = <0>;
> +		spi-max-frequency = <25000000>;
> +
> +		partitions {
> +			compatible = "fixed-partitions";
> +			#address-cells = <1>;
> +			#size-cells = <1>;
> +
> +			partition at 0 {
> +				label = "u-boot";
> +				reg = <0x000000 0x040000>;
> +				read-only;
> +			};
> +
> +			partition at 40000 {
> +				label = "u-boot-env";
> +				reg = <0x040000 0x010000>;
> +			};
> +
> +      art: partition at 50000 {
> +        label = "art";
> +        reg = <0x050000 0x010000>;
> +      };
> +
> +			partition at 60000 {
> +				compatible = "denx,uimage";
> +				label = "firmware";
> +				reg = <0x060000 0xfa0000>;
> +			};
> +
> +		};
> +	};
> +};
> +
> +&pcie {
> +	status = "okay";
> +};
> +
> +&uart {
> +	status = "okay";
> +};
> +
> +&usb0 {
> +	#address-cells = <1>;
> +	#size-cells = <0>;
> +	status = "okay";
> +
> +	hub_port: port at 1 {
> +		reg = <1>;
> +		#trigger-source-cells = <0>;
> +	};
> +};
> +
> +&usb_phy0 {
> +	status = "okay";
> +};
> +
> +&mdio0 {
> +	status = "okay";
> +	phy-mask = <0>;
> +
> +	phy0: ethernet-phy at 0 {
> +		reg = <0>;
> +		phy-mode = "sgmii";
> +		qca,ar8327-initvals = <
> +			0x04 0x00080080 /* PORT0 PAD MODE CTRL */
> +			0x7c 0x0000007e /* PORT0_STATUS */
> +		>;
> +	};
> +};
> +
> +&eth0 {
> +	status = "okay";
> +
> +	mtd-mac-address = <&art 0x0>;
> +	phy-handle = <&phy0>;
> +};
> +
> +&wmac {
> +	status = "okay";
> +	mtd-cal-data = <&art 0x1000>;
> +	mtd-mac-address = <&art 0x1002>;
> +};
> diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
> index b2f83ba58c..1a53618f5c 100644
> --- a/target/linux/ath79/image/generic.mk
> +++ b/target/linux/ath79/image/generic.mk
> @@ -237,6 +237,18 @@ define Device/glinet_ar300m-nor
>   endef
>   TARGET_DEVICES += glinet_ar300m-nor
>   
> +define Device/glinet_ar750s
> +  ATH_SOC := qca9563
> +  DEVICE_TITLE := GL.iNet GL-AR750S
> +  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb-core \
> +	kmod-usb2 kmod-usb-storage

Don't add kmod-usb-storage here. It is up to the user to install this 
package. I'm quite sure kmod-usb-core can be dropped as well. It should 
be (auto)selected as a dependency of kmod-usb2.

> +  IMAGE_SIZE := 16000k
> +  SUPPORTED_DEVICES += gl-ar750s
> +  IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \
> +	append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)

Please give it a try without the pad-to $$$$(BLOCKSIZE). You neither 
define a blocksize and it should work fine with a roofs directly 
appended to the kernel.

> +endef
> +TARGET_DEVICES += glinet_ar750s
> +
>   define Device/glinet_gl-x750
>     ATH_SOC := qca9531
>     DEVICE_TITLE := GL.iNet GL-X750
> 


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list