[src/trunk]: src/sys/arch/evbarm/awin usb0drv is >PB9 for cubie2

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

details:   https://anonhg.NetBSD.org/src/rev/fccbfc3e3749
branches:  trunk
changeset: 332254:fccbfc3e3749
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Sep 13 01:36:07 2014 +0000

description:
usb0drv is >PB9 for cubie2

diffstat:

 sys/arch/evbarm/awin/awin_machdep.c |  15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 937c6288e312 -r fccbfc3e3749 sys/arch/evbarm/awin/awin_machdep.c
--- a/sys/arch/evbarm/awin/awin_machdep.c       Sat Sep 13 01:11:58 2014 +0000
+++ b/sys/arch/evbarm/awin/awin_machdep.c       Sat Sep 13 01:36:07 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: awin_machdep.c,v 1.8 2014/09/10 07:39:17 skrll Exp $ */
+/*     $NetBSD: awin_machdep.c,v 1.9 2014/09/13 01:36:07 jmcneill Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.8 2014/09/10 07:39:17 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.9 2014/09/13 01:36:07 jmcneill Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -591,8 +591,15 @@
                 */
                prop_dictionary_set_cstring(dict, "satapwren",
                    (cubietruck_p ? ">PH12" : ">PB8"));
-               prop_dictionary_set_cstring(dict, "usb0drv",
-                   (cubietruck_p ? ">PH17" : ">PB2"));
+#if AWIN_BOARD == AWIN_cubieboard || AWIN_board == AWIN_cubietruck
+               if (cubietruck_p) {
+                       prop_dictionary_set_cstring(dict, "usb0drv", ">PH17");
+               } else if (awin_chip_id() == AWIN_CHIP_ID_A20) {
+                       prop_dictionary_set_cstring(dict, "usb0drv", ">PB9");
+               } else {
+                       prop_dictionary_set_cstring(dict, "usb0drv", ">PB2");
+               }
+#endif
                prop_dictionary_set_cstring(dict, "usb2drv", ">PH3");
                prop_dictionary_set_cstring(dict, "usb0iddet",
                    (cubietruck_p ? "<PH19" : "<PH4"));