From 5f6caa26e516e578be547df489d2ae8900da58a5 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 23 Jun 2013 15:50:49 +0000 Subject: ralink: update patches Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37016 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/dts/DIR-645.dts | 23 +- target/linux/ramips/dts/F5D8235_V1.dts | 4 +- target/linux/ramips/dts/FREESTATION5.dts | 15 +- target/linux/ramips/dts/MPRA2.dts | 34 ++- target/linux/ramips/dts/MT7620a.dts | 127 ++++++++++ target/linux/ramips/dts/OMNI-EMB-HPM.dts | 37 +-- target/linux/ramips/dts/RT-N15.dts | 4 +- target/linux/ramips/dts/RTN56U.dts | 4 +- target/linux/ramips/dts/TEW-691GR.dts | 7 +- target/linux/ramips/dts/TEW-692GR.dts | 13 +- target/linux/ramips/dts/WLI-TX4-AG300N.dts | 4 +- target/linux/ramips/dts/WR6202.dts | 16 +- target/linux/ramips/dts/mt7620.dtsi | 140 ----------- target/linux/ramips/dts/mt7620a.dtsi | 294 +++++++++++++++++++++++ target/linux/ramips/dts/mt7620a_mt7610e_eval.dts | 99 ++++++++ target/linux/ramips/dts/rt2880.dtsi | 4 - target/linux/ramips/dts/rt3050.dtsi | 52 +++- target/linux/ramips/dts/rt3352.dtsi | 47 +++- target/linux/ramips/dts/rt3883.dtsi | 63 ++++- target/linux/ramips/dts/rt5350.dtsi | 98 +++++++- 20 files changed, 857 insertions(+), 228 deletions(-) create mode 100644 target/linux/ramips/dts/MT7620a.dts delete mode 100644 target/linux/ramips/dts/mt7620.dtsi create mode 100644 target/linux/ramips/dts/mt7620a.dtsi create mode 100644 target/linux/ramips/dts/mt7620a_mt7610e_eval.dts (limited to 'target/linux/ramips/dts') diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts index e0b3752006..960d2cb352 100644 --- a/target/linux/ramips/dts/DIR-645.dts +++ b/target/linux/ramips/dts/DIR-645.dts @@ -72,7 +72,10 @@ status = "okay"; mtd-mac-address = <&factory 0x28>; - ralink,fixed-link = <1000 1 1 1>; + port@0 { + ralink,fixed-link = <1000 1 1 0>; + }; + }; wmac@10180000 { @@ -125,14 +128,16 @@ }; }; - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; + usb0: gpio-regulator { + compatible = "regulator-gpio"; - usb { - gpio-export,name = "usb"; - gpio-export,output = <1>; - gpios = <&gpio1 6 0>; - }; + regulator-type = "voltage"; + regulator-name = "usb-power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + + enable-active-high; + enable-gpio = <&gpio1 6 0>; }; }; diff --git a/target/linux/ramips/dts/F5D8235_V1.dts b/target/linux/ramips/dts/F5D8235_V1.dts index 41a7f122c8..52b789b76c 100644 --- a/target/linux/ramips/dts/F5D8235_V1.dts +++ b/target/linux/ramips/dts/F5D8235_V1.dts @@ -54,7 +54,9 @@ ethernet@400000 { status = "okay"; - ralink,fixed-link = <1000 1 1 1>; + port@0 { + ralink,fixed-link = <1000 1 1 1>; + }; }; wmac@480000 { diff --git a/target/linux/ramips/dts/FREESTATION5.dts b/target/linux/ramips/dts/FREESTATION5.dts index a3cc8fc97d..442cd268dd 100644 --- a/target/linux/ramips/dts/FREESTATION5.dts +++ b/target/linux/ramips/dts/FREESTATION5.dts @@ -72,15 +72,16 @@ status = "okay"; }; - gpio-export { - compatible = "gpio-export"; + poe: gpio-regulator { // Used to enable power-over-ethernet passthrough from port0 to port1. // Disable passthrough by default to prevent accidental equipment damage. - poe { - gpio-export,name = "poe-passthrough"; - gpio-export,output = <1>; // OUT_INIT_HIGH - gpios = <&gpio0 11 1>; // GPIO 11, ACTIVE_LOW - }; + compatible = "regulator-gpio"; + + regulator-name = "poe-power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + enable-gpio = <&gpio0 12 0>; }; gpio-leds { diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts index 8fb226b748..9f8edb6296 100644 --- a/target/linux/ramips/dts/MPRA2.dts +++ b/target/linux/ramips/dts/MPRA2.dts @@ -103,19 +103,27 @@ }; }; - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; + usb0: gpio-regulator { + compatible = "regulator-gpio"; - usb { - gpio-export,name = "usb"; - gpio-export,output = <1>; - gpios = <&gpio0 7 0>; - }; - root_hub { - gpio-export,name = "root_hub"; - gpio-export,output = <1>; - gpios = <&gpio0 12 0>; - }; + regulator-name = "usb0-power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + + enable-active-high; + enable-gpio = <&gpio0 7 0>; + }; + + hub0: gpio-regulator { + compatible = "regulator-gpio"; + + regulator-name = "hub0-power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + + enable-active-high; + enable-gpio = <&gpio0 12 0>; }; }; diff --git a/target/linux/ramips/dts/MT7620a.dts b/target/linux/ramips/dts/MT7620a.dts new file mode 100644 index 0000000000..773ac51fb6 --- /dev/null +++ b/target/linux/ramips/dts/MT7620a.dts @@ -0,0 +1,127 @@ +/dts-v1/; + +/include/ "mt7620a.dtsi" + +/ { + compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc"; + model = "Ralink MT7620a + MT7610e evaluation board"; + + memory@0 { + reg = <0x0 0x2000000>; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + palmbus@10000000 { + sysc@0 { + ralink,pinmux = "spi", "uartlite", "mdio", "wled", "ephy", "rgmii1", "rgmii2"; + ralink,gpiomux = "i2c", "jtag"; + ralink,uartmux = "gpio"; + ralink,wdtmux = <1>; + }; + + gpio0: gpio@600 { + status = "okay"; + }; + + spi@b00 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "en25q64"; + reg = <0 0>; + linux,modalias = "m25p80", "en25q64"; + 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>; + }; + }; + }; + }; + + ethernet@10100000 { + status = "okay"; + + port@4 { + compatible = "lantiq,mt7620a-gsw-port", "ralink,eth-port"; + reg = <4>; + phy-mode = "rgmii"; + phy-handle = <&phy4>; + }; + + port@5 { + compatible = "lantiq,mt7620a-gsw-port", "ralink,eth-port"; + reg = <5>; + phy-mode = "rgmii"; + phy-handle = <&phy5>; + }; + + mdio-bus { + status = "okay"; + + phy4: ethernet-phy@4 { + reg = <4>; + phy-mode = "rgmii"; + }; + + phy5: ethernet-phy@5 { + reg = <5>; + phy-mode = "rgmii"; + }; + }; + }; + + gsw@10110000 { + status = "okay"; + ralink,port4 = "gmac"; + }; + + sdhci@10130000 { + status = "okay"; + }; + + pcie@10140000 { + status = "okay"; + }; + + gpio-keys-polled { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + s2 { + label = "S2"; + gpios = <&gpio0 1 1>; + linux,code = <0x100>; + }; + s3 { + label = "S3"; + gpios = <&gpio0 2 1>; + linux,code = <0x101>; + }; + }; +}; diff --git a/target/linux/ramips/dts/OMNI-EMB-HPM.dts b/target/linux/ramips/dts/OMNI-EMB-HPM.dts index 8148294893..875df14c66 100644 --- a/target/linux/ramips/dts/OMNI-EMB-HPM.dts +++ b/target/linux/ramips/dts/OMNI-EMB-HPM.dts @@ -131,19 +131,28 @@ }; }; - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; - /* gpio 12 and 13 handle the OC input */ - usb0 { - gpio-export,name = "usb0"; - gpio-export,output = <1>; - gpios = <&gpio0 2 0>; - }; - usb1 { - gpio-export,name = "usb1"; - gpio-export,output = <1>; - gpios = <&gpio0 1 0>; - }; + /* gpio 12 and 13 handle the OC input */ + usb0: gpio-regulator { + compatible = "regulator-gpio"; + + regulator-name = "usb0-power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + + enable-active-high; + enable-gpio = <&gpio0 2 0>; + }; + + usb1: gpio-regulator { + compatible = "regulator-gpio"; + + regulator-name = "usb1-power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + + enable-active-high; + enable-gpio = <&gpio0 1 0>; }; }; diff --git a/target/linux/ramips/dts/RT-N15.dts b/target/linux/ramips/dts/RT-N15.dts index 2ff266cfdd..8351449ea1 100644 --- a/target/linux/ramips/dts/RT-N15.dts +++ b/target/linux/ramips/dts/RT-N15.dts @@ -54,7 +54,9 @@ ethernet@400000 { status = "okay"; - ralink,fixed-link = <1000 1 1 1>; + port@0 { + ralink,fixed-link = <1000 1 1 1>; + }; }; wmac@480000 { diff --git a/target/linux/ramips/dts/RTN56U.dts b/target/linux/ramips/dts/RTN56U.dts index 0c09904f51..9c36af5721 100644 --- a/target/linux/ramips/dts/RTN56U.dts +++ b/target/linux/ramips/dts/RTN56U.dts @@ -31,7 +31,9 @@ ethernet@10100000 { status = "okay"; - ralink,fixed-link = <1000 1 1 1>; + port@0 { + ralink,fixed-link = <1000 1 1 1>; + }; }; pci@10140000 { diff --git a/target/linux/ramips/dts/TEW-691GR.dts b/target/linux/ramips/dts/TEW-691GR.dts index eb2d4bc6af..002719583b 100644 --- a/target/linux/ramips/dts/TEW-691GR.dts +++ b/target/linux/ramips/dts/TEW-691GR.dts @@ -30,9 +30,10 @@ ethernet@10100000 { status = "okay"; - phy-handle = <&phy0>; - phy-mode = "rgmii"; - + port@0 { + phy-handle = <&phy0>; + phy-mode = "rgmii"; + }; mdio-bus { status = "okay"; diff --git a/target/linux/ramips/dts/TEW-692GR.dts b/target/linux/ramips/dts/TEW-692GR.dts index f5d0d04845..eee4b2af2d 100644 --- a/target/linux/ramips/dts/TEW-692GR.dts +++ b/target/linux/ramips/dts/TEW-692GR.dts @@ -30,8 +30,17 @@ ethernet@10100000 { status = "okay"; - ralink,phy-mask = <0x1>; - phy-mode = "rgmii"; + port@0 { + phy-handle = <&phy0>; + phy-mode = "rgmii"; + }; + mdio-bus { + status = "okay"; + + phy0: ethernet-phy@0 { + reg = <0>; + }; + }; }; pci@10140000 { diff --git a/target/linux/ramips/dts/WLI-TX4-AG300N.dts b/target/linux/ramips/dts/WLI-TX4-AG300N.dts index ff33a8a4dc..2296c3fc07 100644 --- a/target/linux/ramips/dts/WLI-TX4-AG300N.dts +++ b/target/linux/ramips/dts/WLI-TX4-AG300N.dts @@ -53,7 +53,9 @@ ethernet@400000 { status = "okay"; - ralink,fixed-link = <100 1 1 1>; + port@0 { + ralink,fixed-link = <1000 1 1 1>; + }; }; wmac@480000 { diff --git a/target/linux/ramips/dts/WR6202.dts b/target/linux/ramips/dts/WR6202.dts index a970849e31..1e41756d5a 100644 --- a/target/linux/ramips/dts/WR6202.dts +++ b/target/linux/ramips/dts/WR6202.dts @@ -102,14 +102,14 @@ status = "okay"; }; - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; + usb0: gpio-regulator { + compatible = "regulator-gpio"; - usb { - gpio-export,name = "usb"; - gpio-export,output = <0>; - gpios = <&gpio0 11 0>; - }; + regulator-name = "usb0-power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + + enable-gpio = <&gpio0 11 0>; }; }; diff --git a/target/linux/ramips/dts/mt7620.dtsi b/target/linux/ramips/dts/mt7620.dtsi deleted file mode 100644 index 9f913cd85a..0000000000 --- a/target/linux/ramips/dts/mt7620.dtsi +++ /dev/null @@ -1,140 +0,0 @@ -/ { - #address-cells = <1>; - #size-cells = <1>; - compatible = "ralink,mtk7620n-soc", "ralink,mt7620-soc"; - - cpus { - cpu@0 { - compatible = "mips,mips24KEc"; - }; - }; - - chosen { - bootargs = "console=ttyS0,57600"; - }; - - cpuintc: cpuintc@0 { - #address-cells = <0>; - #interrupt-cells = <1>; - interrupt-controller; - compatible = "mti,cpu-interrupt-controller"; - }; - - palmbus@10000000 { - compatible = "palmbus"; - reg = <0x10000000 0x200000>; - ranges = <0x0 0x10000000 0x1FFFFF>; - - #address-cells = <1>; - #size-cells = <1>; - - sysc@0 { - compatible = "ralink,mt7620-sysc", "ralink,mt7620n-sysc"; - reg = <0x0 0x100>; - }; - - timer@100 { - compatible = "ralink,mt7620-timer", "ralink,rt2880-timer"; - reg = <0x100 0x20>; - - interrupt-parent = <&intc>; - interrupts = <1>; - }; - - watchdog@120 { - compatible = "ralink,mt7620-wdt", "ralink,rt2880-wdt"; - reg = <0x120 0x10>; - }; - - intc: intc@200 { - compatible = "ralink,mt7620-intc", "ralink,rt2880-intc"; - reg = <0x200 0x100>; - - interrupt-controller; - #interrupt-cells = <1>; - - interrupt-parent = <&cpuintc>; - interrupts = <2>; - }; - - memc@300 { - compatible = "ralink,mt7620-memc", "ralink,rt3050-memc"; - reg = <0x300 0x100>; - }; - - gpio0: gpio@600 { - compatible = "ralink,mt7620-gpio", "ralink,rt2880-gpio"; - reg = <0x600 0x34>; - - gpio-controller; - #gpio-cells = <2>; - - ralink,gpio-base = <0>; - ralink,num-gpios = <24>; - ralink,register-map = [ 00 04 08 0c - 20 24 28 2c - 30 34 ]; - }; - - gpio1: gpio@638 { - compatible = "ralink,mt7620-gpio", "ralink,rt2880-gpio"; - reg = <0x638 0x24>; - - gpio-controller; - #gpio-cells = <2>; - - ralink,gpio-base = <24>; - ralink,num-gpios = <16>; - ralink,register-map = [ 00 04 08 0c - 10 14 18 1c - 20 24 ]; - }; - - gpio2: gpio@660 { - compatible = "ralink,mt7620-gpio", "ralink,rt2880-gpio"; - reg = <0x660 0x24>; - - gpio-controller; - #gpio-cells = <2>; - - ralink,gpio-base = <40>; - ralink,num-gpios = <32>; - ralink,register-map = [ 00 04 08 0c - 10 14 18 1c - 20 24 ]; - }; - - gpio3: gpio@688 { - compatible = "ralink,mt7620-gpio", "ralink,rt2880-gpio"; - reg = <0x688 0x24>; - - gpio-controller; - #gpio-cells = <2>; - - ralink,gpio-base = <72>; - ralink,num-gpios = <1>; - ralink,register-map = [ 00 04 08 0c - 10 14 18 1c - 20 24 ]; - }; - - spi@b00 { - compatible = "ralink,rt3883-spi", "ralink,rt2880-spi"; - reg = <0xb00 0x100>; - #address-cells = <1>; - #size-cells = <0>; - - status = "disabled"; - }; - - uartlite@c00 { - compatible = "ralink,mt7620-uart", "ralink,rt2880-uart", "ns16550a"; - reg = <0xc00 0x100>; - - interrupt-parent = <&intc>; - interrupts = <12>; - - reg-shift = <2>; - }; - }; -}; diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi new file mode 100644 index 0000000000..104abfbfbf --- /dev/null +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -0,0 +1,294 @@ +/ { + #address-cells = <1>; + #size-cells = <1>; + compatible = "ralink,mtk7620a-soc"; + + cpus { + cpu@0 { + compatible = "mips,mips24KEc"; + }; + }; + + cpuintc: cpuintc@0 { + #address-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; + compatible = "mti,cpu-interrupt-controller"; + }; + + palmbus@10000000 { + compatible = "palmbus"; + reg = <0x10000000 0x200000>; + ranges = <0x0 0x10000000 0x1FFFFF>; + + #address-cells = <1>; + #size-cells = <1>; + + sysc@0 { + compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc"; + reg = <0x0 0x100>; + }; + + timer@100 { + compatible = "ralink,mt7620a-timer", "ralink,rt2880-timer"; + reg = <0x100 0x20>; + + interrupt-parent = <&intc>; + interrupts = <1>; + }; + + watchdog@120 { + compatible = "ralink,mt7620a-wdt", "ralink,rt2880-wdt"; + reg = <0x120 0x10>; + + resets = <&rstctrl 8>; + reset-names = "wdt"; + + interrupt-parent = <&intc>; + interrupts = <1>; + }; + + intc: intc@200 { + compatible = "ralink,mt7620a-intc", "ralink,rt2880-intc"; + reg = <0x200 0x100>; + + resets = <&rstctrl 19>; + reset-names = "intc"; + + interrupt-controller; + #interrupt-cells = <1>; + + interrupt-parent = <&cpuintc>; + interrupts = <2>; + }; + + memc@300 { + compatible = "ralink,mt7620a-memc", "ralink,rt3050-memc"; + reg = <0x300 0x100>; + + resets = <&rstctrl 20>; + reset-names = "mc"; + + interrupt-parent = <&intc>; + interrupts = <3>; + }; + + uart@500 { + compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a"; + reg = <0x500 0x100>; + + resets = <&rstctrl 12>; + reset-names = "uart"; + + interrupt-parent = <&intc>; + interrupts = <5>; + + reg-shift = <2>; + + status = "disabled"; + }; + + gpio0: gpio@600 { + compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + reg = <0x600 0x34>; + + resets = <&rstctrl 13>; + reset-names = "pio"; + + interrupt-parent = <&intc>; + interrupts = <6>; + + gpio-controller; + #gpio-cells = <2>; + + ralink,gpio-base = <0>; + ralink,num-gpios = <24>; + ralink,register-map = [ 00 04 08 0c + 20 24 28 2c + 30 34 ]; + + status = "disabled"; + }; + + gpio1: gpio@638 { + compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + reg = <0x638 0x24>; + + interrupt-parent = <&intc>; + interrupts = <6>; + + gpio-controller; + #gpio-cells = <2>; + + ralink,gpio-base = <24>; + ralink,num-gpios = <16>; + ralink,register-map = [ 00 04 08 0c + 10 14 18 1c + 20 24 ]; + + status = "disabled"; + }; + + gpio2: gpio@660 { + compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + reg = <0x660 0x24>; + + interrupt-parent = <&intc>; + interrupts = <6>; + + gpio-controller; + #gpio-cells = <2>; + + ralink,gpio-base = <40>; + ralink,num-gpios = <32>; + ralink,register-map = [ 00 04 08 0c + 10 14 18 1c + 20 24 ]; + + status = "disabled"; + }; + + i2c@900 { + compatible = "link,mt7620a-i2c", "ralink,rt2880-i2c"; + reg = <0x900 0x100>; + + resets = <&rstctrl 16>; + reset-names = "i2c"; + + #address-cells = <1>; + #size-cells = <0>; + + status = "disabled"; + }; + + spi@b00 { + compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi"; + reg = <0xb00 0x100>; + + resets = <&rstctrl 18>; + reset-names = "spi"; + + #address-cells = <1>; + #size-cells = <1>; + + status = "disabled"; + }; + + uartlite@c00 { + compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a"; + reg = <0xc00 0x100>; + + resets = <&rstctrl 19>; + reset-names = "uartl"; + + interrupt-parent = <&intc>; + interrupts = <12>; + + reg-shift = <2>; + }; + + systick@d00 { + compatible = "ralink,mt7620a-systick", "ralink,cevt-systick"; + reg = <0xd00 0x10>; + + resets = <&rstctrl 28>; + reset-names = "intc"; + + interrupt-parent = <&cpuintc>; + interrupts = <7>; + }; + + gdma@2800 { + compatible = "ralink,mt7620a-gdma", "ralink,rt2880-gdma"; + reg = <0x2800 0x800>; + + resets = <&rstctrl 14>; + reset-names = "dma"; + + interrupt-parent = <&intc>; + interrupts = <7>; + }; + }; + + rstctrl: rstctrl { + compatible = "ralink,mt7620a-reset", "ralink,rt2880-reset"; + #reset-cells = <1>; + }; + + ubsphy { + compatible = "ralink,mt7620a-usbphy"; + + resets = <&rstctrl 22 &rstctrl 25>; + reset-names = "host", "device"; + }; + + ethernet@10100000 { + compatible = "ralink,mt7620a-eth"; + reg = <0x10100000 10000>; + + #address-cells = <1>; + #size-cells = <0>; + + interrupt-parent = <&cpuintc>; + interrupts = <5>; + + status = "disabled"; + + mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + + status = "disabled"; + }; + }; + + gsw@10110000 { + compatible = "ralink,mt7620a-gsw"; + reg = <0x10110000 8000>; + + interrupt-parent = <&intc>; + interrupts = <17>; + + status = "disabled"; + }; + + sdhci@10130000 { + compatible = "ralink,mt7620a-sdhci"; + reg = <0x10130000 4000>; + + interrupt-parent = <&intc>; + interrupts = <14>; + + status = "disabled"; + }; + + ehci@101c0000 { + compatible = "ralink,rt3xxx-ehci"; + reg = <0x101c0000 0x1000>; + + interrupt-parent = <&intc>; + interrupts = <18>; + }; + + ohci@101c1000 { + compatible = "ralink,rt3xxx-ohci"; + reg = <0x101c1000 0x1000>; + + interrupt-parent = <&intc>; + interrupts = <18>; + }; + + pcie@10140000 { + compatible = "ralink,mt7620a-pci"; + reg = <0x10140000 0x100 + 0x10142000 0x100>; + + resets = <&rstctrl 26>; + reset-names = "pcie0"; + + interrupt-parent = <&cpuintc>; + interrupts = <4>; + + status = "disabled"; + }; +}; diff --git a/target/linux/ramips/dts/mt7620a_mt7610e_eval.dts b/target/linux/ramips/dts/mt7620a_mt7610e_eval.dts new file mode 100644 index 0000000000..0d7755b324 --- /dev/null +++ b/target/linux/ramips/dts/mt7620a_mt7610e_eval.dts @@ -0,0 +1,99 @@ +/dts-v1/; + +/include/ "mt7620a.dtsi" + +/ { + compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc"; + model = "Ralink MT7620A evaluation board"; + + memory@0 { + reg = <0x0 0x2000000>; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + palmbus@10000000 { + sysc@0 { + ralink,pinmux = "spi", "uartlite", "mdio", "wled", "ephy", "rgmii1", "rgmii2"; + ralink,gpiomux = "i2c", "jtag"; + ralink,uartmux = "gpio"; + ralink,wdtmux = <1>; + }; + + gpio0: gpio@600 { + status = "okay"; + }; + + spi@b00 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "en25q64"; + reg = <0 0>; + linux,modalias = "m25p80", "en25q64"; + 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>; + }; + }; + }; + }; + + ethernet@10100000 { + status = "okay"; + }; + + gsw@10110000 { + status = "okay"; + ralink,port4 = "ephy"; + }; + + sdhci@10130000 { + status = "okay"; + }; + + pcie@10140000 { + status = "okay"; + }; + + gpio-keys-polled { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + wps { + label = "wps"; + gpios = <&gpio0 12 1>; + linux,code = <0x100>; + }; + reset { + label = "reset"; + gpios = <&gpio0 13 1>; + linux,code = <0x101>; + }; + }; +}; diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi index 637409f355..b51314856d 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -13,10 +13,6 @@ bootargs = "console=ttyS0,57600"; }; - memorydetect { - ralink,memory = <0x8000000 0x200000 0x8000000>; - }; - cpuintc: cpuintc@0 { #address-cells = <0>; #interrupt-cells = <1>; diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi index 45d9238530..29cd536a51 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -13,10 +13,6 @@ bootargs = "console=ttyS0,57600"; }; - memorydetect { - ralink,memory = <0x0 0x200000 0x4000000>; - }; - cpuintc: cpuintc@0 { #address-cells = <0>; #interrupt-cells = <1>; @@ -48,12 +44,21 @@ watchdog@120 { compatible = "ralink,rt3052-wdt", "ralink,rt2880-wdt"; reg = <0x120 0x10>; + + resets = <&rstctrl 8>; + reset-names = "wdt"; + + interrupt-parent = <&intc>; + interrupts = <1>; }; intc: intc@200 { compatible = "ralink,rt3052-intc", "ralink,rt2880-intc"; reg = <0x200 0x100>; + resets = <&rstctrl 19>; + reset-names = "intc"; + interrupt-controller; #interrupt-cells = <1>; @@ -64,6 +69,27 @@ memc@300 { compatible = "ralink,rt3052-memc", "ralink,rt3050-memc"; reg = <0x300 0x100>; + + resets = <&rstctrl 20>; + reset-names = "mc"; + + interrupt-parent = <&intc>; + interrupts = <3>; + }; + + uart@500 { + compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a"; + reg = <0x500 0x100>; + + resets = <&rstctrl 12>; + reset-names = "uart"; + + interrupt-parent = <&intc>; + interrupts = <5>; + + reg-shift = <2>; + + status = "disabled"; }; gpio0: gpio@600 { @@ -79,6 +105,12 @@ 20 24 28 2c 30 34 ]; + resets = <&rstctrl 13>; + reset-names = "pio"; + + interrupt-parent = <&intc>; + interrupts = <6>; + status = "disabled"; }; @@ -117,6 +149,10 @@ spi@b00 { compatible = "ralink,rt3050-spi", "ralink,rt2880-spi"; reg = <0xb00 0x100>; + + resets = <&rstctrl 18>; + reset-names = "spi"; + #address-cells = <1>; #size-cells = <0>; @@ -126,6 +162,9 @@ uartlite@c00 { compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; + + resets = <&rstctrl 19>; + reset-names = "uartl"; interrupt-parent = <&intc>; interrupts = <12>; @@ -135,6 +174,11 @@ }; + rstctrl: rstctrl { + compatible = "ralink,rt3050-reset", "ralink,rt2880-reset"; + #reset-cells = <1>; + }; + ethernet@10100000 { compatible = "ralink,rt3050-eth"; reg = <0x10100000 10000>; diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index 9c7c268b88..e4d35d87c2 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -13,10 +13,6 @@ bootargs = "console=ttyS0,57600"; }; - memorydetect { - ralink,memory = <0x0 0x200000 0x10000000>; - }; - cpuintc: cpuintc@0 { #address-cells = <0>; #interrupt-cells = <1>; @@ -48,6 +44,12 @@ watchdog@120 { compatible = "ralink,rt3352-wdt", "ralink,rt2880-wdt"; reg = <0x120 0x10>; + + resets = <&rstctrl 8>; + reset-names = "wdt"; + + interrupt-parent = <&intc>; + interrupts = <1>; }; intc: intc@200 { @@ -64,6 +66,27 @@ memc@300 { compatible = "ralink,rt3352-memc", "ralink,rt3050-memc"; reg = <0x300 0x100>; + + resets = <&rstctrl 20>; + reset-names = "mc"; + + interrupt-parent = <&intc>; + interrupts = <3>; + }; + + uart@500 { + compatible = "ralink,rt3352-uart", "ralink,rt2880-uart", "ns16550a"; + reg = <0x500 0x100>; + + resets = <&rstctrl 12>; + reset-names = "uart"; + + interrupt-parent = <&intc>; + interrupts = <5>; + + reg-shift = <2>; + + status = "disabled"; }; gpio0: gpio@600 { @@ -78,6 +101,11 @@ ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; + resets = <&rstctrl 13>; + reset-names = "pio"; + + interrupt-parent = <&intc>; + interrupts = <6>; status = "disabled"; }; @@ -120,6 +148,9 @@ #address-cells = <1>; #size-cells = <1>; + resets = <&rstctrl 18>; + reset-names = "spi"; + status = "disabled"; }; @@ -127,6 +158,9 @@ compatible = "ralink,rt3352-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; + resets = <&rstctrl 19>; + reset-names = "uartl"; + interrupt-parent = <&intc>; interrupts = <12>; @@ -134,6 +168,11 @@ }; }; + rstctrl: rstctrl { + compatible = "ralink,rt3352-reset", "ralink,rt2880-reset"; + #reset-cells = <1>; + }; + ethernet@10100000 { compatible = "ralink,rt3352-eth", "ralink,rt3050-eth"; reg = <0x10100000 10000>; diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index 6f824d5e86..046c9e9a92 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -17,10 +17,6 @@ spi0 = &spi0; }; - memorydetect { - ralink,memory = <0x0 0x200000 0x10000000>; - }; - cpuintc: cpuintc@0 { #address-cells = <0>; #interrupt-cells = <1>; @@ -52,12 +48,21 @@ watchdog@120 { compatible = "ralink,rt3883-wdt", "ralink,rt2880-wdt"; reg = <0x120 0x10>; + + resets = <&rstctrl 8>; + reset-names = "wdt"; + + interrupt-parent = <&intc>; + interrupts = <1>; }; intc: intc@200 { compatible = "ralink,rt3883-intc", "ralink,rt2880-intc"; reg = <0x200 0x100>; + resets = <&rstctrl 19>; + reset-names = "intc"; + interrupt-controller; #interrupt-cells = <1>; @@ -68,12 +73,39 @@ memc@300 { compatible = "ralink,rt3883-memc", "ralink,rt3050-memc"; reg = <0x300 0x100>; + + resets = <&rstctrl 20>; + reset-names = "mc"; + + interrupt-parent = <&intc>; + interrupts = <3>; + }; + + uart@500 { + compatible = "ralink,rt3883-uart", "ralink,rt2880-uart", "ns16550a"; + reg = <0x500 0x100>; + + resets = <&rstctrl 12>; + reset-names = "uart"; + + interrupt-parent = <&intc>; + interrupts = <5>; + + reg-shift = <2>; + + status = "disabled"; }; gpio0: gpio@600 { compatible = "ralink,rt3883-gpio", "ralink,rt2880-gpio"; reg = <0x600 0x34>; + resets = <&rstctrl 13>; + reset-names = "pio"; + + interrupt-parent = <&intc>; + interrupts = <6>; + gpio-controller; #gpio-cells = <2>; @@ -140,6 +172,9 @@ #address-cells = <1>; #size-cells = <0>; + resets = <&rstctrl 18>; + reset-names = "spi"; + status = "disabled"; }; @@ -147,6 +182,9 @@ compatible = "ralink,rt3883-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; + resets = <&rstctrl 19>; + reset-names = "uartl"; + interrupt-parent = <&intc>; interrupts = <12>; @@ -163,6 +201,11 @@ status = "disabled"; + port@0 { + compatible = "lantiq,rt3883-port", "ralink,eth-port"; + reg = <0>; + }; + mdio-bus { #address-cells = <1>; #size-cells = <0>; @@ -171,6 +214,11 @@ }; }; + rstctrl: rstctrl { + compatible = "ralink,rt3883-reset", "ralink,rt2880-reset"; + #reset-cells = <1>; + }; + pci@10140000 { compatible = "ralink,rt3883-pci"; reg = <0x10140000 0x20000>; @@ -257,6 +305,13 @@ }; }; + ubsphy { + compatible = "ralink,rt3xxx-usbphy"; + + resets = <&rstctrl 22 &rstctrl 25>; + reset-names = "host", "device"; + }; + wmac@10180000 { compatible = "ralink,rt3883-wmac", "ralink,rt2880-wmac"; reg = <0x10180000 40000>; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index c48d7810f6..e132699da3 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -13,10 +13,6 @@ bootargs = "console=ttyS0,57600"; }; - memorydetect { - ralink,memory = <0x0 0x200000 0x4000000>; - }; - cpuintc: cpuintc@0 { #address-cells = <0>; #interrupt-cells = <1>; @@ -48,12 +44,21 @@ watchdog@120 { compatible = "ralink,rt5350-wdt", "ralink,rt2880-wdt"; reg = <0x120 0x10>; + + resets = <&rstctrl 8>; + reset-names = "wdt"; + + interrupt-parent = <&intc>; + interrupts = <1>; }; intc: intc@200 { compatible = "ralink,rt5350-intc", "ralink,rt2880-intc"; reg = <0x200 0x100>; + resets = <&rstctrl 19>; + reset-names = "intc"; + interrupt-controller; #interrupt-cells = <1>; @@ -64,12 +69,39 @@ memc@300 { compatible = "ralink,rt5350-memc", "ralink,rt3050-memc"; reg = <0x300 0x100>; + + resets = <&rstctrl 20>; + reset-names = "mc"; + + interrupt-parent = <&intc>; + interrupts = <3>; + }; + + uart@500 { + compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a"; + reg = <0x500 0x100>; + + resets = <&rstctrl 12>; + reset-names = "uart"; + + interrupt-parent = <&intc>; + interrupts = <5>; + + reg-shift = <2>; + + status = "disabled"; }; gpio0: gpio@600 { compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio"; reg = <0x600 0x34>; + resets = <&rstctrl 13>; + reset-names = "pio"; + + interrupt-parent = <&intc>; + interrupts = <6>; + gpio-controller; #gpio-cells = <2>; @@ -86,6 +118,9 @@ compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio"; reg = <0x638 0x24>; + interrupt-parent = <&intc>; + interrupts = <6>; + gpio-controller; #gpio-cells = <2>; @@ -102,6 +137,9 @@ compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio"; reg = <0x660 0x24>; + interrupt-parent = <&intc>; + interrupts = <6>; + gpio-controller; #gpio-cells = <2>; @@ -114,9 +152,26 @@ status = "disabled"; }; + i2c@900 { + compatible = "link,rt5350-i2c", "ralink,rt2880-i2c"; + reg = <0x900 0x100>; + + resets = <&rstctrl 16>; + reset-names = "i2c"; + + #address-cells = <1>; + #size-cells = <0>; + + status = "disabled"; + }; + spi@b00 { compatible = "ralink,rt5350-spi", "ralink,rt2880-spi"; reg = <0xb00 0x100>; + + resets = <&rstctrl 18>; + reset-names = "spi"; + #address-cells = <1>; #size-cells = <1>; @@ -127,15 +182,38 @@ compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; + resets = <&rstctrl 19>; + reset-names = "uartl"; + interrupt-parent = <&intc>; interrupts = <12>; reg-shift = <2>; }; + + systick@d00 { + compatible = "ralink,rt5350-systick", "ralink,cevt-systick"; + reg = <0xd00 0x10>; + + interrupt-parent = <&cpuintc>; + interrupts = <7>; + }; + }; + + rstctrl: rstctrl { + compatible = "ralink,rt5350-reset", "ralink,rt2880-reset"; + #reset-cells = <1>; + }; + + ubsphy { + compatible = "ralink,rt3xxx-usbphy"; + + resets = <&rstctrl 22 &rstctrl 25>; + reset-names = "host", "device"; }; ethernet@10100000 { - compatible = "ralink,rt5350-eth", "ralink,rt3050-eth"; + compatible = "ralink,rt5350-eth"; reg = <0x10100000 10000>; interrupt-parent = <&cpuintc>; @@ -145,7 +223,7 @@ }; esw@10110000 { - compatible = "ralink,rt5350-esw", "ralink,rt3050-esw"; + compatible = "ralink,rt3050-esw"; reg = <0x10110000 8000>; interrupt-parent = <&intc>; @@ -167,22 +245,18 @@ }; ehci@101c0000 { - compatible = "ralink,rt5350-ehci", "ehci-platform"; + compatible = "ralink,rt3xxx-ehci", "ehci-platform"; reg = <0x101c0000 0x1000>; interrupt-parent = <&intc>; interrupts = <18>; - - status = "disabled"; }; ohci@101c1000 { - compatible = "ralink,rt5350-ohci", "ohci-platform"; + compatible = "ralink,rt3xxx-ohci", "ohci-platform"; reg = <0x101c1000 0x1000>; interrupt-parent = <&intc>; interrupts = <18>; - - status = "disabled"; }; }; -- cgit v1.2.3