svn commit: r354300 - head/sys/dev/ichiic

Vladimir Kondratyev wulf at FreeBSD.org
Sun Nov 3 20:50:07 UTC 2019


Author: wulf
Date: Sun Nov  3 20:50:06 2019
New Revision: 354300
URL: https://svnweb.freebsd.org/changeset/base/354300

Log:
  [ig4] disable controller before initialization of clock counters
  
  It is required by controller specifications.

Modified:
  head/sys/dev/ichiic/ig4_iic.c

Modified: head/sys/dev/ichiic/ig4_iic.c
==============================================================================
--- head/sys/dev/ichiic/ig4_iic.c	Sun Nov  3 20:49:04 2019	(r354299)
+++ head/sys/dev/ichiic/ig4_iic.c	Sun Nov  3 20:50:06 2019	(r354300)
@@ -531,6 +531,13 @@ ig4iic_attach(ig4iic_softc_t *sc)
 			goto done;
 		}
 	}
+
+	if (set_controller(sc, 0)) {
+		device_printf(sc->dev, "controller error during attach-1\n");
+		error = ENXIO;
+		goto done;
+	}
+
 	v = reg_read(sc, IG4_REG_SS_SCL_HCNT);
 	v = reg_read(sc, IG4_REG_SS_SCL_LCNT);
 	v = reg_read(sc, IG4_REG_FS_SCL_HCNT);
@@ -595,11 +602,6 @@ ig4iic_attach(ig4iic_softc_t *sc)
 	}
 #endif
 
-	if (set_controller(sc, 0)) {
-		device_printf(sc->dev, "controller error during attach-1\n");
-		error = ENXIO;
-		goto done;
-	}
 	if (set_controller(sc, IG4_I2C_ENABLE)) {
 		device_printf(sc->dev, "controller error during attach-2\n");
 		error = ENXIO;


More information about the svn-src-head mailing list