From owner-svn-src-all@FreeBSD.ORG Sat Oct 26 17:29:50 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id ED3EBE38; Sat, 26 Oct 2013 17:29:50 +0000 (UTC) (envelope-from zbb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DA648290D; Sat, 26 Oct 2013 17:29:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QHToMU059328; Sat, 26 Oct 2013 17:29:50 GMT (envelope-from zbb@svn.freebsd.org) Received: (from zbb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QHToRT059326; Sat, 26 Oct 2013 17:29:50 GMT (envelope-from zbb@svn.freebsd.org) Message-Id: <201310261729.r9QHToRT059326@svn.freebsd.org> From: Zbigniew Bodek Date: Sat, 26 Oct 2013 17:29:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257172 - in head/sys: arm/mv boot/fdt/dts 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.14 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: Sat, 26 Oct 2013 17:29:51 -0000 Author: zbb Date: Sat Oct 26 17:29:50 2013 New Revision: 257172 URL: http://svnweb.freebsd.org/changeset/base/257172 Log: Enable SATA interface on Armada XP - Add appropriate entry to DTS - Allow for MV78460 SATA probe and configuration Tested by: kevlo Approved by: cognet (mentor) Modified: head/sys/arm/mv/mv_sata.c head/sys/boot/fdt/dts/db78460.dts Modified: head/sys/arm/mv/mv_sata.c ============================================================================== --- head/sys/arm/mv/mv_sata.c Sat Oct 26 17:27:32 2013 (r257171) +++ head/sys/arm/mv/mv_sata.c Sat Oct 26 17:29:50 2013 (r257172) @@ -200,6 +200,7 @@ sata_probe(device_t dev) case MV_DEV_88F6282: case MV_DEV_MV78100: case MV_DEV_MV78100_Z0: + case MV_DEV_MV78460: sc->sc_version = 2; sc->sc_edma_qlen = 32; break; Modified: head/sys/boot/fdt/dts/db78460.dts ============================================================================== --- head/sys/boot/fdt/dts/db78460.dts Sat Oct 26 17:27:32 2013 (r257171) +++ head/sys/boot/fdt/dts/db78460.dts Sat Oct 26 17:29:50 2013 (r257172) @@ -283,6 +283,13 @@ }; }; }; + + sata@A0000 { + compatible = "mrvl,sata"; + reg = <0xA0000 0x6000>; + interrupts = <55>; + interrupt-parent = <&MPIC>; + }; }; pci0: pcie@d0040000 {