From c5a7dc49d11810838af9eafdddadf92a3b8218aa Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 21 Apr 2017 00:53:03 +0200 Subject: ramips: split Phicomm PSG1218 and PSG1218K2C PSG1218 got only 4 Ethernet ports and WAN on port 3 while PSG1218K2C got 5 Ethernet ports and WAN on port 4 Switch to use kmod-kt76x2 instead of kmod-mt76 for both devices while at it. Signed-off-by: Daniel Golle --- target/linux/ramips/dts/PSG1218.dts | 83 ++-------------------------------- target/linux/ramips/dts/PSG1218.dtsi | 74 ++++++++++++++++++++++++++++++ target/linux/ramips/dts/PSG1218K2C.dts | 47 +++++++++++++++++++ 3 files changed, 124 insertions(+), 80 deletions(-) create mode 100644 target/linux/ramips/dts/PSG1218.dtsi create mode 100644 target/linux/ramips/dts/PSG1218K2C.dts (limited to 'target/linux/ramips/dts') diff --git a/target/linux/ramips/dts/PSG1218.dts b/target/linux/ramips/dts/PSG1218.dts index 1e53dcef3d..0492d65502 100644 --- a/target/linux/ramips/dts/PSG1218.dts +++ b/target/linux/ramips/dts/PSG1218.dts @@ -1,8 +1,6 @@ /dts-v1/; -#include "mt7620a.dtsi" - -#include +#include "PSG1218.dtsi" / { compatible = "PSG1218", "ralink,mt7620a-soc"; @@ -10,7 +8,6 @@ gpio-leds { compatible = "gpio-leds"; - blue { label = "psg1218:blue:status"; gpios = <&gpio0 10 1>; @@ -23,59 +20,7 @@ red { label = "psg1218:red:status"; - gpios = <&gpio0 8 0>; - }; - }; - - gpio-keys-polled { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - reset { - label = "reset"; - gpios = <&gpio0 1 1>; - linux,code = ; - }; - }; -}; - -&gpio0 { - status = "okay"; -}; - -&spi0 { - status = "okay"; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <10000000>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@20000 { - label = "u-boot-env"; - reg = <0x30000 0x10000>; - read-only; - }; - - factory: partition@30000 { - label = "factory"; - reg = <0x40000 0x10000>; - read-only; - }; - - partition@40000 { - label = "firmware"; - reg = <0x50000 0x7b0000>; + gpios = <&gpio0 8 0>; }; }; }; @@ -83,14 +28,9 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd"; + ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa"; ralink,function = "gpio"; }; - - pa { - ralink,group = "pa"; - ralink,function = "pa"; - }; }; }; @@ -100,20 +40,3 @@ mtd-mac-address = <&factory 0x28>; mediatek,portmap = "llllw"; }; - -&pcie { - status = "okay"; - - pcie-bridge { - mt76@0,0 { - reg = <0x0000 0 0 0 0>; - device_type = "pci"; - mediatek,mtd-eeprom = <&factory 0x8000>; - ieee80211-freq-limit = <5000000 6000000>; - }; - }; -}; - -&wmac { - ralink,mtd-eeprom = <&factory 0>; -}; diff --git a/target/linux/ramips/dts/PSG1218.dtsi b/target/linux/ramips/dts/PSG1218.dtsi new file mode 100644 index 0000000000..b3b58948d2 --- /dev/null +++ b/target/linux/ramips/dts/PSG1218.dtsi @@ -0,0 +1,74 @@ +#include "mt7620a.dtsi" + +#include + +/ { + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + reset { + label = "reset"; + gpios = <&gpio0 1 1>; + linux,code = ; + }; + }; +}; + +&gpio0 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@20000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@30000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@40000 { + label = "firmware"; + reg = <0x50000 0x7b0000>; + }; + }; +}; + +&pcie { + status = "okay"; + + pcie-bridge { + mt76@0,0 { + reg = <0x0000 0 0 0 0>; + device_type = "pci"; + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + }; + }; +}; + +&wmac { + ralink,mtd-eeprom = <&factory 0>; +}; diff --git a/target/linux/ramips/dts/PSG1218K2C.dts b/target/linux/ramips/dts/PSG1218K2C.dts new file mode 100644 index 0000000000..d8105b9a22 --- /dev/null +++ b/target/linux/ramips/dts/PSG1218K2C.dts @@ -0,0 +1,47 @@ +/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"; + }; + }; +}; + +ðernet { + pinctrl-names = "default"; + pinctrl-0 = <&ephy_pins>; + mtd-mac-address = <&factory 0x28>; + mediatek,portmap = "llllw"; +}; -- cgit v1.2.3