Module Name:    src
Committed By:   simonb
Date:           Tue Aug 18 10:35:51 UTC 2020

Modified Files:
        src/sys/arch/mips/cavium: mainbus.c

Log Message:
We don't need to call the POW and FGA bootstrap functions from the FDT
mainbus attach, the iobus attach code does this already and is called
for both iobus-only and FDT cases anyway.

After discussion with jmcneill@.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/cavium/mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/cavium/mainbus.c
diff -u src/sys/arch/mips/cavium/mainbus.c:1.4 src/sys/arch/mips/cavium/mainbus.c:1.5
--- src/sys/arch/mips/cavium/mainbus.c:1.4	Mon Aug 17 21:25:12 2020
+++ src/sys/arch/mips/cavium/mainbus.c	Tue Aug 18 10:35:51 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.4 2020/08/17 21:25:12 jmcneill Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.5 2020/08/18 10:35:51 simonb Exp $	*/
 
 /*
  * Copyright (c) 2007
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2020/08/17 21:25:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2020/08/18 10:35:51 simonb Exp $");
 
 #define	_MIPS_BUS_DMA_PRIVATE
 
@@ -122,9 +122,6 @@ mainbus_attach_devicetree(device_t self)
 	config_found_sm_loc(self, "mainbus", NULL, &aa, mainbus_print,
 	    mainbus_submatch);
 
-	octpow_bootstrap(&octeon_configuration);
-	octfpa_bootstrap(&octeon_configuration);
-
 	simplebus_bus_io_init(&simplebus_bus_tag, NULL);
 
 	faa.faa_bst = &simplebus_bus_tag;

Reply via email to