Module Name: src
Committed By: kiyohara
Date: Sun Jul 3 11:40:58 UTC 2016
Modified Files:
src/sys/arch/evbarm/beagle: beagle_machdep.c
src/sys/dev/i2c: files.i2c
Log Message:
Add 'needs-flag' to tps65217pmic.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/i2c/files.i2c
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/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.63 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.64
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.63 Sun Jul 3 11:25:27 2016
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Sun Jul 3 11:40:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.63 2016/07/03 11:25:27 kiyohara Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.64 2016/07/03 11:40:58 kiyohara Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.63 2016/07/03 11:25:27 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.64 2016/07/03 11:40:58 kiyohara Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -141,6 +141,7 @@ __KERNEL_RCSID(0, "$NetBSD: beagle_machd
#include "sdhc.h"
#include "ukbd.h"
#include "arml2cc.h"
+#include "tps65217pmic.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -1125,10 +1126,15 @@ beagle_device_register(device_t self, vo
int
set_mpu_volt(int mvolt)
{
+
+#if NTPS65217PMIC > 0
if (pmic_dev == NULL)
return ENODEV;
/* MPU voltage is on vdcd2 */
return tps65217pmic_set_volt(pmic_dev, "DCDC2", mvolt);
+#else
+ return -1;
+#endif
}
#endif
Index: src/sys/dev/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.71 src/sys/dev/i2c/files.i2c:1.72
--- src/sys/dev/i2c/files.i2c:1.71 Mon Jun 20 04:18:12 2016
+++ src/sys/dev/i2c/files.i2c Sun Jul 3 11:40:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.71 2016/06/20 04:18:12 pgoyette Exp $
+# $NetBSD: files.i2c,v 1.72 2016/07/03 11:40:58 kiyohara Exp $
obsolete defflag opt_i2cbus.h I2C_SCAN
define i2cbus { }
@@ -204,7 +204,7 @@ file dev/i2c/tps65950.c tps65950pm
# TI TPS65217
device tps65217pmic: sysmon_envsys
attach tps65217pmic at iic
-file dev/i2c/tps65217pmic.c tps65217pmic
+file dev/i2c/tps65217pmic.c tps65217pmic needs-flag
# Microchip MCP980x
device mcp980x: sysmon_envsys
