Module Name: src Committed By: jmcneill Date: Sat May 2 12:08:32 UTC 2015
Modified Files: src/sys/arch/arm/nvidia: tegra_io.c tegra_reg.h tegra_var.h Added Files: src/sys/arch/arm/nvidia: tegra_gpio.c tegra_gpioreg.h Log Message: add GPIO support To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/nvidia/tegra_gpio.c \ src/sys/arch/arm/nvidia/tegra_gpioreg.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_io.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_reg.h \ src/sys/arch/arm/nvidia/tegra_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/nvidia/tegra_io.c diff -u src/sys/arch/arm/nvidia/tegra_io.c:1.3 src/sys/arch/arm/nvidia/tegra_io.c:1.4 --- src/sys/arch/arm/nvidia/tegra_io.c:1.3 Tue Apr 28 11:15:55 2015 +++ src/sys/arch/arm/nvidia/tegra_io.c Sat May 2 12:08:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_io.c,v 1.3 2015/04/28 11:15:55 jmcneill Exp $ */ +/* $NetBSD: tegra_io.c,v 1.4 2015/05/02 12:08:32 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca> @@ -29,7 +29,7 @@ #include "opt_tegra.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tegra_io.c,v 1.3 2015/04/28 11:15:55 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tegra_io.c,v 1.4 2015/05/02 12:08:32 jmcneill Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,6 +64,8 @@ static bool tegraio_found = false; static const struct tegra_locators tegra_ppsb_locators[] = { { "tegracar", TEGRA_CAR_OFFSET, TEGRA_CAR_SIZE, NOPORT, NOINTR }, + { "tegragpio", + TEGRA_GPIO_OFFSET, TEGRA_GPIO_SIZE, NOPORT, NOINTR }, }; static const struct tegra_locators tegra_apb_locators[] = { Index: src/sys/arch/arm/nvidia/tegra_reg.h diff -u src/sys/arch/arm/nvidia/tegra_reg.h:1.4 src/sys/arch/arm/nvidia/tegra_reg.h:1.5 --- src/sys/arch/arm/nvidia/tegra_reg.h:1.4 Tue Apr 28 11:15:55 2015 +++ src/sys/arch/arm/nvidia/tegra_reg.h Sat May 2 12:08:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_reg.h,v 1.4 2015/04/28 11:15:55 jmcneill Exp $ */ +/* $NetBSD: tegra_reg.h,v 1.5 2015/05/02 12:08:32 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca> @@ -89,6 +89,8 @@ /* PPSB */ #define TEGRA_CAR_OFFSET 0x00006000 #define TEGRA_CAR_SIZE 0x1000 +#define TEGRA_GPIO_OFFSET 0x0000d000 +#define TEGRA_GPIO_SIZE 0x00000800 #define TEGRA_EVP_OFFSET 0x0000f000 #define TEGRA_EVP_SIZE 0x1000 Index: src/sys/arch/arm/nvidia/tegra_var.h diff -u src/sys/arch/arm/nvidia/tegra_var.h:1.4 src/sys/arch/arm/nvidia/tegra_var.h:1.5 --- src/sys/arch/arm/nvidia/tegra_var.h:1.4 Tue Apr 28 11:15:55 2015 +++ src/sys/arch/arm/nvidia/tegra_var.h Sat May 2 12:08:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_var.h,v 1.4 2015/04/28 11:15:55 jmcneill Exp $ */ +/* $NetBSD: tegra_var.h,v 1.5 2015/05/02 12:08:32 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca> @@ -31,6 +31,7 @@ #include <sys/types.h> #include <sys/bus.h> +#include <sys/gpio.h> #include "opt_tegra.h" @@ -71,6 +72,15 @@ void tegra_bootstrap(void); u_int tegra_car_osc_rate(void); u_int tegra_car_pllx_rate(void); +u_int tegra_car_pllp0_rate(void); +u_int tegra_car_periph_sdmmc_rate(u_int); +int tegra_car_periph_sdmmc_set_div(u_int, u_int); + +struct tegra_gpio_pin; +struct tegra_gpio_pin *tegra_gpio_acquire(const char *, int, u_int); +void tegra_gpio_release(struct tegra_gpio_pin *); +int tegra_gpio_read(struct tegra_gpio_pin *); +void tegra_gpio_write(struct tegra_gpio_pin *, int); void tegra_pmc_reset(void); void tegra_pmc_power(u_int, bool); Added files: Index: src/sys/arch/arm/nvidia/tegra_gpio.c diff -u /dev/null src/sys/arch/arm/nvidia/tegra_gpio.c:1.1 --- /dev/null Sat May 2 12:08:32 2015 +++ src/sys/arch/arm/nvidia/tegra_gpio.c Sat May 2 12:08:32 2015 @@ -0,0 +1,320 @@ +/* $NetBSD: tegra_gpio.c,v 1.1 2015/05/02 12:08:32 jmcneill Exp $ */ + +/*- + * Copyright (c) 2015 Jared D. McNeill <jmcne...@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. + * + * 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 "locators.h" + +#include <sys/cdefs.h> +__KERNEL_RCSID(0, "$NetBSD: tegra_gpio.c,v 1.1 2015/05/02 12:08:32 jmcneill Exp $"); + +#include <sys/param.h> +#include <sys/bus.h> +#include <sys/device.h> +#include <sys/intr.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/kmem.h> +#include <sys/gpio.h> + +#include <dev/gpio/gpiovar.h> + +#include <arm/nvidia/tegra_reg.h> +#include <arm/nvidia/tegra_gpioreg.h> +#include <arm/nvidia/tegra_var.h> + +const struct tegra_gpio_pinbank { + const char *name; + bus_size_t base; +} tegra_gpio_pinbanks [] = { + { "A", 0x000 }, + { "B", 0x004 }, + { "C", 0x008 }, + { "D", 0x00c }, + { "E", 0x100 }, + { "F", 0x104 }, + { "G", 0x108 }, + { "H", 0x10c }, + { "I", 0x200 }, + { "J", 0x204 }, + { "K", 0x208 }, + { "L", 0x20c }, + { "M", 0x300 }, + { "N", 0x304 }, + { "O", 0x308 }, + { "P", 0x30c }, + { "Q", 0x400 }, + { "R", 0x404 }, + { "S", 0x408 }, + { "T", 0x40c }, + { "U", 0x500 }, + { "V", 0x504 }, + { "W", 0x508 }, + { "X", 0x50c }, + { "Y", 0x600 }, + { "Z", 0x604 }, + { "AA", 0x608 }, + { "BB", 0x60c }, + { "CC", 0x700 }, + { "DD", 0x704 }, + { "EE", 0x708 } +}; + +static int tegra_gpio_match(device_t, cfdata_t, void *); +static void tegra_gpio_attach(device_t, device_t, void *); + +struct tegra_gpio_softc; + +struct tegra_gpio_bank { + struct tegra_gpio_softc *bank_sc; + const struct tegra_gpio_pinbank *bank_pb; + device_t bank_dev; + struct gpio_chipset_tag bank_gc; + gpio_pin_t bank_pins[8]; +}; + +struct tegra_gpio_softc { + device_t sc_dev; + bus_space_tag_t sc_bst; + bus_space_handle_t sc_bsh; + + struct tegra_gpio_bank *sc_banks; +}; + +struct tegra_gpio_pin { + struct tegra_gpio_softc *pin_sc; + struct tegra_gpio_bank pin_bank; + int pin_no; + u_int pin_flags; +}; + +static void tegra_gpio_attach_bank(struct tegra_gpio_softc *, u_int); + +static int tegra_gpio_pin_read(void *, int); +static void tegra_gpio_pin_write(void *, int, int); +static void tegra_gpio_pin_ctl(void *, int, int); + +static int tegra_gpio_cfprint(void *, const char *); + +CFATTACH_DECL_NEW(tegra_gpio, sizeof(struct tegra_gpio_softc), + tegra_gpio_match, tegra_gpio_attach, NULL, NULL); + +#define GPIO_WRITE(bank, reg, val) \ + bus_space_write_4((bank)->bank_sc->sc_bst, \ + (bank)->bank_sc->sc_bsh, \ + (bank)->bank_pb->base + (reg), (val)) +#define GPIO_READ(bank, reg) \ + bus_space_read_4((bank)->bank_sc->sc_bst, \ + (bank)->bank_sc->sc_bsh, \ + (bank)->bank_pb->base + (reg)) + +static int +tegra_gpio_match(device_t parent, cfdata_t cf, void *aux) +{ + return 1; +} + +static void +tegra_gpio_attach(device_t parent, device_t self, void *aux) +{ + struct tegra_gpio_softc * const sc = device_private(self); + struct tegraio_attach_args * const tio = aux; + const struct tegra_locators * const loc = &tio->tio_loc; + u_int n; + + sc->sc_dev = self; + sc->sc_bst = tio->tio_bst; + bus_space_subregion(tio->tio_bst, tio->tio_bsh, + loc->loc_offset, loc->loc_size, &sc->sc_bsh); + + aprint_naive("\n"); + aprint_normal(": GPIO\n"); + + const u_int nbank = __arraycount(tegra_gpio_pinbanks); + sc->sc_banks = kmem_zalloc(sizeof(*sc->sc_banks) * nbank, KM_SLEEP); + for (n = 0; n < nbank; n++) { + tegra_gpio_attach_bank(sc, n); + } +} + +static void +tegra_gpio_attach_bank(struct tegra_gpio_softc *sc, u_int bankno) +{ + struct tegra_gpio_bank *bank = &sc->sc_banks[bankno]; + struct gpiobus_attach_args gba; + u_int pin; + + bank->bank_sc = sc; + bank->bank_pb = &tegra_gpio_pinbanks[bankno]; + bank->bank_gc.gp_cookie = bank; + bank->bank_gc.gp_pin_read = tegra_gpio_pin_read; + bank->bank_gc.gp_pin_write = tegra_gpio_pin_write; + bank->bank_gc.gp_pin_ctl = tegra_gpio_pin_ctl; + + const uint32_t cnf = GPIO_READ(bank, GPIO_CNF_REG); + + for (pin = 0; pin < __arraycount(bank->bank_pins); pin++) { + bank->bank_pins[pin].pin_num = pin; + /* skip pins in SFIO mode */ + if ((cnf & __BIT(pin)) == 0) + continue; + bank->bank_pins[pin].pin_caps = + GPIO_PIN_INPUT | GPIO_PIN_OUTPUT | + GPIO_PIN_TRISTATE; + bank->bank_pins[pin].pin_state = + tegra_gpio_pin_read(bank, pin); + } + + memset(&gba, 0, sizeof(gba)); + gba.gba_gc = &bank->bank_gc; + gba.gba_pins = bank->bank_pins; + gba.gba_npins = __arraycount(bank->bank_pins); + + bank->bank_dev = config_found_ia(sc->sc_dev, "gpiobus", &gba, + tegra_gpio_cfprint); +} + +static int +tegra_gpio_cfprint(void *priv, const char *pnp) +{ + struct gpiobus_attach_args *gba = priv; + struct tegra_gpio_bank *bank = gba->gba_gc->gp_cookie; + const char *bankname = bank->bank_pb->name; + + if (pnp) + aprint_normal("gpiobus at %s", pnp); + + aprint_normal(" (%s)", bankname); + + return UNCONF; +} + +static int +tegra_gpio_pin_read(void *priv, int pin) +{ + struct tegra_gpio_bank *bank = priv; + + const uint32_t v = GPIO_READ(bank, GPIO_IN_REG); + + return (v >> pin) & 1; +} + +static void +tegra_gpio_pin_write(void *priv, int pin, int val) +{ + struct tegra_gpio_bank *bank = priv; + uint32_t v; + + v = (1 << (pin + 8)); + v |= (val << pin); + GPIO_WRITE(bank, GPIO_MSK_OUT_REG, v); +} + +static void +tegra_gpio_pin_ctl(void *priv, int pin, int flags) +{ + struct tegra_gpio_bank *bank = priv; + uint32_t v; + + if (flags & GPIO_PIN_INPUT) { + v = (1 << (pin + 8)); + GPIO_WRITE(bank, GPIO_MSK_OE_REG, v); + } else if (flags & GPIO_PIN_OUTPUT) { + v = (1 << (pin + 8)); + v |= (1 << pin); + GPIO_WRITE(bank, GPIO_MSK_OE_REG, v); + } +} + +static const struct tegra_gpio_pinbank * +tegra_gpio_pinbank_lookup(const char *bankname) +{ + u_int n; + + for (n = 0; n < __arraycount(tegra_gpio_pinbanks); n++) { + const struct tegra_gpio_pinbank *pb = + &tegra_gpio_pinbanks[n]; + if (strcmp(pb->name, bankname) == 0) + return pb; + } + + return NULL; +} + +struct tegra_gpio_pin * +tegra_gpio_acquire(const char *bankname, int pin, u_int flags) +{ + struct tegra_gpio_bank bank; + struct tegra_gpio_pin *gpin; + device_t dev; + + dev = device_find_by_driver_unit("tegragpio", 0); + if (dev == NULL) + return NULL; + + bank.bank_sc = device_private(dev); + bank.bank_pb = tegra_gpio_pinbank_lookup(bankname); + if (bank.bank_pb == NULL) + return NULL; + + const uint32_t cnf = GPIO_READ(&bank, GPIO_CNF_REG); + if ((cnf & __BIT(pin)) == 0) + return NULL; + + gpin = kmem_alloc(sizeof(*gpin), KM_SLEEP); + gpin->pin_bank = bank; + gpin->pin_no = pin; + gpin->pin_flags = flags; + + tegra_gpio_pin_ctl(&gpin->pin_bank, gpin->pin_no, gpin->pin_flags); + + return gpin; +} + +void +tegra_gpio_release(struct tegra_gpio_pin *gpin) +{ + tegra_gpio_pin_ctl(&gpin->pin_bank, gpin->pin_no, GPIO_PIN_INPUT); + kmem_free(gpin, sizeof(*gpin)); +} + +int +tegra_gpio_read(struct tegra_gpio_pin *gpin) +{ + if (gpin->pin_flags & GPIO_PIN_INPUT) { + return tegra_gpio_pin_read(&gpin->pin_bank, gpin->pin_no); + } else { + const uint32_t v = GPIO_READ(&gpin->pin_bank, GPIO_OUT_REG); + return (v >> gpin->pin_no) & 1; + } +} + +void +tegra_gpio_write(struct tegra_gpio_pin *gpin, int val) +{ + KASSERT((gpin->pin_flags & GPIO_PIN_OUTPUT) != 0); + tegra_gpio_pin_write(&gpin->pin_bank, gpin->pin_no, val); +} Index: src/sys/arch/arm/nvidia/tegra_gpioreg.h diff -u /dev/null src/sys/arch/arm/nvidia/tegra_gpioreg.h:1.1 --- /dev/null Sat May 2 12:08:32 2015 +++ src/sys/arch/arm/nvidia/tegra_gpioreg.h Sat May 2 12:08:32 2015 @@ -0,0 +1,53 @@ +/* $NetBSD: tegra_gpioreg.h,v 1.1 2015/05/02 12:08:32 jmcneill Exp $ */ + +/*- + * Copyright (c) 2015 Jared D. McNeill <jmcne...@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. + * + * 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. + */ + +#ifndef _ARM_TEGRA_GPIOREG_H +#define _ARM_TEGRA_GPIOREG_H + +#define GPIO_BANK_OFFSET(n) (4 * (n)) + +#define GPIO_CNF_REG 0x000 +#define GPIO_OE_REG 0x010 +#define GPIO_OUT_REG 0x020 +#define GPIO_IN_REG 0x030 +#define GPIO_INT_STA_REG 0x040 +#define GPIO_INT_ENB_REG 0x050 +#define GPIO_INT_LVL_REG 0x060 +#define GPIO_INT_CLR_REG 0x070 + +#define GPIO_MSK_CNF_REG 0x080 +#define GPIO_MSK_OE_REG 0x090 +#define GPIO_MSK_OUT_REG 0x0a0 +#define GPIO_MSK_INT_STA_REG 0x0c0 +#define GPIO_MSK_INT_ENB_REG 0x0d0 +#define GPIO_MSK_INT_CLR_REG 0x0e0 + +#define GPIO_CNF_LOCK __BITS(15,8) +#define GPIO_CNF_MODE __BITS(7,0) + +#endif /* _ARM_TEGRA_GPIOREG_H */