From owner-svn-src-head@freebsd.org  Wed Jul 22 18:33:37 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9465D35BBE7;
 Wed, 22 Jul 2020 18:33:37 +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)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 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 4BBkcd3TGdz4Yq0;
 Wed, 22 Jul 2020 18:33:37 +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 5BA8CBE22;
 Wed, 22 Jul 2020 18:33:37 +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 06MIXbOI070478;
 Wed, 22 Jul 2020 18:33:37 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06MIXb86070477;
 Wed, 22 Jul 2020 18:33:37 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <202007221833.06MIXb86070477@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, 22 Jul 2020 18:33:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r363426 - head/sys/arm/allwinner
X-SVN-Group: head
X-SVN-Commit-Author: manu
X-SVN-Commit-Paths: head/sys/arm/allwinner
X-SVN-Commit-Revision: 363426
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jul 2020 18:33:37 -0000

Author: manu
Date: Wed Jul 22 18:33:36 2020
New Revision: 363426
URL: https://svnweb.freebsd.org/changeset/base/363426

Log:
  aw_mmc: Start a mmccam discovery when the CD handler is called.
  
  Submitted by:	kibab

Modified:
  head/sys/arm/allwinner/aw_mmc.c

Modified: head/sys/arm/allwinner/aw_mmc.c
==============================================================================
--- head/sys/arm/allwinner/aw_mmc.c	Wed Jul 22 18:30:17 2020	(r363425)
+++ head/sys/arm/allwinner/aw_mmc.c	Wed Jul 22 18:33:36 2020	(r363426)
@@ -371,6 +371,9 @@ aw_mmc_helper_cd_handler(device_t dev, bool present)
 	struct aw_mmc_softc *sc;
 
 	sc = device_get_softc(dev);
+#ifdef MMCCAM
+	mmccam_start_discovery(sc->sim);
+#else
 	AW_MMC_LOCK(sc);
 	if (present) {
 		if (sc->child == NULL) {
@@ -397,6 +400,7 @@ aw_mmc_helper_cd_handler(device_t dev, bool present)
 		} else
 			AW_MMC_UNLOCK(sc);
 	}
+#endif /* MMCCAM */
 }
 
 static int