From owner-svn-src-head@FreeBSD.ORG  Fri Jan 23 01:18:09 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3EAC696C;
 Fri, 23 Jan 2015 01:18:09 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A3681D3;
 Fri, 23 Jan 2015 01:18:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0N1I99k034663;
 Fri, 23 Jan 2015 01:18:09 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0N1I9C9034662;
 Fri, 23 Jan 2015 01:18:09 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201501230118.t0N1I9C9034662@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Fri, 23 Jan 2015 01:18:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277555 - head/sys/arm/freescale/imx
X-SVN-Group: head
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.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jan 2015 01:18:09 -0000

Author: ian
Date: Fri Jan 23 01:18:08 2015
New Revision: 277555
URL: https://svnweb.freebsd.org/changeset/base/277555

Log:
  Enable all the mmc/sd controllers, because there's no telling which ones
  any given board will be using.
  
  Yes, changing source is an unusually primitive power control implementation.

Modified:
  head/sys/arm/freescale/imx/imx6_ccm.c

Modified: head/sys/arm/freescale/imx/imx6_ccm.c
==============================================================================
--- head/sys/arm/freescale/imx/imx6_ccm.c	Fri Jan 23 00:54:56 2015	(r277554)
+++ head/sys/arm/freescale/imx/imx6_ccm.c	Fri Jan 23 01:18:08 2015	(r277555)
@@ -95,7 +95,7 @@ ccm_init_gates(struct ccm_softc *sc)
 	WR4(sc, CCM_CCGR3, 0x3ff00000); /* DDR memory controller */
 	WR4(sc, CCM_CCGR4, 0x0000f300); /* pl301 bus crossbar */
 	WR4(sc, CCM_CCGR5, 0x0f000000); /* uarts */
-	WR4(sc, CCM_CCGR6, 0x000000cc); /* usdhc 1 & 3 */
+	WR4(sc, CCM_CCGR6, 0x000000ff); /* usdhc 1-4 */
 }
 
 static int