Date: Sun, 31 Jan 2010 10:30:34 GMT From: Rafal Jaworowski <raj@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 174001 for review Message-ID: <201001311030.o0VAUYDV033804@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=174001 Change 174001 by raj@raj_fdt on 2010/01/31 10:29:49 Adjust DB-88F6281 DTS. - Make CPU decode windows data aligned with reality. - Simplify 'interrupts' specifier to include just IRQ number. Level/sense attributes are hard coded in the PIC and cannot be adjusted by the user, so there's no sense for it in the DTS. Affected files ... .. //depot/projects/fdt/sys/boot/fdt/dts/db88f6281.dts#2 edit Differences ... ==== //depot/projects/fdt/sys/boot/fdt/dts/db88f6281.dts#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* * Marvell Kirkwood DB-88F6281 Device Tree Source. * - * Copyright (c) 2009 The FreeBSD Foundation + * Copyright (c) 2009-2010 The FreeBSD Foundation * All rights reserved. * * This software was developed by Semihalf under sponsorship from @@ -72,10 +72,10 @@ compatible = "mrvl,lbc"; /* This reflects CPU decode windows setup. */ - ranges = <0x0 0x0f 0xbef00000 0x00100000 - 0x1 0x1e 0xbee00000 0x00100000 - 0x2 0x1d 0xbc000000 0x02000000 - 0x3 0x1b 0xbed00000 0x00100000>; + ranges = <0x0 0x0f 0xf9300000 0x00100000 + 0x1 0x1e 0xfa000000 0x00100000 + 0x2 0x1d 0xfa100000 0x02000000 + 0x3 0x1b 0xfc100000 0x00000400>; nor@0,0 { #address-cells = <1>; @@ -149,11 +149,11 @@ }; GPIO: gpio@10100 { - #gpio-cells = <2>; + #gpio-cells = <3>; compatible = "mrvl,gpio"; reg = <0x10100 0x20>; gpio-controller; - interrupts = <6 2 7 2 8 2 9 2>; + interrupts = <6 7 8 9>; interrupt-parent = <&PIC>; }; @@ -167,7 +167,7 @@ #size-cells = <0>; compatible = "mrvl,twsi"; reg = <0x11000 0x20>; - interrupts = <43 2>; + interrupts = <43>; interrupt-parent = <&PIC>; }; @@ -180,7 +180,7 @@ reg = <0x72000 0x2000>; ranges = <0x0 0x72000 0x2000>; local-mac-address = [ 00 00 00 00 00 00 ]; - interrupts = <11 2 12 2 13 2 14 2>; + interrupts = <12 13 14 11 46>; interrupt-parent = <&PIC>; }; @@ -189,7 +189,7 @@ compatible = "ns16550"; reg = <0x12000 0x20>; clock-frequency = <0>; - interrupts = <33 2>; + interrupts = <33>; interrupt-parent = <&PIC>; }; @@ -198,14 +198,14 @@ compatible = "ns16550"; reg = <0x12100 0x20>; clock-frequency = <0>; - interrupts = <34 2>; + interrupts = <34>; interrupt-parent = <&PIC>; }; timer@20300 { compatible = "mrvl,timer"; reg = <0x20300 0x30>; - interrupts = <1 2>; + interrupts = <1>; interrupt-parent = <&PIC>; mrvl,has-wdt; }; @@ -213,14 +213,14 @@ crypto@30000 { compatible = "mrvl,cesa"; reg = <0x30000 0x10000>; - interrupts = <22 2>; + interrupts = <22>; interrupt-parent = <&PIC>; }; PIC: pic@20200 { interrupt-controller; #address-cells = <0>; - #interrupt-cells = <2>; + #interrupt-cells = <1>; reg = <0x20200 0x3c>; compatible = "mrvl,pic"; }; @@ -228,20 +228,27 @@ usb@50000 { compatible = "mrvl,usb-ehci", "usb-ehci"; reg = <0x50000 0x1000>; - interrupts = <19 2>; + interrupts = <48 19>; interrupt-parent = <&PIC>; }; xor@60000 { compatible = "mrvl,xor"; reg = <0x60000 0x1000>; - interrupts = <5 2 6 2 7 2 8 2>; + interrupts = <5 6 7 8>; + interrupt-parent = <&PIC>; + }; + + sata@80000 { + compatible = "mrvl,sata"; + reg = <0x80000 0x6000>; + interrupts = <21>; interrupt-parent = <&PIC>; }; }; - sram@f1100000 { + sram@fd000000 { compatible = "mrvl,cesa-sram"; - reg = <0x0 0x00100000>; + reg = <0xfd000000 0x00100000>; }; };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001311030.o0VAUYDV033804>