ramips: rename PSG1218 to match label

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>

diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index 2c44a83f28e479c7f864f462e77dc2202565db42..3ca390f13fc2d544f18b8b0c5d6ef7eea64376fc 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -287,8 +287,8 @@ pbr-m1)
 psg1208)
        set_wifi_led "$board:white:wlan2g"
        ;;
-psg1218\|
-psg1218k2c)
+psg1218a\|
+psg1218b)
        ucidef_set_led_netdev "Network" "Network" "$board:blue:status" "eth0"
        ucidef_set_led_default "status" "STATUS" "$board:yellow:status" "0"
        ;;

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index b2966c26dacbcc0419b6bc049ab688b7031b0d0c..a4da5ee60b55e07f39c6a112d5939ea7d0a1964e 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -95,7 +95,7 @@ ramips_setup_interfaces()
        oy-0001|\
        pbr-m1|\
        psg1208|\
-       psg1218k2c|\
+       psg1218a|\
        r6220|\
        sap-g3200u3|\
        sk-wb8|\
@@ -115,7 +115,7 @@ ramips_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
                ;;
-       psg1218)
+       psg1218b)
                ucidef_add_switch "switch0" \
                        "0:lan:3" "1:lan:2" "2:lan:1" "3:wan" "6@eth0"
                ;;

diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index af18264f99c765ebf418a82bd97022729c635d5f..3624efd3b4d89d397673c18995fb5feb07c208b5 100644 (file)
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -104,8 +104,8 @@ get_status_led() {
        psg1208)
                status_led="$board:white:wps"
                ;;
-       psg1218|\
-       psg1218k2c)
+       psg1218a|\
+       psg1218b)
                status_led="$board:yellow:status"
                ;;
        cy-swr1100|\

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index a75f5208a3e344dff0eeae3f0e6091f823ef54ac..7630166b89c6249ce4f55b26ee8612dff39f76ea 100755 (executable)
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -397,11 +397,11 @@ ramips_board_detect() {
        *"PSG1208")
                name="psg1208"
                ;;
-       *"PSG1218")
-               name="psg1218"
+       *"PSG1218 rev.A")
+               name="psg1218a"
                ;;
-       *"PSG1218K2C")
-               name="psg1218k2c"
+       *"PSG1218 rev.B")
+               name="psg1218b"
                ;;
        *"PSR-680W"*)
                name="psr-680w"

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 827109b59efa2906ed041859d6fd77e5d288771a..d0dd28e73fe841cb74e4f882aae133fb477b5f43 100755 (executable)
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -112,8 +112,8 @@ platform_check_image() {
        pbr-d1|\
        pbr-m1|\
        psg1208|\
-       psg1218|\
-       psg1218k2c|\
+       psg1218a|\
+       psg1218b|\
        psr-680w|\
        px-4885|\
        rb750gr3|\

diff --git a/target/linux/ramips/dts/PSG1218.dts b/target/linux/ramips/dts/PSG1218.dts
deleted file mode 100644 (file)
index 0492d65..0000000
--- a/target/linux/ramips/dts/PSG1218.dts
+++ /dev/null
@@ -1,42 +0,0 @@
-/dts-v1/;
-
-#include "PSG1218.dtsi"
-
-/ {
-       compatible = "PSG1218", "ralink,mt7620a-soc";
-       model = "Phicomm PSG1218";
-
-       gpio-leds {
-               compatible = "gpio-leds";
-               blue {
-                       label = "psg1218:blue:status";
-                       gpios = <&gpio0 10 1>;
-               };
-
-               yellow {
-                       label = "psg1218:yellow:status";
-                       gpios = <&gpio0 11 1>;
-               };
-
-               red {
-                       label = "psg1218:red:status";
-                               gpios = <&gpio0 8 0>;
-               };
-       };
-};
-
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa";
-                       ralink,function = "gpio";
-               };
-       };
-};
-
-&ethernet {
-       pinctrl-names = "default";
-       pinctrl-0 = <&ephy_pins>;
-       mtd-mac-address = <&factory 0x28>;
-       mediatek,portmap = "llllw";
-};

diff --git a/target/linux/ramips/dts/PSG1218A.dts b/target/linux/ramips/dts/PSG1218A.dts
new file mode 100644 (file)
index 0000000..e85ef70
--- /dev/null
+++ b/target/linux/ramips/dts/PSG1218A.dts
@@ -0,0 +1,47 @@
+/dts-v1/;
+
+#include "PSG1218.dtsi"
+
+/ {
+       compatible = "PSG1218A", "ralink,mt7620a-soc";
+       model = "Phicomm PSG1218 rev.A";
+
+       gpio-leds {
+               compatible = "gpio-leds";
+               blue {
+                       label = "psg1218a:blue:status";
+                       gpios = <&gpio0 10 1>;
+               };
+
+               yellow {
+                       label = "psg1218a:yellow:status";
+                       gpios = <&gpio0 11 1>;
+               };
+
+               red {
+                       label = "psg1218a:red:status";
+                               gpios = <&gpio0 8 0>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+                       ralink,function = "gpio";
+               };
+
+               pa {
+                       ralink,group = "pa";
+                       ralink,function = "pa";
+               };
+       };
+};
+
+&ethernet {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ephy_pins>;
+       mtd-mac-address = <&factory 0x28>;
+       mediatek,portmap = "llllw";
+};

diff --git a/target/linux/ramips/dts/PSG1218B.dts b/target/linux/ramips/dts/PSG1218B.dts
new file mode 100644 (file)
index 0000000..38ceb95
--- /dev/null
+++ b/target/linux/ramips/dts/PSG1218B.dts
@@ -0,0 +1,42 @@
+/dts-v1/;
+
+#include "PSG1218.dtsi"
+
+/ {
+       compatible = "PSG1218B", "ralink,mt7620a-soc";
+       model = "Phicomm PSG1218 rev.B";
+
+       gpio-leds {
+               compatible = "gpio-leds";
+               blue {
+                       label = "psg1218b:blue:status";
+                       gpios = <&gpio0 10 1>;
+               };
+
+               yellow {
+                       label = "psg1218b:yellow:status";
+                       gpios = <&gpio0 11 1>;
+               };
+
+               red {
+                       label = "psg1218b:red:status";
+                               gpios = <&gpio0 8 0>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ephy_pins>;
+       mtd-mac-address = <&factory 0x28>;
+       mediatek,portmap = "llllw";
+};

diff --git a/target/linux/ramips/dts/PSG1218K2C.dts b/target/linux/ramips/dts/PSG1218K2C.dts
deleted file mode 100644 (file)
index d8105b9..0000000
--- a/target/linux/ramips/dts/PSG1218K2C.dts
+++ /dev/null
@@ -1,47 +0,0 @@
-/dts-v1/;
-
-#include "PSG1218.dtsi"
-
-/ {
-       compatible = "PSG1218K2C", "ralink,mt7620a-soc";
-       model = "Phicomm PSG1218K2C";
-
-       gpio-leds {
-               compatible = "gpio-leds";
-               blue {
-                       label = "psg1218k2c:blue:status";
-                       gpios = <&gpio0 10 1>;
-               };
-
-               yellow {
-                       label = "psg1218k2c:yellow:status";
-                       gpios = <&gpio0 11 1>;
-               };
-
-               red {
-                       label = "psg1218k2c:red:status";
-                               gpios = <&gpio0 8 0>;
-               };
-       };
-};
-
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-                       ralink,function = "gpio";
-               };
-
-               pa {
-                       ralink,group = "pa";
-                       ralink,function = "pa";
-               };
-       };
-};
-
-&ethernet {
-       pinctrl-names = "default";
-       pinctrl-0 = <&ephy_pins>;
-       mtd-mac-address = <&factory 0x28>;
-       mediatek,portmap = "llllw";
-};

diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 63d5a7c00afa74271cf1bc6aed449b48d604e952..fcecb7a1c8ef394fa4e71bf79ff145cb0c01bdf6 100644 (file)
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -322,19 +322,19 @@ define Device/psg1208
 endef
 TARGET_DEVICES += psg1208
 
-define Device/psg1218
-  DTS := PSG1218
-  DEVICE_TITLE := Phicomm PSG1218
+define Device/psg1218a
+  DTS := PSG1218A
+  DEVICE_TITLE := Phicomm PSG1218 rev.Ax
   DEVICE_PACKAGES := kmod-mt76x2
 endef
-TARGET_DEVICES += psg1218
+TARGET_DEVICES += psg1218a
 
-define Device/psg1218k2c
-  DTS := PSG1218K2C
-  DEVICE_TITLE := Phicomm PSG1218K2C
+define Device/psg1218b
+  DTS := PSG1218B
+  DEVICE_TITLE := Phicomm PSG1218 rev.Bx
   DEVICE_PACKAGES := kmod-mt76x2
 endef
-TARGET_DEVICES += psg1218k2c
+TARGET_DEVICES += psg1218b
 
 define Device/rp-n53
   DTS := RP-N53