From 18d284b238f2f2b2f75e6492330858a25a21b865 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 23 Jan 2021 19:23:18 +0800 Subject: [PATCH] ramips: re-added phicomm k2p 32m version (#6235) --- .../ramips/dts/mt7621_phicomm_k2p-32m.dts | 16 +++ .../linux/ramips/dts/mt7621_phicomm_k2p.dts | 124 +----------------- .../linux/ramips/dts/mt7621_phicomm_k2p.dtsi | 124 ++++++++++++++++++ target/linux/ramips/image/mt7621.mk | 10 ++ .../mt7621/base-files/etc/board.d/02_network | 4 +- 5 files changed, 154 insertions(+), 124 deletions(-) create mode 100644 target/linux/ramips/dts/mt7621_phicomm_k2p-32m.dts create mode 100644 target/linux/ramips/dts/mt7621_phicomm_k2p.dtsi diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p-32m.dts b/target/linux/ramips/dts/mt7621_phicomm_k2p-32m.dts new file mode 100644 index 000000000..e828b069a --- /dev/null +++ b/target/linux/ramips/dts/mt7621_phicomm_k2p-32m.dts @@ -0,0 +1,16 @@ +/dts-v1/; + +#include "mt7621_phicomm_k2p.dtsi" + +/ { + compatible = "phicomm,k2p-32m", "mediatek,mt7621-soc"; + model = "Phicomm K2P (32M)"; +}; + +&firmware { + reg = <0xa0000 0x1f60000>; +}; + +&flash { + broken-flash-reset; +}; diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts index fa02521ba..1a973a2a8 100644 --- a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts +++ b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts @@ -1,130 +1,12 @@ /dts-v1/; -#include "mt7621.dtsi" - -#include -#include +#include "mt7621_phicomm_k2p.dtsi" / { compatible = "phicomm,k2p", "mediatek,mt7621-soc"; model = "Phicomm K2P"; - - aliases { - led-boot = &led_blue; - led-failsafe = &led_blue; - led-running = &led_blue; - led-upgrade = &led_blue; - }; - - chosen { - bootargs = "console=ttyS0,57600"; - }; - - leds { - compatible = "gpio-leds"; - - stat_r { - label = "k2p:red:status"; - gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; - }; - - stat_y { - label = "k2p:yellow:status"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - }; - - led_blue: stat_b { - label = "k2p:blue:status"; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - }; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; }; -&spi0 { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <10000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "u-boot-env"; - reg = <0x30000 0x10000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@50000 { - label = "permanent_config"; - reg = <0x50000 0x50000>; - read-only; - }; - - partition@a0000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0xa0000 0xf60000>; - }; - }; - }; -}; - -&pcie { - status = "okay"; -}; - -&pcie0 { - mt76@0,0 { - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x0>; - }; -}; - -ðernet { - compatible = "mediatek,ralink-mt7621-eth"; - mediatek,switch = <&gsw>; - mtd-mac-address = <&factory 0xe000>; -}; - -&switch0 { - /delete-property/ compatible; - phy-mode = "rgmii"; -}; - -&gsw { - compatible = "mediatek,ralink-mt7621-gsw"; -}; - -&state_default { - gpio { - groups = "i2c", "jtag"; - function = "gpio"; - }; +&firmware { + reg = <0xa0000 0xf60000>; }; diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p.dtsi b/target/linux/ramips/dts/mt7621_phicomm_k2p.dtsi new file mode 100644 index 000000000..904580505 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_phicomm_k2p.dtsi @@ -0,0 +1,124 @@ +#include "mt7621.dtsi" + +#include +#include + +/ { + aliases { + led-boot = &led_blue; + led-failsafe = &led_blue; + led-running = &led_blue; + led-upgrade = &led_blue; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + leds { + compatible = "gpio-leds"; + + stat_r { + label = "k2p:red:status"; + gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; + }; + + stat_y { + label = "k2p:yellow:status"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + led_blue: stat_b { + label = "k2p:blue:status"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&spi0 { + status = "okay"; + + flash: flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "permanent_config"; + reg = <0x50000 0x50000>; + read-only; + }; + + firmware: partition@a0000 { + compatible = "denx,uimage"; + label = "firmware"; + }; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + mt76@0,0 { + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0>; + }; +}; + +ðernet { + compatible = "mediatek,ralink-mt7621-eth"; + mediatek,switch = <&gsw>; + mtd-mac-address = <&factory 0xe000>; +}; + +&switch0 { + /delete-property/ compatible; + phy-mode = "rgmii"; +}; + +&gsw { + compatible = "mediatek,ralink-mt7621-gsw"; +}; + +&state_default { + gpio { + groups = "i2c", "jtag"; + function = "gpio"; + }; +}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 8c3ef04e3..b043d14bd 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -829,6 +829,16 @@ define Device/phicomm_k2p endef TARGET_DEVICES += phicomm_k2p +define Device/phicomm_k2p-32m + IMAGE_SIZE := 32128k + DEVICE_VENDOR := Phicomm + DEVICE_MODEL := K2P + DEVICE_VARIANT := 32M + SUPPORTED_DEVICES += k2p-32M + DEVICE_PACKAGES := kmod-mt7615d_dbdc +endef +TARGET_DEVICES += phicomm_k2p-32m + define Device/planex_vr500 $(Device/uimage-lzma-loader) IMAGE_SIZE := 65216k diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index 8ef82534f..d9efb24de 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -64,6 +64,7 @@ ramips_setup_interfaces() ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 ra0 rai0" "wan" ;; phicomm,k2p|\ + phicomm,k2p-32m|\ xiaoyu,xy-c5) ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" @@ -158,9 +159,6 @@ ramips_setup_macs() wan_mac=$label_mac lan_mac=$(macaddr_add $label_mac 1) ;; - phicomm,k2p) - wan_mac=$(mtd_get_mac_binary factory 0xe006) - ;; xiaomi,mir3g|\ xiaomi,mi-router-ac2100|\ xiaomi,redmi-router-ac2100)