From b039772c021d8fdb060eeb356f6b0de1b50d0d72 Mon Sep 17 00:00:00 2001 From: lean Date: Fri, 8 Jan 2021 22:57:12 +0800 Subject: [PATCH] Revert "ramips: add support for Phicomm K2P 32M flash version (#5861)" This reverts commit 632b36be3969f2fd47555e0c74bfecf23c6e2273. --- .../ramips/dts/mt7621_phicomm_k2p-32m.dts | 12 -- .../linux/ramips/dts/mt7621_phicomm_k2p.dts | 129 +++++++++++++++++- .../dts/mt7621_phicomm_k2p_default.dtsi | 129 ------------------ target/linux/ramips/image/mt7621.mk | 8 -- 4 files changed, 126 insertions(+), 152 deletions(-) delete mode 100644 target/linux/ramips/dts/mt7621_phicomm_k2p-32m.dts delete mode 100644 target/linux/ramips/dts/mt7621_phicomm_k2p_default.dtsi diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p-32m.dts b/target/linux/ramips/dts/mt7621_phicomm_k2p-32m.dts deleted file mode 100644 index 2f744c895..000000000 --- a/target/linux/ramips/dts/mt7621_phicomm_k2p-32m.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -#include "mt7621_phicomm_k2p_default.dtsi" - -/ { - compatible = "phicomm,k2p-32m", "phicomm,k2p", "mediatek,mt7621-soc"; - model = "Phicomm K2P (32M)"; -}; - -&firmware { - reg = <0xa0000 0x1f60000>; -}; diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts index d7101d600..fa02521ba 100644 --- a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts +++ b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts @@ -1,7 +1,130 @@ /dts-v1/; -#include "mt7621_phicomm_k2p_default.dtsi" +#include "mt7621.dtsi" -&firmware { - reg = <0xa0000 0xf60000>; +#include +#include + +/ { + 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"; + }; }; diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p_default.dtsi b/target/linux/ramips/dts/mt7621_phicomm_k2p_default.dtsi deleted file mode 100644 index cf38d43b4..000000000 --- a/target/linux/ramips/dts/mt7621_phicomm_k2p_default.dtsi +++ /dev/null @@ -1,129 +0,0 @@ - -#include "mt7621.dtsi" - -#include -#include - -/ { - 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; - }; - - firmware: 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"; - }; -}; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 45271d92a..8c3ef04e3 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -829,14 +829,6 @@ define Device/phicomm_k2p endef TARGET_DEVICES += phicomm_k2p -define Device/phicomm_k2p-32m - $(Device/phicomm_k2p) - IMAGE_SIZE := 32128k - DEVICE_VARIANT := 32M - SUPPORTED_DEVICES += k2p-32M -endef -TARGET_DEVICES += phicomm_k2p-32m - define Device/planex_vr500 $(Device/uimage-lzma-loader) IMAGE_SIZE := 65216k