diff options
| author | Nick Hainke <vincent@systemli.org> | 2022-07-16 10:33:24 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-04-24 18:32:26 +0200 |
| commit | 0f269554e4fd16dd4bcb705e38ff063199e57018 (patch) | |
| tree | 167bc37c13933d44ba16e49a1590c5c86dd65892 /target | |
| parent | 90ad13c76360e5c0ff45db2fd88ffb2595afe451 (diff) | |
| download | upstream-0f269554e4fd16dd4bcb705e38ff063199e57018.tar.gz upstream-0f269554e4fd16dd4bcb705e38ff063199e57018.tar.bz2 upstream-0f269554e4fd16dd4bcb705e38ff063199e57018.zip | |
ipq40xx: convert GL-AP1300 to DSA
Convert GL-AP1300 to DSA and enable it.
While working on it rename the GL-AP1300 leds from green to white.
Tested-by: Rob White <rob@blue-wave.net>
Tested-by: Robert Sommer <frauhottelmann@gmail.com>
Signed-off-by: Nick Hainke <vincent@systemli.org>
Diffstat (limited to 'target')
4 files changed, 37 insertions, 6 deletions
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds index 3ba130cc90..1ba5d2b1a7 100644 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds @@ -53,7 +53,7 @@ engenius,ens620ext) ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "eth1" ;; glinet,gl-ap1300) - ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1" + ucidef_set_led_netdev "wan" "WAN" "white:wan" "wan" ;; glinet,gl-b1300 |\ mikrotik,lhgg-60ad) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index 7c9c2f0827..2e0e8d33cd 100644 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -32,6 +32,7 @@ ipq40xx_setup_interfaces() asus,map-ac2200|\ cilab,meshpoint-one|\ edgecore,ecw5211|\ + glinet,gl-ap1300|\ glinet,gl-b2200|\ google,wifi|\ linksys,whw03v2|\ diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts index 41ed66e595..6f5d4d8a57 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts @@ -14,7 +14,6 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; - label-mac-device = &gmac0; }; memory { @@ -92,13 +91,13 @@ compatible = "gpio-leds"; led_power: power { - label = "green:power"; + label = "white:power"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; default-state = "on"; }; wan { - label = "green:wan"; + label = "white:wan"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; }; @@ -180,6 +179,14 @@ #address-cells = <1>; #size-cells = <1>; + macaddr_art_0: mac-address@0 { + reg = <0x0 0x6>; + }; + + macaddr_art_6: mac-address@6 { + reg = <0x6 0x6>; + }; + precal_art_1000: precal@1000 { reg = <0x1000 0x2f20>; }; @@ -256,6 +263,30 @@ status = "okay"; }; +&gmac { + status = "okay"; +}; + +&switch { + status = "okay"; +}; + +&swport4 { + status = "okay"; + label = "lan"; + + nvmem-cells = <&macaddr_art_0>; + nvmem-cell-names = "mac-address"; +}; + +&swport5 { + status = "okay"; + label = "wan"; + + nvmem-cells = <&macaddr_art_6>; + nvmem-cell-names = "mac-address"; +}; + &wifi0 { status = "okay"; nvmem-cell-names = "pre-calibration"; diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 2f0ca927f0..8fa4f4175a 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -590,8 +590,7 @@ define Device/glinet_gl-ap1300 KERNEL_INSTALL := 1 DEVICE_PACKAGES := ipq-wifi-glinet_gl-ap1300 kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi endef -# Missing DSA Setup -#TARGET_DEVICES += glinet_gl-ap1300 +TARGET_DEVICES += glinet_gl-ap1300 define Device/glinet_gl-b1300 $(call Device/FitzImage) |