Tue Oct 8 21:16:11 2019 UTC ()

enable FDT direct configuration.
remove address test as the i2c address can be changed on this device.


(kardel)

diff -r1.8 -r1.9 src/sys/dev/i2c/hytp14.c

--- src/sys/dev/i2c/hytp14.c 2018/06/16 21:24:36	1.8
+++ src/sys/dev/i2c/hytp14.c 2019/10/08 21:16:11	1.9

 @@ -26,28 +26,52 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * IST-AG P14 calibrated Hygro-/Temperature sensor module
  * Devices: HYT-271, HYT-221 and HYT-939
+ *
  * see:
  * http://www.ist-ag.com/eh/ist-ag/resource.nsf/imgref/Download_AHHYTM_E2.1.pdf/
  *      $FILE/AHHYTM_E2.1.pdf
  */
 /*
  * FDT direct configuration fragment to be added to i2cX definition in dtsi file
  * like in bcm2835-rpi.dtsi or another specific file.
+ *
  * &i2c1 {
  *         pinctrl-names = "default";
  *         pinctrl-0 = <&i2c1_gpio2>;
  *         status = "okay";
  *         clock-frequency = <100000>;
  *         #address-cells = <1>;
  *         #size-cells = <0>;
  *         hythygtemp@28 {
  *                         compatible = "ist-ag,i2c-hytp14";
  *                         reg = <0x28>;
  *                         status = "okay";
  *         };
  *         hythygtemp@29 {
  *                         compatible = "ist-ag,i2c-hytp14";
  *                         reg = <0x29>;
  *                         status = "okay";
  *         };
  * };
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.8 2018/06/16 21:24:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.9 2019/10/08 21:16:11 kardel Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/kthread.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/i2c/i2cvar.h>
 @@ -85,49 +109,50 @@ CFATTACH_DECL_NEW(hythygtemp, sizeof(str
 static struct hytp14_sensor hytp14_sensors[] = {
+	{
 		.desc = "humidity",
 		.type = ENVSYS_SRELHUMIDITY,
 		.refresh = hytp14_refresh_humidity
 	},
+	{
 		.desc = "temperature",
 		.type = ENVSYS_STEMP,
 		.refresh = hytp14_refresh_temp
+	}
 };
 static const struct device_compatible_entry compat_data[] = {
         { "i2c-hytp14",                   0 },
         { NULL,                           0 }
 };
 static int
 hytp14_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct i2c_attach_args *ia = aux;
 	int match_result;
-	if (iic_use_direct_match(ia, match, NULL, &match_result))
+	if (iic_use_direct_match(ia, match, compat_data, &match_result))
 		return match_result;
 	if (ia->ia_addr == 0x28)
 		return I2C_MATCH_ADDRESS_ONLY;
 	/*
-	 * XXXJRT
+	 * This device can be reprogrammed to use a different
-	 * This device is an odd-ball; the i2c address can be changed
+	 * I2C address, thus checking for specific addresses
-	 * at run-time using a command sequence documented in the
+	 * is not helpful here.
-	 * application note, but the timing is critical (within 10ms
+         * reprogramming is done via setting new values in
-	 * after power-on of the device), and the device always starts
+         * the device EEPROM via the hytctl utility and
-	 * up at address 0x28.
+	 * a special GPIO setup - see hythygtemp(4) for more
 	 * information.
 	 * How should we handle this?
 	 */
-	return 0;
+	return I2C_MATCH_ADDRESS_ONLY;
+}
 static void
 hytp14_attach(device_t parent, device_t self, void *aux)
+{
 	const struct sysctlnode *rnode, *node;
 	struct hytp14_sc *sc;
 	struct i2c_attach_args *ia;
 	int i, rv;
 	ia = aux;
 	sc = device_private(self);