[src/trunk]: src/sys/arch/evbarm/tegra Fix up tegrausbphy attach args and stu...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/361890bd3d97
branches:  trunk
changeset: 341735:361890bd3d97
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Nov 20 16:44:23 2015 +0000

description:
Fix up tegrausbphy attach args and stuff from previous.

>From jmcneill.

diffstat:

 sys/arch/evbarm/tegra/tegra_machdep.c |  18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diffs (50 lines):

diff -r d2e98d8bf846 -r 361890bd3d97 sys/arch/evbarm/tegra/tegra_machdep.c
--- a/sys/arch/evbarm/tegra/tegra_machdep.c     Fri Nov 20 14:56:56 2015 +0000
+++ b/sys/arch/evbarm/tegra/tegra_machdep.c     Fri Nov 20 16:44:23 2015 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
        }
 
        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 @@
        }
 
        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");
                }
        }