Module Name: src
Committed By: hkenken
Date: Thu Aug 17 09:11:04 UTC 2017
Modified Files:
src/sys/arch/arm/imx: files.imx51 files.imx6 files.imx7 imx51_axi.c
imx51_ipuv3.c imx51_usb.c imx51var.h imx6_axi.c imx6_usb.c
imx6var.h imx7_axi.c imx7_board.c imx7_usb.c imx7var.h
src/sys/arch/evbarm/imx7: imx7_machdep.c
Log Message:
Use armv7_generic_[dma|bs]_tag.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/imx/files.imx51
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/files.imx6
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/files.imx7 \
src/sys/arch/arm/imx/imx51_usb.c src/sys/arch/arm/imx/imx6_axi.c \
src/sys/arch/arm/imx/imx7_board.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imx51_axi.c \
src/sys/arch/arm/imx/imx51_ipuv3.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/imx51var.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx6_usb.c \
src/sys/arch/arm/imx/imx7_axi.c src/sys/arch/arm/imx/imx7_usb.c \
src/sys/arch/arm/imx/imx7var.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/imx6var.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/imx7/imx7_machdep.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/imx/files.imx51
diff -u src/sys/arch/arm/imx/files.imx51:1.14 src/sys/arch/arm/imx/files.imx51:1.15
--- src/sys/arch/arm/imx/files.imx51:1.14 Mon Dec 21 04:26:28 2015
+++ src/sys/arch/arm/imx/files.imx51 Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx51,v 1.14 2015/12/21 04:26:28 hkenken Exp $
+# $NetBSD: files.imx51,v 1.15 2017/08/17 09:11:04 hkenken Exp $
#
# Configuration info for the Freescale i.MX5x
#
@@ -13,9 +13,11 @@ file arch/arm/arm32/arm32_boot.c
file arch/arm/arm32/arm32_kvminit.c
file arch/arm/arm32/arm32_reboot.c
file arch/arm/arm32/irq_dispatch.S
+
+define bus_dma_generic
file arch/arm/arm32/armv7_generic_space.c
+file arch/arm/arm32/armv7_generic_dma.c
file arch/arm/arm/bus_space_a4x.S
-file arch/arm/imx/imx_dma.c bus_dma_generic needs-flag
# iMX51 AXI/AHB bus interface and SoC domains
device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic
Index: src/sys/arch/arm/imx/files.imx6
diff -u src/sys/arch/arm/imx/files.imx6:1.8 src/sys/arch/arm/imx/files.imx6:1.9
--- src/sys/arch/arm/imx/files.imx6:1.8 Thu Nov 24 12:06:43 2016
+++ src/sys/arch/arm/imx/files.imx6 Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx6,v 1.8 2016/11/24 12:06:43 hkenken Exp $
+# $NetBSD: files.imx6,v 1.9 2017/08/17 09:11:04 hkenken Exp $
#
# Configuration info for the Freescale i.MX6
#
@@ -16,8 +16,8 @@ file arch/arm/arm32/irq_dispatch.S
define bus_dma_generic
file arch/arm/arm32/armv7_generic_space.c
+file arch/arm/arm32/armv7_generic_dma.c
file arch/arm/arm/bus_space_a4x.S
-file arch/arm/imx/imx_dma.c bus_dma_generic needs-flag
file arch/arm/imx/imx6_board.c
Index: src/sys/arch/arm/imx/files.imx7
diff -u src/sys/arch/arm/imx/files.imx7:1.2 src/sys/arch/arm/imx/files.imx7:1.3
--- src/sys/arch/arm/imx/files.imx7:1.2 Mon Oct 17 10:36:56 2016
+++ src/sys/arch/arm/imx/files.imx7 Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx7,v 1.2 2016/10/17 10:36:56 ryo Exp $
+# $NetBSD: files.imx7,v 1.3 2017/08/17 09:11:04 hkenken Exp $
#
# Configuration info for the Freescale i.MX7
#
@@ -16,12 +16,12 @@ file arch/arm/arm32/arm32_reboot.c
file arch/arm/arm32/irq_dispatch.S
define bus_dma_generic
+file arch/arm/arm32/armv7_generic_space.c
+file arch/arm/arm32/armv7_generic_dma.c
+file arch/arm/arm/bus_space_a4x.S
-file arch/arm/imx/imx_space.c
-file arch/arm/imx/imx_dma.c bus_dma_generic needs-flag
file arch/arm/imx/imx7_board.c
-
# iMX7 AXI/AHB bus interface and SoC domains
device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic
attach axi at mainbus
Index: src/sys/arch/arm/imx/imx51_usb.c
diff -u src/sys/arch/arm/imx/imx51_usb.c:1.2 src/sys/arch/arm/imx/imx51_usb.c:1.3
--- src/sys/arch/arm/imx/imx51_usb.c:1.2 Fri Jul 25 07:49:56 2014
+++ src/sys/arch/arm/imx/imx51_usb.c Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_usb.c,v 1.2 2014/07/25 07:49:56 hkenken Exp $ */
+/* $NetBSD: imx51_usb.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $ */
/*
* Copyright (c) 2010 Genetec Corporation. All rights reserved.
* Written by Hiroyuki Bessho for Genetec Corporation.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_usb.c,v 1.2 2014/07/25 07:49:56 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_usb.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $");
#include "opt_imx.h"
@@ -80,7 +80,7 @@ imxusbc_search(device_t parent, cfdata_t
aa.aa_iot = sc->sc_iot;
aa.aa_ioh = sc->sc_ioh;
- aa.aa_dmat = &imx_bus_dma_tag;
+ aa.aa_dmat = &armv7_generic_dma_tag;
aa.aa_unit = cf->cf_loc[IMXUSBCCF_UNIT];
aa.aa_irq = cf->cf_loc[IMXUSBCCF_IRQ];
Index: src/sys/arch/arm/imx/imx6_axi.c
diff -u src/sys/arch/arm/imx/imx6_axi.c:1.2 src/sys/arch/arm/imx/imx6_axi.c:1.3
--- src/sys/arch/arm/imx/imx6_axi.c:1.2 Thu Dec 31 12:14:01 2015
+++ src/sys/arch/arm/imx/imx6_axi.c Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_axi.c,v 1.2 2015/12/31 12:14:01 ryo Exp $ */
+/* $NetBSD: imx6_axi.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_axi.c,v 1.2 2015/12/31 12:14:01 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_axi.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -78,7 +78,7 @@ axi_attach(device_t parent __unused, dev
sc = device_private(self);
sc->sc_iot = &armv7_generic_bs_tag;
#if NBUS_DMA_GENERIC > 0
- sc->sc_dmat = &imx_bus_dma_tag;
+ sc->sc_dmat = &armv7_generic_dma_tag;
#else
sc->sc_dmat = 0;
#endif
Index: src/sys/arch/arm/imx/imx7_board.c
diff -u src/sys/arch/arm/imx/imx7_board.c:1.2 src/sys/arch/arm/imx/imx7_board.c:1.3
--- src/sys/arch/arm/imx/imx7_board.c:1.2 Thu Oct 20 09:53:07 2016
+++ src/sys/arch/arm/imx/imx7_board.c Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx7_board.c,v 1.2 2016/10/20 09:53:07 skrll Exp $ */
+/* $NetBSD: imx7_board.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $ */
/*
* Copyright (c) 2012 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_board.c,v 1.2 2016/10/20 09:53:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_board.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $");
#include "opt_imx.h"
@@ -48,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: imx7_board.c
static void imx7_soc_init(void);
-bus_space_tag_t imx7_ioreg_bst = &imx_bs_tag;
+bus_space_tag_t imx7_ioreg_bst = &armv7_generic_bs_tag;
bus_space_handle_t imx7_ioreg_bsh;
-bus_space_tag_t imx7_armcore_bst = &imx_bs_tag;
+bus_space_tag_t imx7_armcore_bst = &armv7_generic_bs_tag;
bus_space_handle_t imx7_armcore_bsh;
void
Index: src/sys/arch/arm/imx/imx51_axi.c
diff -u src/sys/arch/arm/imx/imx51_axi.c:1.5 src/sys/arch/arm/imx/imx51_axi.c:1.6
--- src/sys/arch/arm/imx/imx51_axi.c:1.5 Thu May 7 04:13:47 2015
+++ src/sys/arch/arm/imx/imx51_axi.c Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_axi.c,v 1.5 2015/05/07 04:13:47 hkenken Exp $ */
+/* $NetBSD: imx51_axi.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $ */
/*-
* Copyright (c) 2010 SHIMIZU Ryo <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.5 2015/05/07 04:13:47 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -78,7 +78,7 @@ axi_attach(device_t parent __unused, dev
sc = device_private(self);
sc->sc_iot = &armv7_generic_bs_tag;
#if NBUS_DMA_GENERIC > 0
- sc->sc_dmat = &imx_bus_dma_tag;
+ sc->sc_dmat = &armv7_generic_dma_tag;
#else
sc->sc_dmat = 0;
#endif
Index: src/sys/arch/arm/imx/imx51_ipuv3.c
diff -u src/sys/arch/arm/imx/imx51_ipuv3.c:1.5 src/sys/arch/arm/imx/imx51_ipuv3.c:1.6
--- src/sys/arch/arm/imx/imx51_ipuv3.c:1.5 Sun Jun 25 12:11:30 2017
+++ src/sys/arch/arm/imx/imx51_ipuv3.c Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_ipuv3.c,v 1.5 2017/06/25 12:11:30 maxv Exp $ */
+/* $NetBSD: imx51_ipuv3.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $ */
/*
* Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.c,v 1.5 2017/06/25 12:11:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $");
#include "opt_imx51_ipuv3.h"
@@ -579,7 +579,7 @@ imx51_ipuv3_attach_sub(struct imx51_ipuv
LIST_INIT(&sc->screens);
sc->iot = iot;
- sc->dma_tag = &imx_bus_dma_tag;
+ sc->dma_tag = &armv7_generic_dma_tag;
/* map controller registers */
error = bus_space_map(iot, IPU_CM_BASE, IPU_CM_SIZE, 0, &sc->cm_ioh);
Index: src/sys/arch/arm/imx/imx51var.h
diff -u src/sys/arch/arm/imx/imx51var.h:1.4 src/sys/arch/arm/imx/imx51var.h:1.5
--- src/sys/arch/arm/imx/imx51var.h:1.4 Mon Dec 21 04:26:28 2015
+++ src/sys/arch/arm/imx/imx51var.h Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51var.h,v 1.4 2015/12/21 04:26:28 hkenken Exp $ */
+/* $NetBSD: imx51var.h,v 1.5 2017/08/17 09:11:04 hkenken Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -46,6 +46,7 @@ void imx_genfb_set_videomode(device_t, u
extern struct bus_space armv7_generic_bs_tag;
extern struct bus_space armv7_generic_a4x_bs_tag;
+extern struct arm32_bus_dma_tag armv7_generic_dma_tag;
extern struct arm32_bus_dma_tag imx_bus_dma_tag;
void gpio_set_direction(uint32_t, uint32_t);
Index: src/sys/arch/arm/imx/imx6_usb.c
diff -u src/sys/arch/arm/imx/imx6_usb.c:1.1 src/sys/arch/arm/imx/imx6_usb.c:1.2
--- src/sys/arch/arm/imx/imx6_usb.c:1.1 Thu Sep 25 05:05:28 2014
+++ src/sys/arch/arm/imx/imx6_usb.c Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_usb.c,v 1.1 2014/09/25 05:05:28 ryo Exp $ */
+/* $NetBSD: imx6_usb.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $ */
/*
* Copyright (c) 2012 Genetec Corporation. All rights reserved.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.1 2014/09/25 05:05:28 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,7 @@ imxusbc_search(device_t parent, cfdata_t
sc = device_private(parent);
aa.aa_iot = sc->sc_iot;
aa.aa_ioh = sc->sc_ioh;
- aa.aa_dmat = &imx_bus_dma_tag;
+ aa.aa_dmat = &armv7_generic_dma_tag;
aa.aa_unit = cf->cf_loc[IMXUSBCCF_UNIT];
aa.aa_irq = cf->cf_loc[IMXUSBCCF_IRQ];
Index: src/sys/arch/arm/imx/imx7_axi.c
diff -u src/sys/arch/arm/imx/imx7_axi.c:1.1 src/sys/arch/arm/imx/imx7_axi.c:1.2
--- src/sys/arch/arm/imx/imx7_axi.c:1.1 Tue May 17 06:44:45 2016
+++ src/sys/arch/arm/imx/imx7_axi.c Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx7_axi.c,v 1.1 2016/05/17 06:44:45 ryo Exp $ */
+/* $NetBSD: imx7_axi.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu <r...@nerv.org>
@@ -27,10 +27,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_axi.c,v 1.1 2016/05/17 06:44:45 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_axi.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $");
#include "locators.h"
-#include "bus_dma_generic.h"
#include <sys/param.h>
#include <sys/bus.h>
@@ -75,9 +74,9 @@ axi_attach(device_t parent __unused, dev
aprint_naive("\n");
sc = device_private(self);
- sc->sc_iot = &imx_bs_tag;
+ sc->sc_iot = &armv7_generic_bs_tag;
#if NBUS_DMA_GENERIC > 0
- sc->sc_dmat = &imx_bus_dma_tag;
+ sc->sc_dmat = &armv7_generic_dma_tag;
#else
sc->sc_dmat = 0;
#endif
Index: src/sys/arch/arm/imx/imx7_usb.c
diff -u src/sys/arch/arm/imx/imx7_usb.c:1.1 src/sys/arch/arm/imx/imx7_usb.c:1.2
--- src/sys/arch/arm/imx/imx7_usb.c:1.1 Tue May 17 06:44:45 2016
+++ src/sys/arch/arm/imx/imx7_usb.c Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx7_usb.c,v 1.1 2016/05/17 06:44:45 ryo Exp $ */
+/* $NetBSD: imx7_usb.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $ */
/*
* Copyright (c) 2013 Genetec Corporation. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_usb.c,v 1.1 2016/05/17 06:44:45 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_usb.c,v 1.2 2017/08/17 09:11:04 hkenken Exp $");
#include "locators.h"
@@ -93,7 +93,7 @@ imx7_usbc_search(device_t parent, cfdata
sc = device_private(parent);
aa.aa_iot = sc->sc_iot;
aa.aa_ioh = sc->sc_ioh;
- aa.aa_dmat = &imx_bus_dma_tag;
+ aa.aa_dmat = &armv7_generic_dma_tag;;
aa.aa_unit = cf->cf_loc[IMXUSBCCF_UNIT];
aa.aa_irq = cf->cf_loc[IMXUSBCCF_IRQ];
Index: src/sys/arch/arm/imx/imx7var.h
diff -u src/sys/arch/arm/imx/imx7var.h:1.1 src/sys/arch/arm/imx/imx7var.h:1.2
--- src/sys/arch/arm/imx/imx7var.h:1.1 Tue May 17 06:44:45 2016
+++ src/sys/arch/arm/imx/imx7var.h Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx7var.h,v 1.1 2016/05/17 06:44:45 ryo Exp $ */
+/* $NetBSD: imx7var.h,v 1.2 2017/08/17 09:11:04 hkenken Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu <r...@nerv.org>
@@ -41,8 +41,8 @@ struct axi_attach_args {
int aa_irqbase;
};
-extern struct bus_space imx_bs_tag;
-extern struct arm32_bus_dma_tag imx_bus_dma_tag;
+extern struct bus_space armv7_generic_bs_tag;
+extern struct arm32_bus_dma_tag armv7_generic_dma_tag;
extern bus_space_tag_t imx7_armcore_bst;
extern bus_space_handle_t imx7_armcore_bsh;
Index: src/sys/arch/arm/imx/imx6var.h
diff -u src/sys/arch/arm/imx/imx6var.h:1.6 src/sys/arch/arm/imx/imx6var.h:1.7
--- src/sys/arch/arm/imx/imx6var.h:1.6 Fri Jun 9 18:14:59 2017
+++ src/sys/arch/arm/imx/imx6var.h Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6var.h,v 1.6 2017/06/09 18:14:59 ryo Exp $ */
+/* $NetBSD: imx6var.h,v 1.7 2017/08/17 09:11:04 hkenken Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu <r...@nerv.org>
@@ -42,7 +42,7 @@ struct axi_attach_args {
};
extern struct bus_space armv7_generic_bs_tag;
-extern struct arm32_bus_dma_tag imx_bus_dma_tag;
+extern struct arm32_bus_dma_tag armv7_generic_dma_tag;
extern bus_space_tag_t imx6_armcore_bst;
extern bus_space_handle_t imx6_armcore_bsh;
Index: src/sys/arch/evbarm/imx7/imx7_machdep.c
diff -u src/sys/arch/evbarm/imx7/imx7_machdep.c:1.4 src/sys/arch/evbarm/imx7/imx7_machdep.c:1.5
--- src/sys/arch/evbarm/imx7/imx7_machdep.c:1.4 Mon Oct 17 10:36:57 2016
+++ src/sys/arch/evbarm/imx7/imx7_machdep.c Thu Aug 17 09:11:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: imx7_machdep.c,v 1.4 2016/10/17 10:36:57 ryo Exp $ */
+/* $NetBSD: imx7_machdep.c,v 1.5 2017/08/17 09:11:04 hkenken Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.4 2016/10/17 10:36:57 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.5 2017/08/17 09:11:04 hkenken Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -305,7 +305,7 @@ consinit(void)
paddr_t consaddr;
consaddr = CONADDR;
- imxuart_cons_attach(&imx_bs_tag, consaddr, consrate, consmode);
+ imxuart_cons_attach(&armv7_generic_bs_tag, consaddr, consrate, consmode);
return;
}
# endif /* (NIMXUART > 0) && defined(IMXUARTCONSOLE) */
