KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: rename PSG1218 to match label

Browse source 
Fix previous commit to be less ambigous:
PSG1218 rev.A = 5 ports, external PA, heatsinks
PSG1218 rev.B = 4 ports, internal PA, no heatsinks

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2017-04-21 02:47:44 +02:00
parent c5a7dc49d1
commit c6fe325587
8 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/ramips/base-files/etc/board.d/01_leds
View file

@ -287,8 +287,8 @@ pbr-m1)
psg1208) psg1208)
set_wifi_led "$board:white:wlan2g" set_wifi_led "$board:white:wlan2g"
;; ;;
psg1218\| psg1218a\|
psg1218k2c) psg1218b)
ucidef_set_led_netdev "Network" "Network" "$board:blue:status" "eth0" ucidef_set_led_netdev "Network" "Network" "$board:blue:status" "eth0"
ucidef_set_led_default "status" "STATUS" "$board:yellow:status" "0" ucidef_set_led_default "status" "STATUS" "$board:yellow:status" "0"
;; ;;

4
target/linux/ramips/base-files/etc/board.d/02_network
View file

@ -95,7 +95,7 @@ ramips_setup_interfaces()
oy-0001|\ oy-0001|\
pbr-m1|\ pbr-m1|\
psg1208|\ psg1208|\
psg1218k2c|\ psg1218a|\
r6220|\ r6220|\
sap-g3200u3|\ sap-g3200u3|\
sk-wb8|\ sk-wb8|\
@ -115,7 +115,7 @@ ramips_setup_interfaces()
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
;; ;;
psg1218) psg1218b)
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0:lan:3" "1:lan:2" "2:lan:1" "3:wan" "6@eth0" "0:lan:3" "1:lan:2" "2:lan:1" "3:wan" "6@eth0"
;; ;;

4
target/linux/ramips/base-files/etc/diag.sh
View file

@ -104,8 +104,8 @@ get_status_led() {
psg1208) psg1208)
status_led="$board:white:wps" status_led="$board:white:wps"
;; ;;
psg1218|\ psg1218a|\
psg1218k2c) psg1218b)
status_led="$board:yellow:status" status_led="$board:yellow:status"
;; ;;
cy-swr1100|\ cy-swr1100|\

8
target/linux/ramips/base-files/lib/ramips.sh
View file

@ -397,11 +397,11 @@ ramips_board_detect() {
*"PSG1208") *"PSG1208")
name="psg1208" name="psg1208"
;; ;;
*"PSG1218") *"PSG1218 rev.A")
name="psg1218" name="psg1218a"
;; ;;
*"PSG1218K2C") *"PSG1218 rev.B")
name="psg1218k2c" name="psg1218b"
;; ;;
*"PSR-680W"*) *"PSR-680W"*)
name="psr-680w" name="psr-680w"

4
target/linux/ramips/base-files/lib/upgrade/platform.sh
View file

@ -112,8 +112,8 @@ platform_check_image() {
pbr-d1|\ pbr-d1|\
pbr-m1|\ pbr-m1|\
psg1208|\ psg1208|\
psg1218|\ psg1218a|\
psg1218k2c|\ psg1218b|\
psr-680w|\ psr-680w|\
px-4885|\ px-4885|\
rb750gr3|\ rb750gr3|\

10
target/linux/ramips/dts/PSG1218K2C.dts → target/linux/ramips/dts/PSG1218A.dts
View file

@ -3,23 +3,23 @@
#include "PSG1218.dtsi" #include "PSG1218.dtsi"
/ { / {
compatible = "PSG1218K2C", "ralink,mt7620a-soc"; compatible = "PSG1218A", "ralink,mt7620a-soc";
model = "Phicomm PSG1218K2C"; model = "Phicomm PSG1218 rev.A";
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
blue { blue {
label = "psg1218k2c:blue:status"; label = "psg1218a:blue:status";
gpios = <&gpio0 10 1>; gpios = <&gpio0 10 1>;
}; };
yellow { yellow {
label = "psg1218k2c:yellow:status"; label = "psg1218a:yellow:status";
gpios = <&gpio0 11 1>; gpios = <&gpio0 11 1>;
}; };
red { red {
label = "psg1218k2c:red:status"; label = "psg1218a:red:status";
gpios = <&gpio0 8 0>; gpios = <&gpio0 8 0>;
}; };
}; };

10
target/linux/ramips/dts/PSG1218.dts → target/linux/ramips/dts/PSG1218B.dts
View file

@ -3,23 +3,23 @@
#include "PSG1218.dtsi" #include "PSG1218.dtsi"
/ { / {
compatible = "PSG1218", "ralink,mt7620a-soc"; compatible = "PSG1218B", "ralink,mt7620a-soc";
model = "Phicomm PSG1218"; model = "Phicomm PSG1218 rev.B";
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
blue { blue {
label = "psg1218:blue:status"; label = "psg1218b:blue:status";
gpios = <&gpio0 10 1>; gpios = <&gpio0 10 1>;
}; };
yellow { yellow {
label = "psg1218:yellow:status"; label = "psg1218b:yellow:status";
gpios = <&gpio0 11 1>; gpios = <&gpio0 11 1>;
}; };
red { red {
label = "psg1218:red:status"; label = "psg1218b:red:status";
gpios = <&gpio0 8 0>; gpios = <&gpio0 8 0>;
}; };
}; };

16
target/linux/ramips/image/mt7620.mk
View file

@ -322,19 +322,19 @@ define Device/psg1208
endef endef
TARGET_DEVICES += psg1208 TARGET_DEVICES += psg1208
define Device/psg1218 define Device/psg1218a
DTS := PSG1218 DTS := PSG1218A
DEVICE_TITLE := Phicomm PSG1218 DEVICE_TITLE := Phicomm PSG1218 rev.Ax
DEVICE_PACKAGES := kmod-mt76x2 DEVICE_PACKAGES := kmod-mt76x2
endef endef
TARGET_DEVICES += psg1218 TARGET_DEVICES += psg1218a
define Device/psg1218k2c define Device/psg1218b
DTS := PSG1218K2C DTS := PSG1218B
DEVICE_TITLE := Phicomm PSG1218K2C DEVICE_TITLE := Phicomm PSG1218 rev.Bx
DEVICE_PACKAGES := kmod-mt76x2 DEVICE_PACKAGES := kmod-mt76x2
endef endef
TARGET_DEVICES += psg1218k2c TARGET_DEVICES += psg1218b
define Device/rp-n53 define Device/rp-n53
DTS := RP-N53 DTS := RP-N53