CVS commit: src/sys/arch/arm/nvidia

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Fri May  8 17:00:51 UTC 2015

Modified Files:
        src/sys/arch/arm/nvidia: tegra_mpio.c

Log Message:
update PM field in set_config


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_mpio.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/tegra_mpio.c
diff -u src/sys/arch/arm/nvidia/tegra_mpio.c:1.1 src/sys/arch/arm/nvidia/tegra_mpio.c:1.2
--- src/sys/arch/arm/nvidia/tegra_mpio.c:1.1	Thu May  7 23:55:11 2015
+++ src/sys/arch/arm/nvidia/tegra_mpio.c	Fri May  8 17:00:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_mpio.c,v 1.1 2015/05/07 23:55:11 jmcneill Exp $ */
+/* $NetBSD: tegra_mpio.c,v 1.2 2015/05/08 17:00:51 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_mpio.c,v 1.1 2015/05/07 23:55:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_mpio.c,v 1.2 2015/05/08 17:00:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -439,7 +439,20 @@ void
 tegra_mpio_pinmux_set_config(u_int reg, int flags, const char *func)
 {
 	struct tegra_mpio_softc * const sc = tegra_mpio_lookup_softc();
+	const struct tegra_mpio_pinmux *pm;
 	uint32_t val;
+	int funcno, n;
+
+	pm = tegra_mpio_lookup_pinmux(reg);
+	KASSERT(pm != NULL);
+
+	for (n = 0, funcno = -1; n < __arraycount(pm->pm_func); n++) {
+		if (strcmp(pm->pm_func[n], func) == 0) {
+			funcno = n;
+			break;
+		}
+	}
+	KASSERT(funcno != -1);
 
 	val = MPIO_READ(sc, reg);
 
@@ -473,6 +486,9 @@ tegra_mpio_pinmux_set_config(u_int reg, 
 		val &= ~PINMUX_AUX_OD;
 	}
 
+	val &= ~PINMUX_AUX_PM;
+	val |= __SHIFTIN(funcno, PINMUX_AUX_PM);
+
 	MPIO_WRITE(sc, reg, val);
 }