From owner-svn-src-all@freebsd.org  Wed Dec 12 22:09:36 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF3E21327D45;
 Wed, 12 Dec 2018 22:09:36 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 777BF842B8;
 Wed, 12 Dec 2018 22:09:36 +0000 (UTC)
 (envelope-from manu@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6AF7FE4BB;
 Wed, 12 Dec 2018 22:09:36 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBCM9aRD010212;
 Wed, 12 Dec 2018 22:09:36 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBCM9aC8010211;
 Wed, 12 Dec 2018 22:09:36 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201812122209.wBCM9aC8010211@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Wed, 12 Dec 2018 22:09:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r342017 - head/sys/dev/sdhci
X-SVN-Group: head
X-SVN-Commit-Author: manu
X-SVN-Commit-Paths: head/sys/dev/sdhci
X-SVN-Commit-Revision: 342017
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 777BF842B8
X-Spamd-Bar: -
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-1.33 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-0.83)[-0.828,0];
 NEURAL_HAM_SHORT(-0.50)[-0.500,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2018 22:09:37 -0000

Author: manu
Date: Wed Dec 12 22:09:35 2018
New Revision: 342017
URL: https://svnweb.freebsd.org/changeset/base/342017

Log:
  sdhci_xenon: Add Marvell 8k compatible string
  
  Sponsored by:	Rubicon Communications, LLC ("Netgate")

Modified:
  head/sys/dev/sdhci/sdhci_xenon.c

Modified: head/sys/dev/sdhci/sdhci_xenon.c
==============================================================================
--- head/sys/dev/sdhci/sdhci_xenon.c	Wed Dec 12 22:08:43 2018	(r342016)
+++ head/sys/dev/sdhci/sdhci_xenon.c	Wed Dec 12 22:09:35 2018	(r342017)
@@ -62,11 +62,16 @@ __FBSDID("$FreeBSD$");
 #include "sdhci_if.h"
 
 #include "opt_mmccam.h"
+#include "opt_soc.h"
 
 #define	MAX_SLOTS		6
 
 static struct ofw_compat_data compat_data[] = {
 	{ "marvell,armada-3700-sdhci",	1 },
+#ifdef SOC_MARVELL_8K
+	{ "marvell,armada-cp110-sdhci",	1 },
+	{ "marvell,armada-ap806-sdhci",	1 },
+#endif
 	{ NULL, 0 }
 };