First of all, It seems that there is a blank line missing between
title and commit description?
And several suggestions inline :)
Luochongjun <luochong...@gl-inet.com> 于2018年10月10日周三 下午7:36写道：
>
> Flash instruction:
> The original firmware is openwrt, so both LuCI or sysupgrade can be used.
>
> Signed-off-by: Luo chongjun <luochong...@gl-inet.com>
> ---
> target/linux/ath79/base-files/etc/board.d/01_leds | 3 +
> .../linux/ath79/base-files/etc/board.d/02_network | 1 +
> .../etc/hotplug.d/firmware/11-ath10k-caldata | 1 +
> target/linux/ath79/dts/qca9533_glinet_x750.dts | 45 ++++++++++
> target/linux/ath79/dts/qca9533_glinet_x750.dtsi | 97
> ++++++++++++++++++++++
> target/linux/ath79/image/generic.mk | 9 ++
> 6 files changed, 156 insertions(+)
> create mode 100644 target/linux/ath79/dts/qca9533_glinet_x750.dts
> create mode 100644 target/linux/ath79/dts/qca9533_glinet_x750.dtsi
>
> diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds
> b/target/linux/ath79/base-files/etc/board.d/01_leds
> index f04eb7f..46ea99a 100755
> --- a/target/linux/ath79/base-files/etc/board.d/01_leds
> +++ b/target/linux/ath79/base-files/etc/board.d/01_leds
> @@ -42,6 +42,9 @@ on,n150r)
> pcs,cap324)
> ucidef_set_led_netdev "lan" "LAN" "pcs:lan:green" "eth0"
> ;;
> +glinet,x750)
> + ucidef_set_led_netdev "wan" "WAN" "gl-x750:green:wan" "eth0"
> + ;;
All the entries here are ordered alphabetically so you should follow that.
> pcs,cr3000)
> ucidef_set_led_netdev "wan" "WAN" "pcs:blue:wan" "eth1"
> ucidef_set_led_switch "lan1" "LAN1" "pcs:blue:lan1" "switch0" "0x04"
> 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 56eb42f..c18558e 100755
> --- a/target/linux/ath79/base-files/etc/board.d/02_network
> +++ b/target/linux/ath79/base-files/etc/board.d/02_network
> @@ -69,6 +69,7 @@ ath79_setup_interfaces()
> ucidef_set_interface_lan "eth0" "dhcp"
> ;;
> glinet,ar150|\
> + glinet,x750|\
Also needs to follow alphabetical order here.
> glinet,ar300m)
> ucidef_set_interfaces_lan_wan "eth1" "eth0"
> ;;
> 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 9365d67..4768488 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
> @@ -104,6 +104,7 @@ case "$FIRMWARE" in
> ath10kcal_extract "art" 20480 2116
> ath10kcal_patch_mac $(macaddr_add $(cat
> /sys/class/net/eth1/address) -1)
> ;;
> + glinet,x750|\
By doing so you break the alphabetical order in this file. The entire
"case" entry should be moved above.
> tplink,re450-v2)
> ath10kcal_extract "art" 20480 2116
> ath10kcal_patch_mac $(macaddr_add $(cat
> /sys/class/net/eth0/address) +1)
> diff --git a/target/linux/ath79/dts/qca9533_glinet_x750.dts
> b/target/linux/ath79/dts/qca9533_glinet_x750.dts
> new file mode 100644
> index 0000000..2a4044b
> --- /dev/null
> +++ b/target/linux/ath79/dts/qca9533_glinet_x750.dts
> @@ -0,0 +1,45 @@
> +/dts-v1/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +
> +#include "qca9533_glinet_x750.dtsi"
> +
> +&spi {
> + status = "okay";
> + num-cs = <0>;
> +
> + flash@0 {
> + compatible = "winbond,w25q128", "jedec,spi-nor";
"winbond,w25q128" can be dropped here. m25p80 will automatically detect chips.
> + reg = <0>;
> + spi-max-frequency = <25000000>;
> +
> + partitions {
> + compatible = "fixed-partitions";
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + partition@0 {
> + label = "u-boot";
> + reg = <0x000000 0x040000>;
> + read-only;
> + };
> +
> + partition@1 {
Wrong partition label. It should be "partition@{start address}" (so it
should be partition@40000 here.)
> + label = "u-boot-env";
> + reg = <0x040000 0x010000>;
> + };
> +
> + art: partition@2 {
Same as above.
> + label = "art";
> + reg = <0x050000 0x010000>;
> + };
> +
> + partition@3 {
Same as above.
> + label = "firmware";
> + reg = <0x060000 0xfa0000>;
> + };
> +
> + };
> + };
> +};
> diff --git a/target/linux/ath79/dts/qca9533_glinet_x750.dtsi
> b/target/linux/ath79/dts/qca9533_glinet_x750.dtsi
> new file mode 100644
> index 0000000..5cce0e7
> --- /dev/null
> +++ b/target/linux/ath79/dts/qca9533_glinet_x750.dtsi
If this dtsi won't be shared by two or more devices you needn't create
a separated dtsi here.
> @@ -0,0 +1,97 @@
> +/dts-v1/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
The 4 lines above should be dropped in dtsi. You included the two files twice.
> +
> +#include "qca9533.dtsi"
> +
> +/ {
> + compatible = "glinet,x750", "qca,qca9533";
> + model = "GL.iNet GL-X750";
> +
> + 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 3 GPIO_ACTIVE_LOW>;
> + };
> +
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> +
> + power {
> + label = "gl-x750:green:power";
> + gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
> + default-state = "on";
> + };
> +
> + wlan2g {
> + label = "gl-x750:green:wlan2g";
> + gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
> + linux,default-trigger = "phy1tpt";
> + };
> +
> + wlan5g {
> + label = "gl-x750:green:wlan5g";
> + gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
> + linux,default-trigger = "phy0tpt";
> + };
> +
> + wan {
> + label = "gl-x750:green:wan";
> + gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
> + default-state = "off";
> + };
> + 4g {
> + label = "gl-x750:green:4g";
> + gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
> + default-state = "off";
> + };
> + };
> +};
> +
> +&pcie0 {
> + status = "okay";
> +};
> +
> +&uart {
> + status = "okay";
> +};
> +
> +&usb0 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + status = "okay";
> +
> + hub_port: port@1 {
> + reg = <1>;
> + #trigger-source-cells = <0>;
> + };
> +};
> +
> +&usb_phy {
> + status = "okay";
> +};
> +
> +ð0 {
> + status = "okay";
> + mtd-mac-address = <&art 0x0>;
> + phy-handle = <&swphy4>;
> +};
> +
> +ð1 {
> + mtd-mac-address = <&art 0x6>;
> +};
> +
> +&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 75e9399..828d7f4 100644
> --- a/target/linux/ath79/image/generic.mk
> +++ b/target/linux/ath79/image/generic.mk
> @@ -176,6 +176,15 @@ define Device/glinet_ar300m_nor
> endef
> TARGET_DEVICES += glinet_ar300m_nor
>
> +define Device/glinet_x750
> + ATH_SOC := qca9533
> + DEVICE_TITLE := GL.iNet GL-ARX750
> + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k
> ath10k-firmware-qca9887
> + IMAGE_SIZE := 16000k
> + SUPPORTED_DEVICES += gl-x750
This line above is used to make sysupgrade from ar71xx work. Since
this device isn't supported by ar71xx this line can be dropped.
> +endef
> +TARGET_DEVICES += glinet_x750
> +
> define Device/iodata_etg3-r
> ATH_SOC := ar9342
> DEVICE_TITLE := I-O DATA ETG3-R
> --
> 2.7.4
>
>
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
