Module Name: src
Committed By: jmcneill
Date: Thu Nov 19 22:09:16 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: files.tegra tegra_ehci.c tegra_io.c
tegra_pcie.c tegra_reg.h tegra_soc.c tegra_usbphy.c tegra_var.h
src/sys/arch/evbarm/conf: JETSONTK1
src/sys/arch/evbarm/tegra: tegra_machdep.c
Log Message:
Remove HOST1X and AHB_A2 from pmap_devmap
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/files.tegra
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_ehci.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra_io.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra_pcie.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/tegra_reg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_soc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_usbphy.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/nvidia/tegra_var.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/JETSONTK1
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/tegra/tegra_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/nvidia/files.tegra
diff -u src/sys/arch/arm/nvidia/files.tegra:1.21 src/sys/arch/arm/nvidia/files.tegra:1.22
--- src/sys/arch/arm/nvidia/files.tegra:1.21 Thu Nov 12 00:43:52 2015
+++ src/sys/arch/arm/nvidia/files.tegra Thu Nov 19 22:09:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.tegra,v 1.21 2015/11/12 00:43:52 jmcneill Exp $
+# $NetBSD: files.tegra,v 1.22 2015/11/19 22:09:16 jmcneill Exp $
#
# Configuration info for NVIDIA Tegra ARM Peripherals
#
@@ -72,12 +72,14 @@ attach tegrartc at tegraio with tegra_rt
file arch/arm/nvidia/tegra_rtc.c tegra_rtc
# USB PHY
+define tegrausbphybus { }
device tegrausbphy
-attach tegrausbphy at tegraio with tegra_usbphy
+attach tegrausbphy at tegrausbphybus with tegra_usbphy
file arch/arm/nvidia/tegra_usbphy.c tegra_usbphy
# USB 2.0
-attach ehci at tegraio with tegra_ehci
+device tegraehci: usbus, usbroothub, usb_dma, ehci, tegrausbphybus
+attach tegraehci at tegraio with tegra_ehci
file arch/arm/nvidia/tegra_ehci.c tegra_ehci
# SDMMC
Index: src/sys/arch/arm/nvidia/tegra_ehci.c
diff -u src/sys/arch/arm/nvidia/tegra_ehci.c:1.9 src/sys/arch/arm/nvidia/tegra_ehci.c:1.10
--- src/sys/arch/arm/nvidia/tegra_ehci.c:1.9 Wed Oct 21 20:02:12 2015
+++ src/sys/arch/arm/nvidia/tegra_ehci.c Thu Nov 19 22:09:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_ehci.c,v 1.9 2015/10/21 20:02:12 jmcneill Exp $ */
+/* $NetBSD: tegra_ehci.c,v 1.10 2015/11/19 22:09:16 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_ehci.c,v 1.9 2015/10/21 20:02:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_ehci.c,v 1.10 2015/11/19 22:09:16 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_ehci.c
#include <dev/usb/ehcireg.h>
#include <dev/usb/ehcivar.h>
+#include <arm/nvidia/tegra_reg.h>
#include <arm/nvidia/tegra_var.h>
#include <arm/nvidia/tegra_usbreg.h>
@@ -61,6 +62,8 @@ struct tegra_ehci_softc {
bus_space_handle_t sc_bsh;
void *sc_ih;
u_int sc_port;
+
+ device_t sc_usbphydev;
};
static int tegra_ehci_port_status(struct ehci_softc *sc, uint32_t v,
@@ -82,11 +85,16 @@ tegra_ehci_attach(device_t parent, devic
struct tegra_ehci_softc * const sc = device_private(self);
struct tegraio_attach_args * const tio = aux;
const struct tegra_locators * const loc = &tio->tio_loc;
+ struct tegrausbphy_attach_args tup;
int error;
sc->sc_bst = tio->tio_bst;
- bus_space_subregion(tio->tio_bst, tio->tio_bsh,
- loc->loc_offset, loc->loc_size, &sc->sc_bsh);
+ error = bus_space_map(sc->sc_bst, TEGRA_AHB_A2_BASE + loc->loc_offset,
+ loc->loc_size, 0, &sc->sc_bsh);
+ if (error) {
+ aprint_error(": couldn't map USB%d\n", loc->loc_port + 1);
+ return;
+ }
sc->sc_port = loc->loc_port;
sc->sc.sc_dev = self;
@@ -97,11 +105,10 @@ tegra_ehci_attach(device_t parent, devic
sc->sc.sc_flags = EHCIF_ETTF;
sc->sc.sc_id_vendor = 0x10de;
strlcpy(sc->sc.sc_vendor, "Tegra", sizeof(sc->sc.sc_vendor));
- sc->sc.sc_size = loc->loc_size;
- sc->sc.iot = tio->tio_bst;
- bus_space_subregion(tio->tio_bst, tio->tio_bsh,
- loc->loc_offset + TEGRA_EHCI_REG_OFFSET,
- loc->loc_size - TEGRA_EHCI_REG_OFFSET, &sc->sc.ioh);
+ sc->sc.sc_size = loc->loc_size - TEGRA_EHCI_REG_OFFSET;
+ sc->sc.iot = sc->sc_bst;
+ bus_space_subregion(sc->sc_bst, sc->sc_bsh, TEGRA_EHCI_REG_OFFSET,
+ sc->sc.sc_size, &sc->sc.ioh);
sc->sc.sc_vendor_init = tegra_ehci_init;
sc->sc.sc_vendor_port_status = tegra_ehci_port_status;
@@ -119,6 +126,11 @@ tegra_ehci_attach(device_t parent, devic
}
aprint_normal_dev(self, "interrupting on irq %d\n", loc->loc_intr);
+ tup.tup_bst = sc->sc_bst;
+ tup.tup_bsh = sc->sc_bsh;
+ tup.tup_port = sc->sc_port;
+ sc->sc_usbphydev = config_found_ia(self, "tegrausbphybus", &tup, NULL);
+
error = ehci_init(&sc->sc);
if (error != USBD_NORMAL_COMPLETION) {
aprint_error_dev(self, "init failed, error = %d\n", error);
Index: src/sys/arch/arm/nvidia/tegra_io.c
diff -u src/sys/arch/arm/nvidia/tegra_io.c:1.18 src/sys/arch/arm/nvidia/tegra_io.c:1.19
--- src/sys/arch/arm/nvidia/tegra_io.c:1.18 Wed Nov 18 17:12:06 2015
+++ src/sys/arch/arm/nvidia/tegra_io.c Thu Nov 19 22:09:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_io.c,v 1.18 2015/11/18 17:12:06 jakllsch Exp $ */
+/* $NetBSD: tegra_io.c,v 1.19 2015/11/19 22:09:16 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_tegra.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_io.c,v 1.18 2015/11/18 17:12:06 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_io.c,v 1.19 2015/11/19 22:09:16 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,17 +118,11 @@ static const struct tegra_locators tegra
};
static const struct tegra_locators tegra_ahb_a2_locators[] = {
- { "tegrausbphy",
- TEGRA_USB1_OFFSET, TEGRA_USB1_SIZE, 0, NOINTR },
- { "ehci",
+ { "tegraehci",
TEGRA_USB1_OFFSET, TEGRA_USB1_SIZE, 0, TEGRA_INTR_USB1 },
- { "tegrausbphy",
- TEGRA_USB2_OFFSET, TEGRA_USB2_SIZE, 1, NOINTR },
- { "ehci",
+ { "tegraehci",
TEGRA_USB2_OFFSET, TEGRA_USB2_SIZE, 1, TEGRA_INTR_USB2 },
- { "tegrausbphy",
- TEGRA_USB3_OFFSET, TEGRA_USB3_SIZE, 2, NOINTR },
- { "ehci",
+ { "tegraehci",
TEGRA_USB3_OFFSET, TEGRA_USB3_SIZE, 2, TEGRA_INTR_USB3 },
};
@@ -169,7 +163,7 @@ tegraio_attach(device_t parent, device_t
tegra_ppsb_locators, __arraycount(tegra_ppsb_locators));
tegraio_scan(self, tegra_apb_bsh,
tegra_apb_locators, __arraycount(tegra_apb_locators));
- tegraio_scan(self, tegra_ahb_a2_bsh,
+ tegraio_scan(self, (bus_space_handle_t)NULL,
tegra_ahb_a2_locators, __arraycount(tegra_ahb_a2_locators));
tegraio_scan(self, (bus_space_handle_t)NULL,
tegra_host1x_locators, __arraycount(tegra_host1x_locators));
@@ -192,8 +186,7 @@ tegraio_scan(device_t self, bus_space_ha
.tio_bst = &armv7_generic_bs_tag,
.tio_a4x_bst = &armv7_generic_a4x_bs_tag,
.tio_bsh = bsh,
- .tio_dmat = &tegra_dma_tag,
- .tio_coherent_dmat = &tegra_coherent_dma_tag,
+ .tio_dmat = &tegra_dma_tag
};
cfdata_t cf = config_search_ia(tegraio_find, self,
"tegraio", &tio);
Index: src/sys/arch/arm/nvidia/tegra_pcie.c
diff -u src/sys/arch/arm/nvidia/tegra_pcie.c:1.12 src/sys/arch/arm/nvidia/tegra_pcie.c:1.13
--- src/sys/arch/arm/nvidia/tegra_pcie.c:1.12 Tue Nov 17 22:01:39 2015
+++ src/sys/arch/arm/nvidia/tegra_pcie.c Thu Nov 19 22:09:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pcie.c,v 1.12 2015/11/17 22:01:39 jakllsch Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.13 2015/11/19 22:09:16 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.12 2015/11/17 22:01:39 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.13 2015/11/19 22:09:16 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -133,11 +133,7 @@ tegra_pcie_attach(device_t parent, devic
int error;
sc->sc_dev = self;
-#if notyet
- sc->sc_dmat = tio->tio_coherent_dmat;
-#else
sc->sc_dmat = tio->tio_dmat;
-#endif
sc->sc_bst = tio->tio_bst;
sc->sc_intr = loc->loc_intr;
if (bus_space_map(sc->sc_bst, TEGRA_PCIE_AFI_BASE, TEGRA_PCIE_AFI_SIZE,
Index: src/sys/arch/arm/nvidia/tegra_reg.h
diff -u src/sys/arch/arm/nvidia/tegra_reg.h:1.17 src/sys/arch/arm/nvidia/tegra_reg.h:1.18
--- src/sys/arch/arm/nvidia/tegra_reg.h:1.17 Sat Nov 14 03:44:52 2015
+++ src/sys/arch/arm/nvidia/tegra_reg.h Thu Nov 19 22:09:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_reg.h,v 1.17 2015/11/14 03:44:52 jakllsch Exp $ */
+/* $NetBSD: tegra_reg.h,v 1.18 2015/11/19 22:09:16 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -72,10 +72,8 @@
#define TEGRA_AHB_A2_BASE 0x7c000000
#define TEGRA_AHB_A2_SIZE 0x02000000
-#define TEGRA_HOST1X_VBASE 0xfaf00000
-#define TEGRA_PPSB_VBASE 0xfb000000
-#define TEGRA_APB_VBASE 0xfc000000
-#define TEGRA_AHB_A2_VBASE 0xfd000000
+#define TEGRA_PPSB_VBASE 0xfd000000
+#define TEGRA_APB_VBASE 0xfe000000
#define TEGRA_REF_FREQ 12000000
Index: src/sys/arch/arm/nvidia/tegra_soc.c
diff -u src/sys/arch/arm/nvidia/tegra_soc.c:1.6 src/sys/arch/arm/nvidia/tegra_soc.c:1.7
--- src/sys/arch/arm/nvidia/tegra_soc.c:1.6 Wed May 13 11:06:13 2015
+++ src/sys/arch/arm/nvidia/tegra_soc.c Thu Nov 19 22:09:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_soc.c,v 1.6 2015/05/13 11:06:13 jmcneill Exp $ */
+/* $NetBSD: tegra_soc.c,v 1.7 2015/11/19 22:09:16 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_soc.c,v 1.6 2015/05/13 11:06:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_soc.c,v 1.7 2015/11/19 22:09:16 jmcneill Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -48,10 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_soc.c,
#include <arm/nvidia/tegra_mcreg.h>
#include <arm/nvidia/tegra_var.h>
-bus_space_handle_t tegra_host1x_bsh;
bus_space_handle_t tegra_ppsb_bsh;
bus_space_handle_t tegra_apb_bsh;
-bus_space_handle_t tegra_ahb_a2_bsh;
struct arm32_bus_dma_tag tegra_dma_tag = {
_BUS_DMAMAP_FUNCS,
@@ -59,32 +57,12 @@ struct arm32_bus_dma_tag tegra_dma_tag =
_BUS_DMATAG_FUNCS,
};
-static struct arm32_dma_range tegra_coherent_dma_ranges[] = {
- [0] = {
- .dr_sysbase = TEGRA_EXTMEM_BASE,
- .dr_busbase = TEGRA_EXTMEM_BASE,
- .dr_flags = _BUS_DMAMAP_COHERENT,
- },
-};
-
-struct arm32_bus_dma_tag tegra_coherent_dma_tag = {
- ._ranges = tegra_coherent_dma_ranges,
- ._nranges = __arraycount(tegra_coherent_dma_ranges),
- _BUS_DMAMAP_FUNCS,
- _BUS_DMAMEM_FUNCS,
- _BUS_DMATAG_FUNCS,
-};
-
static void tegra_mpinit(void);
void
tegra_bootstrap(void)
{
if (bus_space_map(&armv7_generic_bs_tag,
- TEGRA_HOST1X_BASE, TEGRA_HOST1X_SIZE, 0,
- &tegra_host1x_bsh) != 0)
- panic("couldn't map HOST1X");
- if (bus_space_map(&armv7_generic_bs_tag,
TEGRA_PPSB_BASE, TEGRA_PPSB_SIZE, 0,
&tegra_ppsb_bsh) != 0)
panic("couldn't map PPSB");
@@ -92,10 +70,6 @@ tegra_bootstrap(void)
TEGRA_APB_BASE, TEGRA_APB_SIZE, 0,
&tegra_apb_bsh) != 0)
panic("couldn't map APB");
- if (bus_space_map(&armv7_generic_bs_tag,
- TEGRA_AHB_A2_BASE, TEGRA_AHB_A2_SIZE, 0,
- &tegra_ahb_a2_bsh) != 0)
- panic("couldn't map AHB A2");
curcpu()->ci_data.cpu_cc_freq = tegra_car_pllx_rate();
@@ -105,7 +79,6 @@ tegra_bootstrap(void)
void
tegra_dma_bootstrap(psize_t psize)
{
- tegra_coherent_dma_ranges[0].dr_len = psize;
}
void
Index: src/sys/arch/arm/nvidia/tegra_usbphy.c
diff -u src/sys/arch/arm/nvidia/tegra_usbphy.c:1.1 src/sys/arch/arm/nvidia/tegra_usbphy.c:1.2
--- src/sys/arch/arm/nvidia/tegra_usbphy.c:1.1 Wed Oct 21 20:02:12 2015
+++ src/sys/arch/arm/nvidia/tegra_usbphy.c Thu Nov 19 22:09:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_usbphy.c,v 1.1 2015/10/21 20:02:12 jmcneill Exp $ */
+/* $NetBSD: tegra_usbphy.c,v 1.2 2015/11/19 22:09:16 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_usbphy.c,v 1.1 2015/10/21 20:02:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_usbphy.c,v 1.2 2015/11/19 22:09:16 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -79,19 +79,17 @@ static void
tegra_usbphy_attach(device_t parent, device_t self, void *aux)
{
struct tegra_usbphy_softc * const sc = device_private(self);
- struct tegraio_attach_args * const tio = aux;
- const struct tegra_locators * const loc = &tio->tio_loc;
+ struct tegrausbphy_attach_args * const tup = aux;
prop_dictionary_t prop = device_properties(self);
const char *pin;
sc->sc_dev = self;
- sc->sc_bst = tio->tio_bst;
- bus_space_subregion(tio->tio_bst, tio->tio_bsh,
- loc->loc_offset, loc->loc_size, &sc->sc_bsh);
- sc->sc_port = loc->loc_port;
+ sc->sc_bst = tup->tup_bst;
+ sc->sc_bsh = tup->tup_bsh;
+ sc->sc_port = tup->tup_port;
aprint_naive("\n");
- aprint_normal(": USB PHY%d\n", loc->loc_port + 1);
+ aprint_normal(": USB PHY%d\n", sc->sc_port + 1);
if (tegra_usbphy_parse_properties(sc) != 0)
return;
Index: src/sys/arch/arm/nvidia/tegra_var.h
diff -u src/sys/arch/arm/nvidia/tegra_var.h:1.25 src/sys/arch/arm/nvidia/tegra_var.h:1.26
--- src/sys/arch/arm/nvidia/tegra_var.h:1.25 Sat Oct 17 21:16:09 2015
+++ src/sys/arch/arm/nvidia/tegra_var.h Thu Nov 19 22:09:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_var.h,v 1.25 2015/10/17 21:16:09 jmcneill Exp $ */
+/* $NetBSD: tegra_var.h,v 1.26 2015/11/19 22:09:16 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -50,7 +50,6 @@ struct tegraio_attach_args {
bus_space_tag_t tio_a4x_bst;
bus_space_handle_t tio_bsh;
bus_dma_tag_t tio_dmat;
- bus_dma_tag_t tio_coherent_dmat;
};
struct tegrafb_attach_args {
@@ -65,14 +64,17 @@ struct tegrafb_attach_args {
device_t tfb_outputdev;
};
+struct tegrausbphy_attach_args {
+ bus_space_tag_t tup_bst;
+ bus_space_handle_t tup_bsh;
+ u_int tup_port;
+};
+
extern struct bus_space armv7_generic_bs_tag;
extern struct bus_space armv7_generic_a4x_bs_tag;
-extern bus_space_handle_t tegra_host1x_bsh;
extern bus_space_handle_t tegra_ppsb_bsh;
extern bus_space_handle_t tegra_apb_bsh;
-extern bus_space_handle_t tegra_ahb_a2_bsh;
extern struct arm32_bus_dma_tag tegra_dma_tag;
-extern struct arm32_bus_dma_tag tegra_coherent_dma_tag;
#define CHIP_ID_TEGRA20 0x20
#define CHIP_ID_TEGRA30 0x30
Index: src/sys/arch/evbarm/conf/JETSONTK1
diff -u src/sys/arch/evbarm/conf/JETSONTK1:1.38 src/sys/arch/evbarm/conf/JETSONTK1:1.39
--- src/sys/arch/evbarm/conf/JETSONTK1:1.38 Wed Nov 18 18:04:45 2015
+++ src/sys/arch/evbarm/conf/JETSONTK1 Thu Nov 19 22:09:16 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: JETSONTK1,v 1.38 2015/11/18 18:04:45 jakllsch Exp $
+# $NetBSD: JETSONTK1,v 1.39 2015/11/19 22:09:16 jmcneill Exp $
#
# NVIDIA Jetson TK1 - Tegra K1 development kit
# https://developer.nvidia.com/jetson-tk1
@@ -154,13 +154,11 @@ pseudo-device wsfont
#nouveau0 at tegraio? # GPU
# USB 2.0
-tegrausbphy0 at tegraio? port 0 # USB PHY1
-tegrausbphy1 at tegraio? port 1 # USB PHY2
-tegrausbphy2 at tegraio? port 2 # USB PHY3
-ehci0 at tegraio? port 0 # USB1
-ehci1 at tegraio? port 1 # USB2
-ehci2 at tegraio? port 2 # USB3
-usb* at ehci?
+tegraehci0 at tegraio? port 0 # USB1
+tegraehci1 at tegraio? port 1 # USB2
+tegraehci2 at tegraio? port 2 # USB3
+tegrausbphy* at tegrausbphybus? # USB PHY
+usb* at tegraehci?
include "dev/usb/usbdevices.config"
midi* at midibus?
Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.30 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.31
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.30 Sat Nov 14 23:32:31 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Thu Nov 19 22:09:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.30 2015/11/14 23:32:31 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.31 2015/11/19 22:09:16 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.30 2015/11/14 23:32:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.31 2015/11/19 22:09:16 jmcneill Exp $");
#include "opt_tegra.h"
#include "opt_machdep.h"
@@ -118,13 +118,6 @@ bs_protos(bs_notimpl);
static const struct pmap_devmap devmap[] = {
{
- .pd_va = _A(TEGRA_HOST1X_VBASE),
- .pd_pa = _A(TEGRA_HOST1X_BASE),
- .pd_size = _S(TEGRA_HOST1X_SIZE),
- .pd_prot = VM_PROT_READ|VM_PROT_WRITE,
- .pd_cache = PTE_NOCACHE
- },
- {
.pd_va = _A(TEGRA_PPSB_VBASE),
.pd_pa = _A(TEGRA_PPSB_BASE),
.pd_size = _S(TEGRA_PPSB_SIZE),
@@ -138,13 +131,6 @@ static const struct pmap_devmap devmap[]
.pd_prot = VM_PROT_READ|VM_PROT_WRITE,
.pd_cache = PTE_NOCACHE
},
- {
- .pd_va = _A(TEGRA_AHB_A2_VBASE),
- .pd_pa = _A(TEGRA_AHB_A2_BASE),
- .pd_size = _S(TEGRA_AHB_A2_SIZE),
- .pd_prot = VM_PROT_READ|VM_PROT_WRITE,
- .pd_cache = PTE_NOCACHE
- },
{0}
};
