Module Name: src
Committed By: mlelstv
Date: Thu Oct 3 11:24:27 UTC 2019
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_gpio.c
Log Message:
remove debug printfs, add more compat strings.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/broadcom/bcm2835_gpio.c
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/broadcom/bcm2835_gpio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.14 src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.15
--- src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.14 Tue Oct 1 23:32:52 2019
+++ src/sys/arch/arm/broadcom/bcm2835_gpio.c Thu Oct 3 11:24:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_gpio.c,v 1.14 2019/10/01 23:32:52 jmcneill Exp $ */
+/* $NetBSD: bcm2835_gpio.c,v 1.15 2019/10/03 11:24:27 mlelstv Exp $ */
/*-
* Copyright (c) 2013, 2014, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.14 2019/10/01 23:32:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.15 2019/10/03 11:24:27 mlelstv Exp $");
/*
* Driver for BCM2835 GPIO
@@ -241,7 +241,12 @@ bcm283x_pinctrl_set_config(device_t dev,
static int
bcmgpio_match(device_t parent, cfdata_t cf, void *aux)
{
- const char * const compatible[] = { "brcm,bcm2835-gpio", NULL };
+ const char * const compatible[] = {
+ "brcm,bcm2835-gpio",
+ "brcm,bcm2838-gpio",
+ "brcm,bcm2711-gpio",
+ NULL
+ };
struct fdt_attach_args * const faa = aux;
return of_match_compatible(faa->faa_phandle, compatible);
@@ -815,7 +820,6 @@ bcm283x_pin_setpull(const struct bcmgpio
mask = 1 << (pin % BCM2835_GPIO_GPPUD_PINS_PER_REGISTER);
regid = (pin / BCM2835_GPIO_GPPUD_PINS_PER_REGISTER);
-printf("2835: pin=%u, pud=%u, regid=%u, mask=%08x\n",pin,pud,regid,mask);
bus_space_write_4(sc->sc_iot, sc->sc_ioh,
BCM2835_GPIO_GPPUD, pud);
delay(1);
@@ -841,7 +845,6 @@ printf("2835: pin=%u, pud=%u, regid=%u,
pud = BCM2838_GPIO_GPPUD_PULLOFF;
break;
}
-printf("2838: pin=%u, pud=%u, regid=%u, mask=%08x\n",pin,pud,regid,mask);
reg = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
BCM2838_GPIO_GPPUPPDN(regid));
