CVS commit: src/sys/dev/i2c

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Sun Oct 22 11:00:28 UTC 2017

Modified Files:
        src/sys/dev/i2c: axp20x.c

Log Message:
AXP209 isn't an SMBus device, so don't use iic_smbus_* APIs.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/i2c/axp20x.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/dev/i2c/axp20x.c
diff -u src/sys/dev/i2c/axp20x.c:1.9 src/sys/dev/i2c/axp20x.c:1.10
--- src/sys/dev/i2c/axp20x.c:1.9	Mon Oct  9 14:52:43 2017
+++ src/sys/dev/i2c/axp20x.c	Sun Oct 22 11:00:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: axp20x.c,v 1.9 2017/10/09 14:52:43 jmcneill Exp $ */
+/* $NetBSD: axp20x.c,v 1.10 2017/10/22 11:00:28 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
 #include "opt_fdt.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.9 2017/10/09 14:52:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.10 2017/10/22 11:00:28 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -563,8 +563,8 @@ axp20x_read(struct axp20x_softc *sc, uin
 {
 	int ret;
 	iic_acquire_bus(sc->sc_i2c, flags);
-	ret =  iic_smbus_block_read(sc->sc_i2c, sc->sc_addr,
-	    reg, val, len, flags);
+	ret = iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_addr,
+	    &reg, 1, val, len, flags);
 	iic_release_bus(sc->sc_i2c, flags);
 	return ret;
 
@@ -576,8 +576,8 @@ axp20x_write(struct axp20x_softc *sc, ui
 {
 	int ret;
 	iic_acquire_bus(sc->sc_i2c, flags);
-	ret = iic_smbus_block_write(sc->sc_i2c, sc->sc_addr,
-	    reg, val, len, flags);
+	ret = iic_exec(sc->sc_i2c, I2C_OP_WRITE_WITH_STOP, sc->sc_addr,
+	    &reg, 1, val, len, flags);
 	iic_release_bus(sc->sc_i2c, flags);
 	return ret;
 }