[src/trunk]: src/sys/arch/arm/nvidia Use the nvidia, has-utmi-pad-registers pr...

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

details:   https://anonhg.NetBSD.org/src/rev/8a661f7f6cb8
branches:  trunk
changeset: 814122:8a661f7f6cb8
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Mar 08 07:49:20 2016 +0000

description:
Use the nvidia,has-utmi-pad-registers property.

>From Jared.

diffstat:

 sys/arch/arm/nvidia/tegra_usbphy.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 92647be015e1 -r 8a661f7f6cb8 sys/arch/arm/nvidia/tegra_usbphy.c
--- a/sys/arch/arm/nvidia/tegra_usbphy.c        Tue Mar 08 05:02:55 2016 +0000
+++ b/sys/arch/arm/nvidia/tegra_usbphy.c        Tue Mar 08 07:49:20 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_usbphy.c,v 1.5 2015/12/22 22:10:36 jmcneill Exp $ */
+/* $NetBSD: tegra_usbphy.c,v 1.6 2016/03/08 07:49:20 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_usbphy.c,v 1.5 2015/12/22 22:10:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_usbphy.c,v 1.6 2016/03/08 07:49:20 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -192,7 +192,6 @@
 static void
 tegra_usbphy_utmip_init(struct tegra_usbphy_softc *sc)
 {
-       static u_int init_count = 0;
        bus_space_tag_t bst = sc->sc_bst;
        bus_space_handle_t bsh = sc->sc_bsh;
        int retry;
@@ -230,7 +229,7 @@
                      TEGRA_EHCI_UTMIP_XCVR_CFG1_TERM_RANGE_ADJ),
            TEGRA_EHCI_UTMIP_XCVR_CFG1_TERM_RANGE_ADJ);
 
-       if (atomic_inc_uint_nv(&init_count) == 1) {
+       if (of_getprop_bool(sc->sc_phandle, "nvidia,has-utmi-pad-registers")) {
                tegra_reg_set_clear(bst, bsh, TEGRA_EHCI_UTMIP_BIAS_CFG0_REG,
                    TEGRA_EHCI_UTMIP_BIAS_CFG0_HSDISCON_LEVEL_MSB |
                    __SHIFTIN(sc->sc_hsdiscon_level,