 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcm53xx_board.c,v 1.17.2.2 2014/02/15 16:18:36 matt Exp $	*/
+/*	$NetBSD: bcm53xx_board.c,v 1.17.2.3 2014/02/19 23:19:57 matt Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,32 +19,33 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_broadcom.h"
 #include "arml2cc.h"
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_board.c,v 1.17.2.2 2014/02/15 16:18:36 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_board.c,v 1.17.2.3 2014/02/19 23:19:57 matt Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <prop/proplib.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #define CCA_PRIVATE
 #define CRU_PRIVATE
 @@ -73,28 +74,28 @@ struct arm32_dma_range bcm53xx_dma_range
 		.dr_sysbase = 0x80000000,
 		.dr_busbase = 0x80000000,
 		.dr_len = 0x10000000,
 	}, [1] = {
 		.dr_sysbase = 0x90000000,
 		.dr_busbase = 0x90000000,
 	},
 #elif defined(BCM563XX)
 	[0] = {
 		.dr_sysbase = 0x60000000,
 		.dr_busbase = 0x60000000,
 		.dr_len = 0x20000000,
 	}, [1] = {
-		.dr_sysbase = 0xa0000000,
+		.dr_sysbase = 0x80000000,
-		.dr_busbase = 0xa0000000,
+		.dr_busbase = 0x80000000,
 	},
 #endif
 };
 struct arm32_bus_dma_tag bcm53xx_dma_tag = {
 	._ranges = bcm53xx_dma_ranges,
 	._nranges = __arraycount(bcm53xx_dma_ranges),
 	_BUS_DMAMAP_FUNCS,
 	_BUS_DMAMEM_FUNCS,
 	_BUS_DMATAG_FUNCS,
 };
 struct arm32_dma_range bcm53xx_coherent_dma_ranges[] = {
 @@ -105,28 +106,28 @@ struct arm32_dma_range bcm53xx_coherent_
 		.dr_len = 0x10000000,
 		.dr_flags = _BUS_DMAMAP_COHERENT,
 	}, [1] = {
 		.dr_sysbase = 0x90000000,
 		.dr_busbase = 0x90000000,
 	},
 #elif defined(BCM563XX)
 	[0] = {
 		.dr_sysbase = 0x60000000,
 		.dr_busbase = 0x60000000,
 		.dr_len = 0x20000000,
 		.dr_flags = _BUS_DMAMAP_COHERENT,
 	}, [1] = {
-		.dr_sysbase = 0xa0000000,
+		.dr_sysbase = 0x80000000,
-		.dr_busbase = 0xa0000000,
+		.dr_busbase = 0x80000000,
 	},
 #endif
 };
 struct arm32_bus_dma_tag bcm53xx_coherent_dma_tag = {
 	._ranges = bcm53xx_coherent_dma_ranges,
 	._nranges = __arraycount(bcm53xx_coherent_dma_ranges),
 	_BUS_DMAMAP_FUNCS,
 	_BUS_DMAMEM_FUNCS,
 	_BUS_DMATAG_FUNCS,
 };
 #ifdef _ARM32_NEED_BUS_DMA_BOUNCE
 @@ -544,28 +545,30 @@ bcm53xx_bootstrap(vaddr_t iobase)
 	bcm53xx_clock_init(clk);
 	bcm53xx_lcpll_clock_init(clk, bcs.bcs_lcpll_control1,
 	    bcs.bcs_lcpll_control2);
 	bcm53xx_genpll_clock_init(clk, bcs.bcs_genpll_control5,
 	    bcs.bcs_genpll_control6, bcs.bcs_genpll_control7);
 	bcm53xx_usb_clock_init(clk, bcs.bcs_usb2_control);
 	bcm53xx_get_ddr_freq(clk, bcs.bcs_ddr_phy_ctl_pll_status,
 	    bcs.bcs_ddr_phy_ctl_pll_dividers);
 	bcm53xx_get_cpu_freq(clk, bcs.bcs_armcore_clk_pllarma,
 	    bcs.bcs_armcore_clk_pllarmb, bcs.bcs_armcore_clk_policy);
 	curcpu()->ci_data.cpu_cc_freq = clk->clk_cpu;
 #if NARML2CC > 0
 	arml2cc_init(bcm53xx_armcore_bst, bcm53xx_armcore_bsh,
 	    ARMCORE_L2C_BASE);
 #endif
+}
 void
 bcm53xx_dma_bootstrap(psize_t memsize)
+{
 	if (memsize <= 256*1024*1024) {
 		bcm53xx_dma_ranges[0].dr_len = memsize;
 		bcm53xx_coherent_dma_ranges[0].dr_len = memsize;
 		bcm53xx_dma_tag._nranges = 1;
 		bcm53xx_coherent_dma_tag._nranges = 1;
 	} else {
 		/*
 		 * By setting up two ranges, bus_dmamem_alloc will always