 @@ -1,14 +1,14 @@
-/*	$NetBSD: voyager.c,v 1.6 2011/10/20 22:04:10 macallan Exp $	*/
+/*	$NetBSD: voyager.c,v 1.7 2011/12/07 09:08:00 macallan Exp $	*/
 /*
  * Copyright (c) 2009, 2011 Michael Lorenz
  * 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.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voyager.c,v 1.6 2011/10/20 22:04:10 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyager.c,v 1.7 2011/12/07 09:08:00 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciio.h>
 @@ -212,48 +212,57 @@ voyager_attach(device_t parent, device_t
 	/* attach the framebuffer driver */
 	vaa.vaa_memh = sc->sc_fbh;
 	vaa.vaa_mem_pa = sc->sc_fb;
 	vaa.vaa_regh = sc->sc_regh;
 	vaa.vaa_reg_pa = sc->sc_reg;
 	vaa.vaa_tag = sc->sc_memt;
 	vaa.vaa_pc = sc->sc_pc;
 	vaa.vaa_pcitag = sc->sc_pcitag;
 	strcpy(vaa.vaa_name, "voyagerfb");
 	config_found_ia(sc->sc_dev, "voyagerbus", &vaa, voyager_print);
 	strcpy(vaa.vaa_name, "pwmclock");
 	config_found_ia(sc->sc_dev, "voyagerbus", &vaa, voyager_print);
 	strcpy(vaa.vaa_name, "vac");
 	config_found_ia(sc->sc_dev, "voyagerbus", &vaa, voyager_print);
 	/* we use this mutex wether there's an i2c bus or not */
 	mutex_init(&sc->sc_i2c_lock, MUTEX_DEFAULT, IPL_NONE);
 	/*
 	 * see if the i2c pins are configured as gpio and if so, use them
 	 * should probably be a compile time option
 	 */
 	reg = bus_space_read_4(sc->sc_memt, sc->sc_regh, SM502_GPIO0_CONTROL);
 	if ((reg & GPIO_I2C_BITS) == 0) {
 		/* both bits as outputs */
-		reg = bus_space_read_4(sc->sc_memt, sc->sc_regh, SM502_GPIO_DIR0);
+		voyager_gpio_dir(sc, 0xffffffff, GPIO_I2C_BITS);
 		reg |= GPIO_I2C_BITS;
 		bus_space_write_4(sc->sc_memt, sc->sc_regh, SM502_GPIO_DIR0, reg);
 		/* Fill in the i2c tag */
 		sc->sc_i2c.ic_cookie = sc;
 		sc->sc_i2c.ic_acquire_bus = voyager_i2c_acquire_bus;
 		sc->sc_i2c.ic_release_bus = voyager_i2c_release_bus;
 		sc->sc_i2c.ic_send_start = voyager_i2c_send_start;
 		sc->sc_i2c.ic_send_stop = voyager_i2c_send_stop;
 		sc->sc_i2c.ic_initiate_xfer = voyager_i2c_initiate_xfer;
 		sc->sc_i2c.ic_read_byte = voyager_i2c_read_byte;
 		sc->sc_i2c.ic_write_byte = voyager_i2c_write_byte;
 		sc->sc_i2c.ic_exec = NULL;
 		mutex_init(&sc->sc_i2c_lock, MUTEX_DEFAULT, IPL_NONE);
 		iba.iba_tag = &sc->sc_i2c;
 		config_found_ia(self, "i2cbus", &iba, iicbus_print);
+	}
 	voyager_control_gpio(sc, ~(1 << 16), 0);
 	voyager_gpio_dir(sc, 0xffffffff, 1 << 16);
 	voyager_write_gpio(sc, 0xffffffff, 1 << 16);
+}
 static int
 voyager_print(void *aux, const char *what)
+{
 	/*struct voyager_attach_args *vaa = aux;*/
 	if (what == NULL)
 		return 0;
 	printf("%s:", what);
 	return 0;
 @@ -344,54 +353,38 @@ voyager_i2c_read_byte(void *cookie, uint
 	return ret;
+}
 static int
 voyager_i2c_write_byte(void *cookie, uint8_t val, int flags)
+{
 	int ret;
 	ret = i2c_bitbang_write_byte(cookie, val, flags, &voyager_i2cbb_ops);
 	delay(500);
 	return ret;
+}
 /* gpio stuff */
 void
-voyager_write_gpio(void *cookie, uint32_t mask, uint32_t bits)
+voyager_twiddle_bits(void *cookie, int regnum, uint32_t mask, uint32_t bits)
+{
 	struct voyager_softc *sc = cookie;
 	uint32_t reg;
 	/* don't interfere with i2c ops */
 	mutex_enter(&sc->sc_i2c_lock);
-	reg = bus_space_read_4(sc->sc_memt, sc->sc_regh, SM502_GPIO_DATA0);
+	reg = bus_space_read_4(sc->sc_memt, sc->sc_regh, regnum);
 	reg &= mask;
 	reg |= bits;
 	bus_space_write_4(sc->sc_memt, sc->sc_regh, SM502_GPIO_DATA0, reg);
 	mutex_exit(&sc->sc_i2c_lock);
 void
 voyager_control_gpio(void *cookie, uint32_t mask, uint32_t bits)
 	struct voyager_softc *sc = cookie;
 	uint32_t reg;
 	/* don't interfere with i2c ops */
 	mutex_enter(&sc->sc_i2c_lock);
 	reg = bus_space_read_4(sc->sc_memt, sc->sc_regh, SM502_GPIO0_CONTROL);
 	reg &= mask;
 	reg |= bits;
-	bus_space_write_4(sc->sc_memt, sc->sc_regh, SM502_GPIO0_CONTROL, reg);
+	bus_space_write_4(sc->sc_memt, sc->sc_regh, regnum, reg);
 	mutex_exit(&sc->sc_i2c_lock);
+}
 static int
 voyager_intr(void *cookie)
+{
 	struct voyager_softc *sc = cookie;
 	struct voyager_intr *ih;
 	uint32_t intrs;
 	uint32_t mask, bit;
 	int num;
 	intrs = bus_space_read_4(sc->sc_memt, sc->sc_regh, SM502_INTR_STATUS);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: voyagervar.h,v 1.3 2011/10/18 17:57:40 macallan Exp $	*/
+/*	$NetBSD: voyagervar.h,v 1.4 2011/12/07 09:08:00 macallan Exp $	*/
 /*
  * Copyright (c) 2011 Michael Lorenz
  * 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.
 @@ -16,44 +16,53 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voyagervar.h,v 1.3 2011/10/18 17:57:40 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyagervar.h,v 1.4 2011/12/07 09:08:00 macallan Exp $");
 #ifndef VOYAGERVAR_H
 #define VOYAGERVAR_H
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 struct voyager_attach_args {
 	pci_chipset_tag_t		vaa_pc;
 	pcitag_t					vaa_pcitag;
 	bus_space_tag_t		vaa_tag;
 	bus_space_handle_t	vaa_regh;
 	bus_space_handle_t	vaa_memh;
 	bus_addr_t		vaa_reg_pa;
 	bus_addr_t		vaa_mem_pa;
 	char			vaa_name[32];
 };
 void voyager_twiddle_bits(void *, int, uint32_t, uint32_t);
 /* set gpio bits - (register & param1) | param2 */
-void voyager_write_gpio(void *, uint32_t, uint32_t);
+#define voyager_write_gpio(cookie, m_and, m_or) \
 	voyager_twiddle_bits(cookie, SM502_GPIO_DATA0, m_and, m_or)
 /* control gpio pin usage - 0 is gpio, 1 is other stuff ( like PWM ) */
-void voyager_control_gpio(void *, uint32_t, uint32_t);
+#define voyager_control_gpio(cookie, m_and, m_or) \
 	voyager_twiddle_bits(cookie, SM502_GPIO0_CONTROL, m_and, m_or)
 /* gpio direction - 1 is output */
 #define voyager_gpio_dir(cookie, m_and, m_or) \
 	voyager_twiddle_bits(cookie, SM502_GPIO_DIR0, m_and, m_or)
 #define voyager_control_power_0(cookie, m_and, m_or) \
 	voyager_twiddle_bits(cookie, SM502_POWER_MODE0_GATE, m_and, m_or)
 void *voyager_establish_intr(device_t, int, int (*)(void *), void *);
 void  voyager_disestablish_intr(device_t, void *);
 /* frequency in Hz, duty cycle in 1000ths */
 uint32_t voyager_set_pwm(int, int);
 #endif