Date: Wed, 3 Feb 2010 20:09:33 GMT From: Rafal Jaworowski <raj@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 174257 for review Message-ID: <201002032009.o13K9X7G005545@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=174257 Change 174257 by raj@raj_fdt on 2010/02/03 20:08:44 Adjust DB-88F6281 DTS file. - Fix IRQ numbers used by the GPIO controller. - Provide 'reg-shift' for the UART node. - Improve 'model' value for the board (add manufacturer prefix). - Put PIC and timer as the first nodes to initialize. - Other minor cosmetics. Affected files ... .. //depot/projects/fdt/sys/boot/fdt/dts/db88f6281.dts#3 edit Differences ... ==== //depot/projects/fdt/sys/boot/fdt/dts/db88f6281.dts#3 (text+ko) ==== @@ -1,6 +1,4 @@ /* - * Marvell Kirkwood DB-88F6281 Device Tree Source. - * * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. * @@ -27,12 +25,17 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * Marvell Kirkwood DB-88F6281 Device Tree Source. + * + * $FreeBSD$ + * */ /dts-v1/; / { - model = "DB-88F6281"; + model = "mrvl,DB-88F6281"; compatible = "DB-88F6281-BP", "DB-88F6281-BP-A"; #address-cells = <1>; #size-cells = <1>; @@ -118,6 +121,22 @@ ranges = <0x0 0xf1000000 0x00100000>; bus-frequency = <0>; + PIC: pic@20200 { + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <1>; + reg = <0x20200 0x3c>; + compatible = "mrvl,pic"; + }; + + timer@20300 { + compatible = "mrvl,timer"; + reg = <0x20300 0x30>; + interrupts = <1>; + interrupt-parent = <&PIC>; + mrvl,has-wdt; + }; + MPP: mpp@10000 { #pin-cells = <2>; compatible = "mrvl,mpp"; @@ -153,7 +172,7 @@ compatible = "mrvl,gpio"; reg = <0x10100 0x20>; gpio-controller; - interrupts = <6 7 8 9>; + interrupts = <35 36 37 38 39 40 41>; interrupt-parent = <&PIC>; }; @@ -188,6 +207,7 @@ cell-index = <0>; compatible = "ns16550"; reg = <0x12000 0x20>; + reg-shift = <2>; clock-frequency = <0>; interrupts = <33>; interrupt-parent = <&PIC>; @@ -197,19 +217,12 @@ cell-index = <1>; compatible = "ns16550"; reg = <0x12100 0x20>; + reg-shift = <2>; clock-frequency = <0>; interrupts = <34>; interrupt-parent = <&PIC>; }; - timer@20300 { - compatible = "mrvl,timer"; - reg = <0x20300 0x30>; - interrupts = <1>; - interrupt-parent = <&PIC>; - mrvl,has-wdt; - }; - crypto@30000 { compatible = "mrvl,cesa"; reg = <0x30000 0x10000>; @@ -217,14 +230,6 @@ interrupt-parent = <&PIC>; }; - PIC: pic@20200 { - interrupt-controller; - #address-cells = <0>; - #interrupt-cells = <1>; - reg = <0x20200 0x3c>; - compatible = "mrvl,pic"; - }; - usb@50000 { compatible = "mrvl,usb-ehci", "usb-ehci"; reg = <0x50000 0x1000>;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002032009.o13K9X7G005545>