Module Name: src
Committed By: jmcneill
Date: Mon Jan 5 21:35:54 UTC 2015
Modified Files:
src/sys/arch/arm/rockchip: obio.c rockchip_var.h
Log Message:
add GRF bus space handle to obio_attach_args, from FUKAUMI Naoki
<f...@naobsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/rockchip/obio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/rockchip/rockchip_var.h
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/rockchip/obio.c
diff -u src/sys/arch/arm/rockchip/obio.c:1.14 src/sys/arch/arm/rockchip/obio.c:1.15
--- src/sys/arch/arm/rockchip/obio.c:1.14 Sun Jan 4 16:31:58 2015
+++ src/sys/arch/arm/rockchip/obio.c Mon Jan 5 21:35:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.14 2015/01/04 16:31:58 jmcneill Exp $ */
+/* $NetBSD: obio.c,v 1.15 2015/01/05 21:35:53 jmcneill Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "opt_rockchip.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.14 2015/01/04 16:31:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.15 2015/01/05 21:35:53 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -158,6 +158,9 @@ obio_search(device_t parent, cfdata_t cf
obio.obio_port = cf->cf_loc[OBIOCF_PORT];
obio.obio_dmat = &rockchip_bus_dma_tag;
+ bus_space_subregion(&rockchip_bs_tag, rockchip_core1_bsh,
+ ROCKCHIP_GRF_OFFSET, ROCKCHIP_GRF_SIZE, &obio.obio_grf_bsh);
+
switch (cf->cf_loc[OBIOCF_MULT]) {
case 1:
obio.obio_bst = &rockchip_bs_tag;
Index: src/sys/arch/arm/rockchip/rockchip_var.h
diff -u src/sys/arch/arm/rockchip/rockchip_var.h:1.10 src/sys/arch/arm/rockchip/rockchip_var.h:1.11
--- src/sys/arch/arm/rockchip/rockchip_var.h:1.10 Sun Jan 4 11:52:45 2015
+++ src/sys/arch/arm/rockchip/rockchip_var.h Mon Jan 5 21:35:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_var.h,v 1.10 2015/01/04 11:52:45 jmcneill Exp $ */
+/* $NetBSD: rockchip_var.h,v 1.11 2015/01/05 21:35:53 jmcneill Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -40,6 +40,7 @@
struct obio_attach_args {
bus_space_tag_t obio_bst; /* bus space tag */
bus_space_handle_t obio_bsh; /* bus space handle */
+ bus_space_handle_t obio_grf_bsh; /* GRF bus space handle */
bus_addr_t obio_base; /* base address of handle */
bus_addr_t obio_offset; /* address of device */
bus_size_t obio_size; /* size of device */
