Module Name: src
Committed By: jakllsch
Date: Fri Nov 20 16:44:23 UTC 2015
Modified Files:
src/sys/arch/evbarm/tegra: tegra_machdep.c
Log Message:
Fix up tegrausbphy attach args and stuff from previous.
>From jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 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/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.31 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.32
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.31 Thu Nov 19 22:09:16 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Fri Nov 20 16:44:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.31 2015/11/19 22:09:16 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.32 2015/11/20 16:44:23 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.31 2015/11/19 22:09:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.32 2015/11/20 16:44:23 jakllsch Exp $");
#include "opt_tegra.h"
#include "opt_machdep.h"
@@ -475,12 +475,11 @@ tegra_device_register(device_t self, voi
}
if (device_is_a(self, "tegrausbphy")) {
- struct tegraio_attach_args * const tio = aux;
- const struct tegra_locators * const loc = &tio->tio_loc;
+ struct tegrausbphy_attach_args * const tup = aux;
- if (loc->loc_port == 0) {
+ if (tup->tup_port == 0) {
prop_dictionary_set_cstring(dict, "vbus-gpio", "N4");
- } else if (loc->loc_port == 2) {
+ } else if (tup->tup_port == 2) {
prop_dictionary_set_cstring(dict, "vbus-gpio", "N5");
}
}
@@ -506,12 +505,11 @@ tegra_device_register(device_t self, voi
}
if (device_is_a(self, "tegrausbphy")) {
- struct tegraio_attach_args * const tio = aux;
- const struct tegra_locators * const loc = &tio->tio_loc;
+ struct tegrausbphy_attach_args * const tup = aux;
- if (loc->loc_port == 0) {
+ if (tup->tup_port == 0) {
prop_dictionary_set_cstring(dict, "vbus-gpio", "N4");
- } else if (loc->loc_port == 2) {
+ } else if (tup->tup_port == 2) {
prop_dictionary_set_cstring(dict, "vbus-gpio", "N5");
}
}
