Module Name: src
Committed By: matt
Date: Wed Feb 19 23:19:57 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom [matt-nb5-mips64]: bcm53xx_board.c
Log Message:
Fix dmaranges for BCM563XX
Conditionalize call to arml2cc_init
To generate a diff of this commit:
cvs rdiff -u -r1.17.2.2 -r1.17.2.3 src/sys/arch/arm/broadcom/bcm53xx_board.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/arm/broadcom/bcm53xx_board.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_board.c:1.17.2.2 src/sys/arch/arm/broadcom/bcm53xx_board.c:1.17.2.3
--- src/sys/arch/arm/broadcom/bcm53xx_board.c:1.17.2.2 Sat Feb 15 16:18:36 2014
+++ src/sys/arch/arm/broadcom/bcm53xx_board.c Wed Feb 19 23:19:57 2014
@@ -1,4 +1,4 @@
-/* $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.
@@ -29,12 +29,13 @@
*/
#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>
@@ -83,8 +84,8 @@ struct arm32_dma_range bcm53xx_dma_range
.dr_busbase = 0x60000000,
.dr_len = 0x20000000,
}, [1] = {
- .dr_sysbase = 0xa0000000,
- .dr_busbase = 0xa0000000,
+ .dr_sysbase = 0x80000000,
+ .dr_busbase = 0x80000000,
},
#endif
};
@@ -115,8 +116,8 @@ struct arm32_dma_range bcm53xx_coherent_
.dr_len = 0x20000000,
.dr_flags = _BUS_DMAMAP_COHERENT,
}, [1] = {
- .dr_sysbase = 0xa0000000,
- .dr_busbase = 0xa0000000,
+ .dr_sysbase = 0x80000000,
+ .dr_busbase = 0x80000000,
},
#endif
};
@@ -554,8 +555,10 @@ bcm53xx_bootstrap(vaddr_t iobase)
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
