summaryrefslogtreecommitdiff
path: root/sys/dev/i2c
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2019-10-03 17:23:11 +0000
committermartin <martin@NetBSD.org>2019-10-03 17:23:11 +0000
commit3cf6416b048f92a511c99f3c3858dff4be423bf8 (patch)
treeaf21b3ae0fd2cc87c3bbf9682b48ca53724ee573 /sys/dev/i2c
parent9e2192404b4ff287e6bffc15ac65386c57c1b8dd (diff)
Pull up following revision(s) (requested by jmcneill in ticket #276):
sys/arch/arm/samsung/exynos_pinctrl.c: revision 1.14 sys/arch/arm/rockchip/rk3399_iomux.c: revision 1.6 sys/dev/fdt/fdtvar.h: revision 1.54 sys/arch/arm/broadcom/bcm2835_gpio.c: revision 1.14 sys/dev/i2c/axppmic.c: revision 1.26 sys/arch/arm/nvidia/tegra_pinmux.c: revision 1.4 sys/arch/arm/rockchip/rk3328_iomux.c: revision 1.3 sys/dev/fdt/fdt_pinctrl.c: revision 1.10 sys/arch/arm/amlogic/meson_pinctrl.c: revision 1.6 sys/dev/fdt/fdtbus.c: revision 1.30 sys/arch/arm/sunxi/sunxi_gpio.c: revision 1.27 Add support for devices with separate "init" and "default" pinctrl states.
Diffstat (limited to 'sys/dev/i2c')
-rw-r--r--sys/dev/i2c/axppmic.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/i2c/axppmic.c b/sys/dev/i2c/axppmic.c
index 0a1bb64bcb7..8528dc585a6 100644
--- a/sys/dev/i2c/axppmic.c
+++ b/sys/dev/i2c/axppmic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: axppmic.c,v 1.25 2019/07/27 16:02:27 thorpej Exp $ */
+/* $NetBSD: axppmic.c,v 1.25.2.1 2019/10/03 17:23:11 martin Exp $ */
/*-
* Copyright (c) 2014-2018 Jared McNeill <jmcneill@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 1.25 2019/07/27 16:02:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 1.25.2.1 2019/10/03 17:23:11 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -992,9 +992,6 @@ axppmic_attach(device_t parent, device_t self, void *aux)
}
}
- /* Notify pinctrl drivers that regulators are available. */
- fdtbus_pinctrl_configure();
-
if (c->has_battery)
axppmic_attach_sensors(sc);
}