From 68d77241cdb979eebb66549c242d5362adaaecdc Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Mon, 26 Nov 2018 15:39:25 +0100 Subject: ath79: rename glinet x750 The boardname is gl-x750 and is already used for the led names. Signed-off-by: Mathias Kresin --- target/linux/ath79/base-files/etc/board.d/01_leds | 4 +- .../linux/ath79/base-files/etc/board.d/02_network | 2 +- .../etc/hotplug.d/firmware/11-ath10k-caldata | 2 +- target/linux/ath79/dts/qca9533_glinet_gl-x750.dts | 46 ++++++++++++++++++++++ target/linux/ath79/dts/qca9533_glinet_x750.dts | 46 ---------------------- target/linux/ath79/dts/qca9533_glinet_x750.dtsi | 2 +- target/linux/ath79/image/generic.mk | 6 +-- 7 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 target/linux/ath79/dts/qca9533_glinet_gl-x750.dts delete mode 100644 target/linux/ath79/dts/qca9533_glinet_x750.dts (limited to 'target') 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 7945ecba1f..06fb8f4791 100755 --- a/target/linux/ath79/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/base-files/etc/board.d/01_leds @@ -33,8 +33,8 @@ etactica,eg200) ucidef_set_led_oneshot "modbus" "Modbus" "$boardname:red:modbus" "100" "33" ucidef_set_led_default "etactica" "etactica" "$boardname:red:etactica" "ignore" ;; -glinet,x750) - ucidef_set_led_netdev "wan" "WAN" "gl-x750:green:wan" "eth0" +glinet,gl-x750) + ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" ;; netgear,wnr612-v2|\ on,n150r) 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 202820d50b..f471882213 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -75,7 +75,7 @@ ath79_setup_interfaces() ;; glinet,ar150|\ glinet,ar300m|\ - glinet,x750) + glinet,gl-x750) ucidef_set_interfaces_lan_wan "eth1" "eth0" ;; iodata,etg3-r|\ 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 cbc5c96170..82c23e3079 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 @@ -87,7 +87,7 @@ board=$(board_name) case "$FIRMWARE" in "ath10k/cal-pci-0000:00:00.0.bin") case $board in - glinet,x750) + glinet,gl-x750) 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_gl-x750.dts b/target/linux/ath79/dts/qca9533_glinet_gl-x750.dts new file mode 100644 index 0000000000..7313f96d51 --- /dev/null +++ b/target/linux/ath79/dts/qca9533_glinet_gl-x750.dts @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "qca9533_glinet_x750.dtsi" + +&spi { + status = "okay"; + num-cs = <0>; + + 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 0x040000>; + read-only; + }; + + partition@40000 { + label = "u-boot-env"; + reg = <0x040000 0x010000>; + }; + + art: partition@50000 { + label = "art"; + reg = <0x050000 0x010000>; + }; + + partition@60000 { + label = "firmware"; + reg = <0x060000 0xfa0000>; + }; + + }; + }; +}; diff --git a/target/linux/ath79/dts/qca9533_glinet_x750.dts b/target/linux/ath79/dts/qca9533_glinet_x750.dts deleted file mode 100644 index 7313f96d51..0000000000 --- a/target/linux/ath79/dts/qca9533_glinet_x750.dts +++ /dev/null @@ -1,46 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; - -#include -#include - -#include "qca9533_glinet_x750.dtsi" - -&spi { - status = "okay"; - num-cs = <0>; - - 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 0x040000>; - read-only; - }; - - partition@40000 { - label = "u-boot-env"; - reg = <0x040000 0x010000>; - }; - - art: partition@50000 { - label = "art"; - reg = <0x050000 0x010000>; - }; - - partition@60000 { - 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 index b84c332137..e1f95d5f04 100644 --- a/target/linux/ath79/dts/qca9533_glinet_x750.dtsi +++ b/target/linux/ath79/dts/qca9533_glinet_x750.dtsi @@ -4,7 +4,7 @@ #include "qca9533.dtsi" / { - compatible = "glinet,x750", "qca,qca9533"; + compatible = "glinet,gl-x750", "qca,qca9533"; model = "GL.iNet GL-X750"; keys { diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 9bdd8f6e35..48d477dd9e 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -183,13 +183,13 @@ define Device/glinet_ar300m_nor endef TARGET_DEVICES += glinet_ar300m_nor -define Device/glinet_x750 +define Device/glinet_gl-x750 ATH_SOC := qca9533 - DEVICE_TITLE := GL.iNet GL-ARX750 + DEVICE_TITLE := GL.iNet GL-X750 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca9887 IMAGE_SIZE := 16000k endef -TARGET_DEVICES += glinet_x750 +TARGET_DEVICES += glinet_gl-x750 define Device/iodata_etg3-r ATH_SOC := ar9342 -- cgit v1.2.3