From owner-svn-src-head@FreeBSD.ORG  Tue Oct 29 11:28:11 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C442046C;
 Tue, 29 Oct 2013 11:28:11 +0000 (UTC) (envelope-from rrs@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 B22E12DCC;
 Tue, 29 Oct 2013 11:28:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9TBSBvq034154;
 Tue, 29 Oct 2013 11:28:11 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9TBSB4q034153;
 Tue, 29 Oct 2013 11:28:11 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <201310291128.r9TBSB4q034153@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Tue, 29 Oct 2013 11:28:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257326 - head/sys/dev/cesa
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.14
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: Tue, 29 Oct 2013 11:28:11 -0000

Author: rrs
Date: Tue Oct 29 11:28:11 2013
New Revision: 257326
URL: http://svnweb.freebsd.org/changeset/base/257326

Log:
  Opps, my kirkwood fix for the dreamplug missed this.

Modified:
  head/sys/dev/cesa/cesa.c

Modified: head/sys/dev/cesa/cesa.c
==============================================================================
--- head/sys/dev/cesa/cesa.c	Tue Oct 29 11:21:31 2013	(r257325)
+++ head/sys/dev/cesa/cesa.c	Tue Oct 29 11:28:11 2013	(r257326)
@@ -995,11 +995,17 @@ cesa_attach(device_t dev)
 	sc->sc_dev = dev;
 
 	/* Check if CESA peripheral device has power turned on */
+#if defined(SOC_MV_KIRKWOOD)
+	if (soc_power_ctrl_get(CPU_PM_CTRL_CRYPTO) == CPU_PM_CTRL_CRYPTO) {
+		device_printf(dev, "not powered on\n");
+		return (ENXIO);
+	}
+#else
 	if (soc_power_ctrl_get(CPU_PM_CTRL_CRYPTO) != CPU_PM_CTRL_CRYPTO) {
 		device_printf(dev, "not powered on\n");
 		return (ENXIO);
 	}
-
+#endif
 	soc_id(&d, &r);
 
 	switch (d) {