From owner-svn-src-all@freebsd.org Tue May 17 06:42:26 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7936B3E1DE; Tue, 17 May 2016 06:42:26 +0000 (UTC) (envelope-from sgalabov@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 87CAE10BB; Tue, 17 May 2016 06:42:26 +0000 (UTC) (envelope-from sgalabov@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4H6gPwo021878; Tue, 17 May 2016 06:42:25 GMT (envelope-from sgalabov@FreeBSD.org) Received: (from sgalabov@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4H6gOAf021867; Tue, 17 May 2016 06:42:24 GMT (envelope-from sgalabov@FreeBSD.org) Message-Id: <201605170642.u4H6gOAf021867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sgalabov set sender to sgalabov@FreeBSD.org using -f From: Stanislav Galabov Date: Tue, 17 May 2016 06:42:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300013 - in head/sys: boot/fdt/dts/mips gnu/dts/mips X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2016 06:42:26 -0000 Author: sgalabov Date: Tue May 17 06:42:24 2016 New Revision: 300013 URL: https://svnweb.freebsd.org/changeset/base/300013 Log: Import LEDE dts files for Ralink/Mediatek This is an import of the reworked LEDE dts files. Besides other things they make it easier for us to reuse. The only diffs left are for the following SoCs: MT7620A (fbsd-mt7620a.dtsi) MT7621 (fbsd-mt7621.dtsi) MT7628 (fbsd-mt7628an.dtsi) RT3883 (fbsd-rt3883.dtsi) So we include the fbsd-*.dtsi files at the end of the original LEDE dtsi files, using '#include "fbsd-xxxx.dtsi"'. For example, for MT7621, the LEDE dtsi file is mt7621.dtsi. At the end of it we add: #include "fbsd-mt7621.dtsi" Approved by: adrian (mentor) Obtained from: LEDE project Sponsored by: Smartcom - Bulgaria AD Differential Revision: https://reviews.freebsd.org/D6394 Added: head/sys/gnu/dts/mips/CS-QR10.dts (contents, props changed) head/sys/gnu/dts/mips/MZK-EX300NP.dts (contents, props changed) head/sys/gnu/dts/mips/MZK-EX750NP.dts (contents, props changed) head/sys/gnu/dts/mips/SK-WB8.dts (contents, props changed) head/sys/gnu/dts/mips/WNDR3700V5.dts (contents, props changed) head/sys/gnu/dts/mips/WRH-300CR.dts (contents, props changed) head/sys/gnu/dts/mips/ZBT-WG3526.dts (contents, props changed) Deleted: head/sys/boot/fdt/dts/mips/fbsd-mt7620n.dtsi head/sys/boot/fdt/dts/mips/fbsd-rt2880.dtsi head/sys/boot/fdt/dts/mips/fbsd-rt3050.dtsi head/sys/boot/fdt/dts/mips/fbsd-rt3352.dtsi head/sys/boot/fdt/dts/mips/fbsd-rt5350.dtsi Modified: head/sys/boot/fdt/dts/mips/fbsd-mt7620a.dtsi head/sys/boot/fdt/dts/mips/fbsd-mt7621.dtsi head/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi head/sys/boot/fdt/dts/mips/fbsd-rt3883.dtsi head/sys/gnu/dts/mips/3G-6200N.dts head/sys/gnu/dts/mips/3G-6200NL.dts head/sys/gnu/dts/mips/3G150B.dts head/sys/gnu/dts/mips/3G300M.dts head/sys/gnu/dts/mips/A5-V11.dts head/sys/gnu/dts/mips/AI-BR100.dts head/sys/gnu/dts/mips/AIR3GII.dts head/sys/gnu/dts/mips/ALL0239-3G.dts head/sys/gnu/dts/mips/ALL0256N-4M.dts head/sys/gnu/dts/mips/ALL0256N-8M.dts head/sys/gnu/dts/mips/ALL5002.dts head/sys/gnu/dts/mips/ALL5003.dts head/sys/gnu/dts/mips/AR670W.dts head/sys/gnu/dts/mips/AR725W.dts head/sys/gnu/dts/mips/ASL26555-16M.dts head/sys/gnu/dts/mips/ASL26555-8M.dts head/sys/gnu/dts/mips/ATP-52B.dts head/sys/gnu/dts/mips/AWAPN2403.dts head/sys/gnu/dts/mips/AWM002-4M.dtsi head/sys/gnu/dts/mips/AWM002-8M.dtsi head/sys/gnu/dts/mips/AWM002-EVB-4M.dts head/sys/gnu/dts/mips/AWM002-EVB-8M.dts head/sys/gnu/dts/mips/AWM002.dtsi head/sys/gnu/dts/mips/AWM003-EVB.dts head/sys/gnu/dts/mips/ArcherC20i.dts head/sys/gnu/dts/mips/BC2.dts head/sys/gnu/dts/mips/BR-6425.dts head/sys/gnu/dts/mips/BR-6475ND.dts head/sys/gnu/dts/mips/BROADWAY.dts head/sys/gnu/dts/mips/CARAMBOLA.dts head/sys/gnu/dts/mips/CF-WR800N.dts head/sys/gnu/dts/mips/CY-SWR1100.dts head/sys/gnu/dts/mips/D105.dts head/sys/gnu/dts/mips/DAP-1350.dts head/sys/gnu/dts/mips/DB-WRT01.dts head/sys/gnu/dts/mips/DCS-930.dts head/sys/gnu/dts/mips/DCS-930L-B1.dts head/sys/gnu/dts/mips/DIR-300-B1.dts head/sys/gnu/dts/mips/DIR-300-B7.dts head/sys/gnu/dts/mips/DIR-320-B1.dts head/sys/gnu/dts/mips/DIR-600-B1.dts head/sys/gnu/dts/mips/DIR-600-B2.dts head/sys/gnu/dts/mips/DIR-610-A1.dts head/sys/gnu/dts/mips/DIR-615-D.dts head/sys/gnu/dts/mips/DIR-615-H1.dts head/sys/gnu/dts/mips/DIR-620-A1.dts head/sys/gnu/dts/mips/DIR-620-D1.dts head/sys/gnu/dts/mips/DIR-645.dts head/sys/gnu/dts/mips/DIR-810L.dts head/sys/gnu/dts/mips/DIR-860L-B1.dts head/sys/gnu/dts/mips/E1700.dts head/sys/gnu/dts/mips/ESR-9753.dts head/sys/gnu/dts/mips/EX2700.dts head/sys/gnu/dts/mips/F5D8235_V1.dts head/sys/gnu/dts/mips/F5D8235_V2.dts head/sys/gnu/dts/mips/F7C027.dts head/sys/gnu/dts/mips/FIREWRT.dts head/sys/gnu/dts/mips/FONERA20N.dts head/sys/gnu/dts/mips/FREESTATION5.dts head/sys/gnu/dts/mips/GL-MT300A.dts head/sys/gnu/dts/mips/GL-MT300N.dts head/sys/gnu/dts/mips/GL-MT750.dts head/sys/gnu/dts/mips/HC5661.dts head/sys/gnu/dts/mips/HC5761.dts head/sys/gnu/dts/mips/HC5861.dts head/sys/gnu/dts/mips/HC5XXX.dtsi head/sys/gnu/dts/mips/HG255D.dts head/sys/gnu/dts/mips/HLKRM04.dts head/sys/gnu/dts/mips/HPM.dts head/sys/gnu/dts/mips/HT-TM02.dts head/sys/gnu/dts/mips/HW550-3G.dts head/sys/gnu/dts/mips/IP2202.dts head/sys/gnu/dts/mips/JHR-N805R.dts head/sys/gnu/dts/mips/JHR-N825R.dts head/sys/gnu/dts/mips/JHR-N926R.dts head/sys/gnu/dts/mips/LINKIT7688.dts head/sys/gnu/dts/mips/M2M.dts head/sys/gnu/dts/mips/M3.dts head/sys/gnu/dts/mips/M4-4M.dts head/sys/gnu/dts/mips/M4-8M.dts head/sys/gnu/dts/mips/MINIEMBPLUG.dts head/sys/gnu/dts/mips/MINIEMBWIFI.dts head/sys/gnu/dts/mips/MIWIFI-MINI.dts head/sys/gnu/dts/mips/MIWIFI-NANO.dts head/sys/gnu/dts/mips/MLW221.dts head/sys/gnu/dts/mips/MLWG2.dts head/sys/gnu/dts/mips/MOFI3500-3GN.dts head/sys/gnu/dts/mips/MPRA1.dts head/sys/gnu/dts/mips/MPRA2.dts head/sys/gnu/dts/mips/MR-102N.dts head/sys/gnu/dts/mips/MT7620a.dts head/sys/gnu/dts/mips/MT7620a_MT7530.dts head/sys/gnu/dts/mips/MT7620a_MT7610e.dts head/sys/gnu/dts/mips/MT7620a_V22SG.dts head/sys/gnu/dts/mips/MT7621.dts head/sys/gnu/dts/mips/MT7628.dts head/sys/gnu/dts/mips/MZK-750DHP.dts head/sys/gnu/dts/mips/MZK-DP150N.dts head/sys/gnu/dts/mips/MZK-W300NH2.dts head/sys/gnu/dts/mips/MZK-WDPR.dts head/sys/gnu/dts/mips/MicroWRT.dts head/sys/gnu/dts/mips/NA930.dts head/sys/gnu/dts/mips/NBG-419N.dts head/sys/gnu/dts/mips/NCS601W.dts head/sys/gnu/dts/mips/NW718.dts head/sys/gnu/dts/mips/OY-0001.dts head/sys/gnu/dts/mips/PBR-M1.dts head/sys/gnu/dts/mips/PSG1208.dts head/sys/gnu/dts/mips/PSR-680W.dts head/sys/gnu/dts/mips/PWH2004.dts head/sys/gnu/dts/mips/PX-4885-4M.dts head/sys/gnu/dts/mips/PX-4885-8M.dts head/sys/gnu/dts/mips/PX-4885.dtsi head/sys/gnu/dts/mips/RE6500.dts head/sys/gnu/dts/mips/RP-N53.dts head/sys/gnu/dts/mips/RT-G32-B1.dts head/sys/gnu/dts/mips/RT-N10-PLUS.dts head/sys/gnu/dts/mips/RT-N13U.dts head/sys/gnu/dts/mips/RT-N14U.dts head/sys/gnu/dts/mips/RT-N15.dts head/sys/gnu/dts/mips/RT-N56U.dts head/sys/gnu/dts/mips/RT5350F-OLINUXINO-EVB.dts head/sys/gnu/dts/mips/RT5350F-OLINUXINO.dts head/sys/gnu/dts/mips/RUT5XX.dts head/sys/gnu/dts/mips/SAP-G3200U3.dts head/sys/gnu/dts/mips/SL-R7205.dts head/sys/gnu/dts/mips/TEW-691GR.dts head/sys/gnu/dts/mips/TEW-692GR.dts head/sys/gnu/dts/mips/TINY-AC.dts head/sys/gnu/dts/mips/UBNT-ERX.dts head/sys/gnu/dts/mips/UR-326N4G.dts head/sys/gnu/dts/mips/UR-336UN.dts head/sys/gnu/dts/mips/V11STFE.dts head/sys/gnu/dts/mips/V22RW-2X2.dts head/sys/gnu/dts/mips/VOCORE-16M.dts head/sys/gnu/dts/mips/VOCORE-8M.dts head/sys/gnu/dts/mips/VOCORE.dtsi head/sys/gnu/dts/mips/W150M.dts head/sys/gnu/dts/mips/W306R_V20.dts head/sys/gnu/dts/mips/W502U.dts head/sys/gnu/dts/mips/WCR150GN.dts head/sys/gnu/dts/mips/WF-2881.dts head/sys/gnu/dts/mips/WHR-1166D.dts head/sys/gnu/dts/mips/WHR-300HP2.dts head/sys/gnu/dts/mips/WHR-600D.dts head/sys/gnu/dts/mips/WHR-G300N.dts head/sys/gnu/dts/mips/WITI.dts head/sys/gnu/dts/mips/WIZARD8800.dts head/sys/gnu/dts/mips/WIZFI630A.dts head/sys/gnu/dts/mips/WL-330N.dts head/sys/gnu/dts/mips/WL-330N3G.dts head/sys/gnu/dts/mips/WL-341V3.dts head/sys/gnu/dts/mips/WL-351.dts head/sys/gnu/dts/mips/WLI-TX4-AG300N.dts head/sys/gnu/dts/mips/WMR-300.dts head/sys/gnu/dts/mips/WNCE2001.dts head/sys/gnu/dts/mips/WR512-3GN-4M.dts head/sys/gnu/dts/mips/WR512-3GN-8M.dts head/sys/gnu/dts/mips/WR6202.dts head/sys/gnu/dts/mips/WRTNODE.dts head/sys/gnu/dts/mips/WRTNODE2.dtsi head/sys/gnu/dts/mips/WRTNODE2P.dts head/sys/gnu/dts/mips/WRTNODE2R.dts head/sys/gnu/dts/mips/WSR-1166.dts head/sys/gnu/dts/mips/WSR-600.dts head/sys/gnu/dts/mips/WT1520-4M.dts head/sys/gnu/dts/mips/WT1520-8M.dts head/sys/gnu/dts/mips/WT1520.dtsi head/sys/gnu/dts/mips/WT3020-4M.dts head/sys/gnu/dts/mips/WT3020-8M.dts head/sys/gnu/dts/mips/WZR-AGL300NH.dts head/sys/gnu/dts/mips/X5.dts head/sys/gnu/dts/mips/X8.dts head/sys/gnu/dts/mips/XDXRN502J.dts head/sys/gnu/dts/mips/Y1.dts head/sys/gnu/dts/mips/Y1.dtsi head/sys/gnu/dts/mips/Y1S.dts head/sys/gnu/dts/mips/YOUKU-YK1.dts head/sys/gnu/dts/mips/ZBT-WA05.dts head/sys/gnu/dts/mips/ZBT-WE826.dts head/sys/gnu/dts/mips/ZBT-WG2626.dts head/sys/gnu/dts/mips/ZBT-WR8305RT.dts head/sys/gnu/dts/mips/ZTE-Q7.dts head/sys/gnu/dts/mips/mt7620a.dtsi head/sys/gnu/dts/mips/mt7620n.dtsi head/sys/gnu/dts/mips/mt7621.dtsi head/sys/gnu/dts/mips/mt7628an.dtsi head/sys/gnu/dts/mips/rt2880.dtsi head/sys/gnu/dts/mips/rt3050.dtsi head/sys/gnu/dts/mips/rt3352.dtsi head/sys/gnu/dts/mips/rt3883.dtsi head/sys/gnu/dts/mips/rt5350.dtsi Modified: head/sys/boot/fdt/dts/mips/fbsd-mt7620a.dtsi ============================================================================== --- head/sys/boot/fdt/dts/mips/fbsd-mt7620a.dtsi Tue May 17 06:30:46 2016 (r300012) +++ head/sys/boot/fdt/dts/mips/fbsd-mt7620a.dtsi Tue May 17 06:42:24 2016 (r300013) @@ -1,35 +1,9 @@ /* $FreeBSD$ */ -/ { - /* Specify alias for serial0 so we have a working console */ - aliases { - serial0 = "/palmbus@10000000/uartlite@c00"; - }; - +&pcie { /* - * OpenWRT doesn't define a clock controller, but we currently need one + * Our driver is different that OpenWRT's, so we need slightly + * different values for the reg property */ - clkctrl: cltctrl { - compatible = "ralink,rt2880-clock"; - #clock-cells = <1>; - }; - - /* Specify the clocks node for the usbphy */ - usbphy: usbphy { - clocks = <&clkctrl 22 &clkctrl 25>; - }; - - pcie@10140000 { - /* - * Our driver is different that OpenWRT's, so we need slightly - * different values for the reg property - */ - reg = <0x10140000 0x10000>; - - /* - * Also, we need resets and clocks defined, so we can properly - * initialize the PCIe - */ - clocks = <&clkctrl 26>; - }; + reg = <0x10140000 0x10000>; }; Modified: head/sys/boot/fdt/dts/mips/fbsd-mt7621.dtsi ============================================================================== --- head/sys/boot/fdt/dts/mips/fbsd-mt7621.dtsi Tue May 17 06:30:46 2016 (r300012) +++ head/sys/boot/fdt/dts/mips/fbsd-mt7621.dtsi Tue May 17 06:42:24 2016 (r300013) @@ -1,73 +1,49 @@ /* $FreeBSD$ */ -/ { - /* Specify alias for serial0 so we have a working console */ - aliases { - serial0 = "/palmbus@1E000000/uartlite@c00"; - }; - - /* - * OpenWRT doesn't define a clock controller, but we currently need one - */ - clkctrl: cltctrl { - compatible = "ralink,rt2880-clock"; - #clock-cells = <1>; - }; - - palmbus@1E000000 { - uartlite@c00 { clock-frequency = <50000000>; }; +&palmbus { + gpio@600 { + /* + * Mark gpio as compatible to simple-bus and override + * its #size-cells and provide a default ranges property + * so we can attach instances of our mtk_gpio_v2 driver + * to it for now. Provide exactly the same resources to + * the instances of mtk_gpio_v2. + */ + compatible = "simple-bus"; + ranges = <0x0 0x600 0x100>; + #size-cells = <1>; + + interrupt-parent = <&gic>; + + gpio0: bank@0 { + reg = <0x0 0x100>; + interrupts = <0 6 4>; + }; - gpio@600 { - /* - * Mark gpio as compatible to simple-bus and override - * its #size-cells and provide a default ranges property - * so we can attach instances of our mtk_gpio_v2 driver - * to it for now. Provide exactly the same resources to - * the instances of mtk_gpio_v2. - */ - compatible = "simple-bus"; - ranges = <0x0 0x600 0x100>; - #size-cells = <1>; - - interrupt-parent = <&gic>; - - gpio0: bank@0 { - reg = <0x0 0x100>; - interrupts = <0 6 4>; - }; - - gpio1: bank@1 { - reg = <0x0 0x100>; - interrupts = <0 6 4>; - }; - - gpio2: bank@2 { - reg = <0x0 0x100>; - interrupts = <0 6 4>; - }; + gpio1: bank@1 { + reg = <0x0 0x100>; + interrupts = <0 6 4>; }; - }; - xhci@1E1C0000 { - /* - * A slightly different value for reg size is needed by our - * driver for the moment - */ - reg = <0x1e1c0000 0x20000>; + gpio2: bank@2 { + reg = <0x0 0x100>; + interrupts = <0 6 4>; + }; }; +}; - pcie@1e140000 { - /* - * Our driver is different that OpenWRT's, so we need slightly - * different values for the reg property - */ - reg = <0x1e140000 0x10000>; +&xhci { + /* + * A slightly different value for reg size is needed by our + * driver for the moment + */ + reg = <0x1e1c0000 0x20000>; +}; - /* - * Also, we need resets and clocks defined, so we can properly - * initialize the PCIe - */ - resets = <&rstctrl 24>, <&rstctrl 25>, <&rstctrl 26>; - clocks = <&clkctrl 24>, <&clkctrl 25>, <&clkctrl 26>; - }; +&pcie { + /* + * Our driver is different that OpenWRT's, so we need slightly + * different values for the reg property + */ + reg = <0x1e140000 0x10000>; }; Modified: head/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi ============================================================================== --- head/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi Tue May 17 06:30:46 2016 (r300012) +++ head/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi Tue May 17 06:42:24 2016 (r300013) @@ -1,70 +1,39 @@ /* $FreeBSD$ */ -/ { - /* Specify alias for serial0 so we have a working console */ - aliases { - serial0 = "/palmbus@10000000/uart2@e00"; - }; - - /* - * OpenWRT doesn't define a clock controller, but we currently need one - */ - clkctrl: cltctrl { - compatible = "ralink,rt2880-clock"; - #clock-cells = <1>; - }; - - palmbus@10000000 { - uartlite@c00 { clock-frequency = <40000000>; }; - uart1@d00 { clock-frequency = <40000000>; }; - uart2@e00 { clock-frequency = <40000000>; }; - - gpio@600 { - /* - * Mark gpio as compatible to simple-bus and override - * its #size-cells and provide a default ranges property - * so we can attach instances of our mtk_gpio_v2 driver - * to it for now. Provide exactly the same resources to - * the instances of mtk_gpio_v2. - */ - compatible = "simple-bus"; - ranges = <0x0 0x600 0x100>; - #size-cells = <1>; - - gpio0: bank@0 { - reg = <0x0 0x100>; - interrupts = <6>; - }; - - gpio1: bank@1 { - reg = <0x0 0x100>; - interrupts = <6>; - }; +&palmbus { + gpio@600 { + /* + * Mark gpio as compatible to simple-bus and override + * its #size-cells and provide a default ranges property + * so we can attach instances of our mtk_gpio_v2 driver + * to it for now. Provide exactly the same resources to + * the instances of mtk_gpio_v2. + */ + compatible = "simple-bus"; + ranges = <0x0 0x600 0x100>; + #size-cells = <1>; + + gpio0: bank@0 { + reg = <0x0 0x100>; + interrupts = <6>; + }; - gpio2: bank@2 { - reg = <0x0 0x100>; - interrupts = <6>; - }; + gpio1: bank@1 { + reg = <0x0 0x100>; + interrupts = <6>; }; - }; - /* Specify the clocks node for the usbphy */ - usbphy: usbphy@10120000 { - clocks = <&clkctrl 22 &clkctrl 25>; + gpio2: bank@2 { + reg = <0x0 0x100>; + interrupts = <6>; + }; }; +}; - pcie@10140000 { +&pcie { /* * Our driver is different that OpenWRT's, so we need slightly * different values for the reg property */ reg = <0x10140000 0x10000>; - - /* - * Also, we need resets and clocks defined, so we can properly - * initialize the PCIe - */ - resets = <&rstctrl 26>, <&rstctrl 27>; - clocks = <&clkctrl 26>, <&clkctrl 27>; - }; }; Modified: head/sys/boot/fdt/dts/mips/fbsd-rt3883.dtsi ============================================================================== --- head/sys/boot/fdt/dts/mips/fbsd-rt3883.dtsi Tue May 17 06:30:46 2016 (r300012) +++ head/sys/boot/fdt/dts/mips/fbsd-rt3883.dtsi Tue May 17 06:42:24 2016 (r300013) @@ -1,37 +1,16 @@ /* $FreeBSD$ */ -/ { - /* Specify alias for serial0 so we have a working console */ - aliases { - serial0 = "/palmbus@10000000/uartlite@c00"; - }; +&pci { + #address-cells = <3>; + #size-cells = <2>; + ranges = < + 0x02000000 0 0x00000000 0x20000000 0 0x10000000 + 0x01000000 0 0x00000000 0x10160000 0 0x00010000 + >; - /* - * OpenWRT doesn't define a clock controller, but we currently need one - */ - clkctrl: cltctrl { - compatible = "ralink,rt2880-clock"; - #clock-cells = <1>; - }; + interrupt-parent = <&cpuintc>; + interrupts = <4>; - /* Specify the clocks node for the usbphy */ - usbphy: usbphy { - clocks = <&clkctrl 22 &clkctrl 25>; - clock-names = "host", "device"; - }; - - pci@10140000 { - #address-cells = <3>; - #size-cells = <2>; - ranges = < - 0x02000000 0 0x00000000 0x20000000 0 0x10000000 - 0x01000000 0 0x00000000 0x10160000 0 0x00010000 - >; - - interrupt-parent = <&cpuintc>; - interrupts = <4>; - - resets = <&rstctrl 23>; - clocks = <&clkctrl 21>; - }; + resets = <&rstctrl 23>; + clocks = <&clkctrl 21>; }; Modified: head/sys/gnu/dts/mips/3G-6200N.dts ============================================================================== --- head/sys/gnu/dts/mips/3G-6200N.dts Tue May 17 06:30:46 2016 (r300012) +++ head/sys/gnu/dts/mips/3G-6200N.dts Tue May 17 06:42:24 2016 (r300013) @@ -1,20 +1,11 @@ /dts-v1/; -/include/ "rt3050.dtsi" +#include "rt3050.dtsi" / { compatible = "3G-6200N", "ralink,rt3050-soc"; model = "Edimax 3g-6200n"; - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; - }; - }; - cfi@1f000000 { compatible = "cfi-flash"; reg = <0x1f000000 0x800000>; @@ -53,18 +44,6 @@ }; }; - ethernet@10100000 { - mtd-mac-address = <&factory 0x4>; - }; - - esw@10110000 { - mediatek,portmap = <0x2f>; - }; - - wmac@10180000 { - ralink,mtd-eeprom = <&factory 0>; - }; - gpio-leds { compatible = "gpio-leds"; @@ -102,8 +81,29 @@ linux,code = <0x100>; }; }; +}; - otg@101c0000 { - status = "okay"; +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; + +ðernet { + mtd-mac-address = <&factory 0x4>; +}; + +&esw { + mediatek,portmap = <0x2f>; +}; + +&wmac { + ralink,mtd-eeprom = <&factory 0>; +}; + +&otg { + status = "okay"; +}; Modified: head/sys/gnu/dts/mips/3G-6200NL.dts ============================================================================== --- head/sys/gnu/dts/mips/3G-6200NL.dts Tue May 17 06:30:46 2016 (r300012) +++ head/sys/gnu/dts/mips/3G-6200NL.dts Tue May 17 06:42:24 2016 (r300013) @@ -1,20 +1,11 @@ /dts-v1/; -/include/ "rt3050.dtsi" +#include "rt3050.dtsi" / { compatible = "3G-6200NL", "ralink,rt3050-soc"; model = "Edimax 3g-6200nl"; - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; - }; - }; - cfi@1f000000 { compatible = "cfi-flash"; reg = <0x1f000000 0x800000>; @@ -53,18 +44,6 @@ }; }; - ethernet@10100000 { - mtd-mac-address = <&factory 0x4>; - }; - - esw@10110000 { - mediatek,portmap = <0x2f>; - }; - - wmac@10180000 { - ralink,mtd-eeprom = <&factory 0>; - }; - gpio-leds { compatible = "gpio-leds"; @@ -86,8 +65,29 @@ linux,code = <0x211>; }; }; +}; - otg@101c0000 { - status = "okay"; +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; + +ðernet { + mtd-mac-address = <&factory 0x4>; +}; + +&esw { + mediatek,portmap = <0x2f>; +}; + +&wmac { + ralink,mtd-eeprom = <&factory 0>; +}; + +&otg { + status = "okay"; +}; Modified: head/sys/gnu/dts/mips/3G150B.dts ============================================================================== --- head/sys/gnu/dts/mips/3G150B.dts Tue May 17 06:30:46 2016 (r300012) +++ head/sys/gnu/dts/mips/3G150B.dts Tue May 17 06:42:24 2016 (r300013) @@ -1,83 +1,11 @@ /dts-v1/; -/include/ "rt5350.dtsi" +#include "rt5350.dtsi" / { compatible = "3G150B", "ralink,rt5350-soc"; model = "Tenda 3G150B"; - palmbus@10000000 { - spi@b00 { - status = "okay"; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "jedec,spi-nor"; - reg = <0 0>; - linux,modalias = "m25p80", "s25fl064k"; - 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 0x3b0000>; - }; - }; - }; - - gpio1: gpio@660 { - status = "okay"; - }; - }; - - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf", "led"; - ralink,function = "gpio"; - }; - }; - }; - - ethernet@10100000 { - mtd-mac-address = <&factory 0x4>; - }; - - esw@10110000 { - mediatek,portmap = <0x2f>; - }; - - wmac@10180000 { - ralink,mtd-eeprom = <&factory 0>; - ralink,led-polarity = <1>; - }; - - ehci@101c0000 { - status = "okay"; - }; - - ohci@101c1000 { - status = "okay"; - }; - gpio-leds { compatible = "gpio-leds"; @@ -116,3 +44,73 @@ }; }; }; + +&spi0 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0 0>; + linux,modalias = "m25p80", "s25fl064k"; + 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 0x3b0000>; + }; + }; +}; + +&gpio1 { + status = "okay"; +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf", "led"; + ralink,function = "gpio"; + }; + }; +}; + +ðernet { + mtd-mac-address = <&factory 0x4>; +}; + +&esw { + mediatek,portmap = <0x2f>; +}; + +&wmac { + ralink,mtd-eeprom = <&factory 0>; + ralink,led-polarity = <1>; +}; + +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; Modified: head/sys/gnu/dts/mips/3G300M.dts ============================================================================== --- head/sys/gnu/dts/mips/3G300M.dts Tue May 17 06:30:46 2016 (r300012) +++ head/sys/gnu/dts/mips/3G300M.dts Tue May 17 06:42:24 2016 (r300013) @@ -1,58 +1,11 @@ /dts-v1/; -/include/ "rt3050.dtsi" +#include "rt3050.dtsi" / { compatible = "3G300M", "ralink,rt3052-soc"; model = "Tenda 3G300M"; - palmbus@10000000 { - spi@b00 { - status = "okay"; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "jedec,spi-nor"; - reg = <0 0>; - linux,modalias = "m25p80", "mx25l3205d"; - 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 0x3b0000>; - }; - }; - }; - }; - - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; - }; - }; - }; - gpio-leds { compatible = "gpio-leds"; @@ -105,20 +58,65 @@ linux,code = <0x100>; }; }; +}; - ethernet@10100000 { - mtd-mac-address = <&factory 0x4>; - }; +&spi0 { + status = "okay"; - esw@10110000 { - mediatek,portmap = <0x2f>; - }; + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0 0>; + linux,modalias = "m25p80", "mx25l3205d"; + 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; + }; - wmac@10180000 { - ralink,mtd-eeprom = <&factory 0>; + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0x3b0000>; + }; }; +}; - otg@101c0000 { - status = "okay"; +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,function = "gpio"; + }; }; }; + +ðernet { + mtd-mac-address = <&factory 0x4>; +}; + +&esw { + mediatek,portmap = <0x2f>; +}; + +&wmac { + ralink,mtd-eeprom = <&factory 0>; +}; + +&otg { + status = "okay"; +}; Modified: head/sys/gnu/dts/mips/A5-V11.dts ============================================================================== --- head/sys/gnu/dts/mips/A5-V11.dts Tue May 17 06:30:46 2016 (r300012) +++ head/sys/gnu/dts/mips/A5-V11.dts Tue May 17 06:42:24 2016 (r300013) @@ -1,82 +1,11 @@ /dts-v1/; -/include/ "rt5350.dtsi" +#include "rt5350.dtsi" / { compatible = "A5-V11", "ralink,rt5350-soc"; model = "A5-V11"; - palmbus@10000000 { - spi@b00 { - status = "okay"; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "jedec,spi-nor"; - reg = <0 0>; - linux,modalias = "m25p80", "pm25lq032"; - 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 0x3b0000>; - }; - }; - }; - - gpio1: gpio@660 { - status = "okay"; - }; - }; - - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; - }; - }; - }; - - ethernet@10100000 { - mtd-mac-address = <&factory 0x4>; - }; - - esw@10110000 { - mediatek,portmap = <0x2f>; - }; - - wmac@10180000 { - ralink,mtd-eeprom = <&factory 0>; - }; - - ehci@101c0000 { - status = "okay"; - }; - - ohci@101c1000 { - status = "okay"; - }; - gpio-leds { compatible = "gpio-leds"; @@ -121,3 +50,73 @@ }; }; }; + +&spi0 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0 0>; + linux,modalias = "m25p80", "pm25lq032"; + 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 0x3b0000>; + }; + }; +}; + +&gpio1 { + status = "okay"; +}; + +&pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = "i2c", "jtag", "uartf", "led"; + ralink,function = "gpio"; + }; + }; +}; + +ðernet { + mtd-mac-address = <&factory 0x4>; +}; + +&esw { + mediatek,portmap = <0x1>; + mediatek,portdisable = <0x3e>; +}; + +&wmac { + ralink,mtd-eeprom = <&factory 0>; +}; + +&ehci { + status = "okay"; +}; + +&ohci { + status = "okay"; +}; Modified: head/sys/gnu/dts/mips/AI-BR100.dts ============================================================================== --- head/sys/gnu/dts/mips/AI-BR100.dts Tue May 17 06:30:46 2016 (r300012) +++ head/sys/gnu/dts/mips/AI-BR100.dts Tue May 17 06:42:24 2016 (r300013) @@ -1,85 +1,11 @@ /dts-v1/; -/include/ "mt7620a.dtsi" +#include "mt7620a.dtsi" / { compatible = "AI-BR100", "ralink,mt7620a-soc"; model = "Aigale Ai-BR100"; - palmbus@10000000 { - gpio2: gpio@660 { - status = "okay"; - }; - - gpio3: gpio@688 { - status = "okay"; - }; - - spi@b00 { - status = "okay"; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "jedec,spi-nor"; - reg = <0 0>; - linux,modalias = "m25p80", "en25q64"; - spi-max-frequency = <10000000>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x20000>; - read-only; - }; - - partition@20000 { - label = "u-boot-env"; - reg = <0x20000 0x10000>; - read-only; - }; - - factory: partition@30000 { - label = "factory"; - reg = <0x30000 0x10000>; - read-only; - }; - - partition@40000 { - label = "firmware"; - reg = <0x40000 0x7c0000>; - }; - }; - }; - }; - - ehci@101c0000 { - status = "okay"; - }; - - ohci@101c1000 { - status = "okay"; - }; - - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd"; - ralink,function = "gpio"; - }; - }; - }; - - ethernet@10100000 { - pinctrl-names = "default"; - pinctrl-0 = <&ephy_pins>; - mtd-mac-address = <&factory 0x4>; - mediatek,portmap = "llllw"; - }; - - wmac@10180000 { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***