From owner-svn-src-all@FreeBSD.ORG  Mon Jan 12 22:37:05 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D34611065674;
	Mon, 12 Jan 2009 22:37:05 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D8D48FC1D;
	Mon, 12 Jan 2009 22:37:05 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0CMb5NS078342;
	Mon, 12 Jan 2009 22:37:05 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CMb5o8078340;
	Mon, 12 Jan 2009 22:37:05 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200901122237.n0CMb5o8078340@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 12 Jan 2009 22:37:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187119 - in stable/7/sys: . dev/ata
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2009 22:37:08 -0000

Author: rpaulo
Date: Mon Jan 12 22:37:05 2009
New Revision: 187119
URL: http://svn.freebsd.org/changeset/base/187119

Log:
  MFC r185268:
  
  Add support for Marvell PATA M88SX6121.
  
  PR:		129154
  Submitted by:	João Barros <joao.barros at gmail.com>

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/dev/ata/ata-chipset.c
  stable/7/sys/dev/ata/ata-pci.h

Modified: stable/7/sys/dev/ata/ata-chipset.c
==============================================================================
--- stable/7/sys/dev/ata/ata-chipset.c	Mon Jan 12 22:01:49 2009	(r187118)
+++ stable/7/sys/dev/ata/ata-chipset.c	Mon Jan 12 22:37:05 2009	(r187119)
@@ -2555,6 +2555,7 @@ ata_marvell_ident(device_t dev)
      { ATA_M88SX6041, 0, 4, MV60XX, ATA_SA300, "88SX6041" },
      { ATA_M88SX6081, 0, 8, MV60XX, ATA_SA300, "88SX6081" },
      { ATA_M88SX6101, 0, 1, MV61XX, ATA_UDMA6, "88SX6101" },
+     { ATA_M88SX6121, 0, 1, MV_61XX, ATA_UDMA6, "88SX6121" },
      { ATA_M88SX6145, 0, 2, MV61XX, ATA_UDMA6, "88SX6145" },
      { 0, 0, 0, 0, 0, 0}};
 

Modified: stable/7/sys/dev/ata/ata-pci.h
==============================================================================
--- stable/7/sys/dev/ata/ata-pci.h	Mon Jan 12 22:01:49 2009	(r187118)
+++ stable/7/sys/dev/ata/ata-pci.h	Mon Jan 12 22:37:05 2009	(r187119)
@@ -211,6 +211,7 @@ struct ata_connect_task {
 #define ATA_M88SX6041           0x604111ab
 #define ATA_M88SX6081           0x608111ab
 #define ATA_M88SX6101           0x610111ab
+#define ATA_M88SX6121           0x612111ab
 #define ATA_M88SX6145           0x614511ab
 
 #define ATA_MICRON_ID           0x1042