From ca2d447b348acc07b74c8e624771ae7f9bb1fc9e Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Fri, 14 Sep 2018 23:24:24 +0200 Subject: target/linux/ramips: various DTS updates --- target/linux/ramips/dts/DIR-645.dts | 2 +- target/linux/ramips/dts/DIR-810L.dts | 4 ++ target/linux/ramips/dts/MLWG2.dts | 118 +++++++++++++++++++++++++++++++++ target/linux/ramips/dts/MT7620a.dts | 8 +++ target/linux/ramips/dts/VOCORE.dts | 19 +++--- target/linux/ramips/dts/WHR-300HP2.dts | 4 ++ target/linux/ramips/dts/WIZARD8800.dts | 82 ----------------------- target/linux/ramips/dts/rt5350.dtsi | 4 +- 8 files changed, 146 insertions(+), 95 deletions(-) create mode 100755 target/linux/ramips/dts/MLWG2.dts delete mode 100644 target/linux/ramips/dts/WIZARD8800.dts diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts index 0a9d83f..60e7f46 100644 --- a/target/linux/ramips/dts/DIR-645.dts +++ b/target/linux/ramips/dts/DIR-645.dts @@ -63,7 +63,7 @@ }; ethernet@10100000 { - mtd-mac-address = <&factory 0x28>; + mtd-mac-address = <&factory 0x4>; port@0 { ralink,fixed-link = <1000 1 1 0>; }; diff --git a/target/linux/ramips/dts/DIR-810L.dts b/target/linux/ramips/dts/DIR-810L.dts index 2f656fd..8465355 100644 --- a/target/linux/ramips/dts/DIR-810L.dts +++ b/target/linux/ramips/dts/DIR-810L.dts @@ -125,4 +125,8 @@ gpios = <&gpio0 13 0>; }; }; + + wmac@10180000 { + status = "disabled"; + }; }; diff --git a/target/linux/ramips/dts/MLWG2.dts b/target/linux/ramips/dts/MLWG2.dts new file mode 100755 index 0000000..a2b0033 --- /dev/null +++ b/target/linux/ramips/dts/MLWG2.dts @@ -0,0 +1,118 @@ +/dts-v1/; + +/include/ "mt7620n.dtsi" + +/ { + compatible = "mlwg2", "ralink,mt7620n-soc"; + model = "Kingston MLWG2"; + + palmbus@10000000 { + gpio0: gpio@600 { + status = "okay"; + }; + + gpio2: gpio@660 { + status = "okay"; + }; + + gpio3: gpio@688 { + status = "okay"; + }; + + spi@b00 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "mx25l12805d"; + reg = <0 0>; + linux,modalias = "m25p80"; + spi-max-frequency = <10000000>; + + 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 = "firmware"; + reg = <0x50000 0xf60000>; + }; + + partition@fb0000 { + label = "user-config"; + reg = <0xfb0000 0x50000>; + }; + }; + }; + }; + + ehci@101c0000 { + status = "okay"; + }; + + ohci@101c1000 { + status = "okay"; + }; + + ethernet@10100000 { + mtd-mac-address = <&factory 0x4>; + ralink,port-map = "wllll"; + }; + + wmac@10180000 { + ralink,mtd-eeprom = <&factory 0>; + }; + + pinctrl { + state_default: pinctrl0 { + default { + ralink,group = "i2c", "ephy", "wled"; + ralink,function = "gpio"; + }; + }; + }; + + gpio-leds { + compatible = "gpio-leds"; + system { + label = "kingston:blue:system"; + gpios = <&gpio2 3 1>; + }; + wifi { + label = "kingston:blue:wifi"; + gpios = <&gpio3 0 1>; + }; + }; + + 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 = <0x198>; + }; + system { + label = "system"; + gpios = <&gpio0 2 1>; + linux,code = <0x211>; + }; + }; +}; diff --git a/target/linux/ramips/dts/MT7620a.dts b/target/linux/ramips/dts/MT7620a.dts index 05b8da3..826441e 100644 --- a/target/linux/ramips/dts/MT7620a.dts +++ b/target/linux/ramips/dts/MT7620a.dts @@ -116,4 +116,12 @@ linux,code = <0x101>; }; }; + + ehci@101c0000 { + status = "okay"; + }; + + ohci@101c1000 { + status = "okay"; + }; }; diff --git a/target/linux/ramips/dts/VOCORE.dts b/target/linux/ramips/dts/VOCORE.dts index e5df9ab..e6288b0 100644 --- a/target/linux/ramips/dts/VOCORE.dts +++ b/target/linux/ramips/dts/VOCORE.dts @@ -22,14 +22,14 @@ #address-cells = <1>; #size-cells = <1>; compatible = "s25fl064k"; - reg = <0 0>; + reg = <0>; linux,modalias = "m25p80", "s25fl064k"; spi-max-frequency = <10000000>; partition@0 { label = "uboot"; reg = <0x0 0x30000>; - read_only; + read-only; }; partition@30000 { @@ -49,13 +49,19 @@ reg = <0x50000 0x7b0000>; }; }; + + spidev@1 { + compatible = "linux,spidev"; + spi-max-frequency = <10000000>; + reg = <1>; + }; }; }; pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "jtag", "uartf", "led", "spi_cs1"; + ralink,group = "jtag", "uartf", "led"; ralink,function = "gpio"; }; }; @@ -192,13 +198,6 @@ gpio-export,direction_may_change = <1>; gpios = <&gpio1 4 0>; }; - - /* SPI_CS1 */ - gpio27 { - gpio-export,name = "gpio27"; - gpio-export,direction_may_change = <1>; - gpios = <&gpio1 5 0>; - }; }; gpio-leds { diff --git a/target/linux/ramips/dts/WHR-300HP2.dts b/target/linux/ramips/dts/WHR-300HP2.dts index f3f2a93..a75c091 100644 --- a/target/linux/ramips/dts/WHR-300HP2.dts +++ b/target/linux/ramips/dts/WHR-300HP2.dts @@ -139,4 +139,8 @@ linux,code = <0x103>; }; }; + + wmac@10180000 { + status = "disabled"; + }; }; diff --git a/target/linux/ramips/dts/WIZARD8800.dts b/target/linux/ramips/dts/WIZARD8800.dts deleted file mode 100644 index a80b937..0000000 --- a/target/linux/ramips/dts/WIZARD8800.dts +++ /dev/null @@ -1,82 +0,0 @@ -/dts-v1/; - -/include/ "rt5350.dtsi" - -/ { - compatible = "WIZARD8800", "ralink,rt5350-soc"; - model = "EASYACC WI-STOR WIZARD 8800"; - - palmbus@10000000 { - gpio1@638 { - status = "okay"; - }; - - gpio2@660 { - status = "okay"; - }; - - spi@b00 { - status = "okay"; - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "w25q32"; - reg = <0 0>; - linux,modalias = "m25p80", "w25q32"; - spi-max-frequency = <10000000>; - - 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 = "firmware"; - reg = <0x50000 0x7b0000>; - }; - }; - }; - }; - - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; - }; - }; - - ethernet@10100000 { - mtd-mac-address = <&factory 0x4>; - }; - - esw@10110000 { - ralink,portmap = <0x2f>; - }; - - ehci@101c0000 { - status = "okay"; - }; - - ohci@101c1000 { - status = "okay"; - }; - - wmac@10180000 { - ralink,mtd-eeprom = <&factory 0>; - }; -}; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index 722540b..8ba20bb 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -151,7 +151,7 @@ }; spi@b00 { - compatible = "ralink,rt5350-spi", "ralink,rt2880-spi"; + compatible = "ralink,rt5350-spi"; reg = <0xb00 0x100>; resets = <&rstctrl 18>; @@ -161,7 +161,7 @@ #size-cells = <1>; pinctrl-names = "default"; - pinctrl-0 = <&spi_pins>; + pinctrl-0 = <&spi_pins &spi_cs1>; status = "disabled"; }; -- cgit v1.1