[Midnightbsd-cvs] src [10078] trunk/sys/dev/quicc: sync

[laffer1 at midnightbsd.org]

Revision: 10078
          http://svnweb.midnightbsd.org/src/?rev=10078
Author:   laffer1
Date:     2018-05-27 19:19:45 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/sys/dev/quicc/quicc_bfe.h
    trunk/sys/dev/quicc/quicc_bfe_fdt.c
    trunk/sys/dev/quicc/quicc_bus.h
    trunk/sys/dev/quicc/quicc_core.c

Modified: trunk/sys/dev/quicc/quicc_bfe.h
===================================================================
--- trunk/sys/dev/quicc/quicc_bfe.h	2018-05-27 23:19:22 UTC (rev 10077)
+++ trunk/sys/dev/quicc/quicc_bfe.h	2018-05-27 23:19:45 UTC (rev 10078)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright 2006 by Juniper Networks.
  * All rights reserved.
@@ -25,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/quicc/quicc_bfe.h 207532 2010-05-02 19:05:57Z marius $
  */
 
 #ifndef _DEV_QUICC_BFE_H_

Modified: trunk/sys/dev/quicc/quicc_bfe_fdt.c
===================================================================
--- trunk/sys/dev/quicc/quicc_bfe_fdt.c	2018-05-27 23:19:22 UTC (rev 10077)
+++ trunk/sys/dev/quicc/quicc_bfe_fdt.c	2018-05-27 23:19:45 UTC (rev 10078)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2006 Juniper Networks.
  * All rights reserved.
@@ -27,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/quicc/quicc_bfe_fdt.c 266152 2014-05-15 16:11:06Z ian $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -75,6 +76,9 @@
 	phandle_t par;
 	pcell_t clock;
 
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
 	if (!ofw_bus_is_compatible(dev, "fsl,cpm2"))
 		return (ENXIO);
 

Modified: trunk/sys/dev/quicc/quicc_bus.h
===================================================================
--- trunk/sys/dev/quicc/quicc_bus.h	2018-05-27 23:19:22 UTC (rev 10077)
+++ trunk/sys/dev/quicc/quicc_bus.h	2018-05-27 23:19:45 UTC (rev 10078)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2006 Marcel Moolenaar
  * All rights reserved.
@@ -23,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/quicc/quicc_bus.h 176772 2008-03-03 18:20:17Z raj $
  */
 
 #ifndef _DEV_QUICC_BUS_H_

Modified: trunk/sys/dev/quicc/quicc_core.c
===================================================================
--- trunk/sys/dev/quicc/quicc_core.c	2018-05-27 23:19:22 UTC (rev 10077)
+++ trunk/sys/dev/quicc/quicc_core.c	2018-05-27 23:19:45 UTC (rev 10078)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright 2006 by Juniper Networks.
  * All rights reserved.
@@ -27,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/quicc/quicc_core.c 227293 2011-11-07 06:44:47Z ed $");
 
 #include <sys/param.h>
 #include <sys/systm.h>