 @@ -1,14 +1,14 @@
-/* $NetBSD: as3722.c,v 1.9 2017/04/22 23:50:13 jmcneill Exp $ */
+/* $NetBSD: as3722.c,v 1.10 2017/04/29 19:56:59 jakllsch Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,77 +19,82 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_fdt.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.9 2017/04/22 23:50:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.10 2017/04/29 19:56:59 jakllsch Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/wdog.h>
 #include <dev/clock_subr.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/as3722.h>
 #ifdef FDT
 #include <dev/fdt/fdtvar.h>
 #endif
 #define AS3722_START_YEAR		2000
 #define AS3722_SD0_VOLTAGE_REG		0x00
 #define AS3722_SD4_VOLTAGE_REG		0x04
 #define AS3722_GPIO0_CTRL_REG		0x08
 #define AS3722_GPIO0_CTRL_INVERT	__BIT(7)
 #define AS3722_GPIO0_CTRL_IOSF		__BITS(6,3)
 #define AS3722_GPIO0_CTRL_IOSF_GPIO	0
 #define AS3722_GPIO0_CTRL_IOSF_WATCHDOG	9
 #define AS3722_GPIO0_CTRL_MODE		__BITS(2,0)
 #define AS3722_GPIO0_CTRL_MODE_PULLDOWN	5
 #define AS3722_LDO6_VOLTAGE_REG		0x16
 #define AS3722_RESET_CTRL_REG		0x36
 #define AS3722_RESET_CTRL_POWER_OFF	__BIT(1)
 #define AS3722_RESET_CTRL_FORCE_RESET	__BIT(0)
 #define AS3722_WATCHDOG_CTRL_REG	0x38
 #define AS3722_WATCHDOG_CTRL_MODE	__BITS(2,1)
 #define AS3722_WATCHDOG_CTRL_ON		__BIT(0)
 #define AS3722_WATCHDOG_TIMER_REG	0x46
 #define AS3722_WATCHDOG_TIMER_TIMER	__BITS(6,0)
 #define AS3722_WATCHDOG_SIGNAL_REG	0x48
 #define AS3722_WATCHDOG_SIGNAL_PWM_DIV	__BITS(7,6)
 #define AS3722_WATCHDOG_SIGNAL_SW_SIG	__BIT(0)
 #define AS3722_SDCONTROL_REG		0x4d
 #define AS3722_SDCONTROL_SD4_ENABLE	__BIT(4)
 #define AS3722_LDOCONTROL0_REG		0x4e
 #define AS3722_RTC_CONTROL_REG		0x60
 #define AS3722_RTC_CONTROL_RTC_ON	__BIT(2)
 #define AS3722_RTC_SECOND_REG		0x61
 #define AS3722_RTC_MINUTE_REG		0x62
 #define AS3722_RTC_HOUR_REG		0x63
 #define AS3722_RTC_DAY_REG		0x64
 #define AS3722_RTC_MONTH_REG		0x65
 #define AS3722_RTC_YEAR_REG		0x66
 #define AS3722_RTC_ACCESS_REG		0x6f
 @@ -99,43 +104,52 @@ __KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1
 struct as3722_softc {
 	device_t	sc_dev;
 	i2c_tag_t	sc_i2c;
 	i2c_addr_t	sc_addr;
 	int		sc_phandle;
 	struct sysmon_wdog sc_smw;
 	struct todr_chip_handle sc_todr;
 };
 #ifdef FDT
 static int	as3722reg_set_voltage_sd0(device_t, u_int, u_int);
 static int	as3722reg_get_voltage_sd0(device_t, u_int *);
 static int	as3722reg_set_voltage_sd4(device_t, u_int, u_int);
 static int	as3722reg_get_voltage_sd4(device_t, u_int *);
 static int	as3722reg_set_voltage_ldo(device_t, u_int, u_int);
 static int	as3722reg_get_voltage_ldo(device_t, u_int *);
 static const struct as3722regdef {
 	const char	*name;
 	u_int		vsel_reg;
 	u_int		vsel_mask;
 	u_int		enable_reg;
 	u_int		enable_mask;
 	int		(*set)(device_t, u_int, u_int);
 	int		(*get)(device_t, u_int *);
 } as3722regdefs[] = {
 	{ .name = "sd0",
 	  .vsel_reg = AS3722_SD0_VOLTAGE_REG,
 	  .vsel_mask = 0x7f,
 	  .set = as3722reg_set_voltage_sd0,
 	  .get = as3722reg_get_voltage_sd0 },
 	{ .name = "sd4",
 	  .vsel_reg = AS3722_SD4_VOLTAGE_REG,
 	  .vsel_mask = 0x7f,
 	  .enable_reg = AS3722_SDCONTROL_REG,
 	  .enable_mask = AS3722_SDCONTROL_SD4_ENABLE,
 	  .set = as3722reg_set_voltage_sd4,
 	  .get = as3722reg_get_voltage_sd4 },
 	{ .name = "ldo6",
 	  .vsel_reg = AS3722_LDO6_VOLTAGE_REG,
 	  .vsel_mask = 0x7f,
 	  .enable_reg = AS3722_LDOCONTROL0_REG,
 	  .enable_mask = 0x40,
 	  .set = as3722reg_set_voltage_ldo,
 	  .get = as3722reg_get_voltage_ldo },
 };
 struct as3722reg_softc {
 	device_t	sc_dev;
 	int		sc_phandle;
 	const struct as3722regdef *sc_regdef;
 @@ -658,26 +672,103 @@ as3722reg_get_voltage_sd0(device_t dev,
 	v &= regdef->vsel_mask;
 	if (v == 0)
 		*puvol = 0;	/* DC/DC powered down */
 	else if (v >= 0x01 && v <= 0x5a)
 		*puvol = 600000 + (v * 10000);
 	else
 		return EINVAL;
 	return 0;
+}
 static int
 as3722reg_set_voltage_sd4(device_t dev, u_int min_uvol, u_int max_uvol)
+{
 	struct as3722reg_softc *sc = device_private(dev);
 	struct as3722_softc *asc = device_private(device_parent(dev));
 	const struct as3722regdef *regdef = sc->sc_regdef;
 	const int flags = (cold ? I2C_F_POLL : 0);
 	uint8_t set_v = 0x00;
 	u_int uvol;
 	int error;
 	for (uint8_t v = 0x01; v <= 0x40; v++) {
 		uvol = 600000 + (v * 12500);
 		if (uvol >= min_uvol && uvol <= max_uvol) {
 			set_v = v;
 			goto done;
+		}
+	}
 	for (uint8_t v = 0x41; v <= 0x70; v++) {
 		uvol = 1400000 + ((v - 0x40) * 25000);
 		if (uvol >= min_uvol && uvol <= max_uvol) {
 			set_v = v;
 			goto done;
+		}
+	}
 	for (uint8_t v = 0x71; v <= 0x7f; v++) {
 		uvol = 2600000 + ((v - 0x70) * 50000);
 		if (uvol >= min_uvol && uvol <= max_uvol) {
 			set_v = v;
 			goto done;
+		}
+	}
 	if (set_v == 0)
 		return ERANGE;
 done:
 	iic_acquire_bus(asc->sc_i2c, flags);
 	error = as3722_set_clear(asc, regdef->vsel_reg, set_v,
 	    regdef->vsel_mask, flags);
 	iic_release_bus(asc->sc_i2c, flags);
 	return error;
+}
 static int
 as3722reg_get_voltage_sd4(device_t dev, u_int *puvol)
+{
 	struct as3722reg_softc *sc = device_private(dev);
 	struct as3722_softc *asc = device_private(device_parent(dev));
 	const struct as3722regdef *regdef = sc->sc_regdef;
 	const int flags = (cold ? I2C_F_POLL : 0);
 	uint8_t v;
 	int error;
 	iic_acquire_bus(asc->sc_i2c, flags);
 	error = as3722_read(asc, regdef->vsel_reg, &v, flags);
 	iic_release_bus(asc->sc_i2c, flags);
 	if (error != 0)
 		return error;
 	v &= regdef->vsel_mask;
 	if (v == 0)
 		*puvol = 0;	/* DC/DC powered down */
 	else if (v >= 0x01 && v <= 0x40)
 		*puvol = 600000 + (v * 12500);
 	else if (v >= 0x41 && v <= 0x70)
 		*puvol = 1400000 + (v - 0x40) * 25000;
 	else if (v >= 0x71 && v <= 0x7f)
 		*puvol = 2600000 + (v - 0x70) * 50000;
 	else
 		return EINVAL;
 	return 0;
+}
 static int
 as3722reg_set_voltage(device_t dev, u_int min_uvol, u_int max_uvol)
+{
 	struct as3722reg_softc *sc = device_private(dev);
 	const struct as3722regdef *regdef = sc->sc_regdef;
 	return regdef->set(dev, min_uvol, max_uvol);
+}
 static int
 as3722reg_get_voltage(device_t dev, u_int *puvol)
+{
 	struct as3722reg_softc *sc = device_private(dev);
 	const struct as3722regdef *regdef = sc->sc_regdef;