[src/trunk]: src/sys/arch/arm/broadcom Fix previous; follow the binding spec ...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b6ae43e797fa
branches:  trunk
changeset: 993745:b6ae43e797fa
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Sep 28 13:24:02 2018 +0000

description:
Fix previous; follow the binding spec for this device when decoding
interrupt specifiers.

diffstat:

 sys/arch/arm/broadcom/bcm2835_gpio.c |  26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)

diffs (60 lines):

diff -r e9cf33c84ace -r b6ae43e797fa sys/arch/arm/broadcom/bcm2835_gpio.c
--- a/sys/arch/arm/broadcom/bcm2835_gpio.c      Fri Sep 28 13:21:37 2018 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_gpio.c      Fri Sep 28 13:24:02 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm2835_gpio.c,v 1.7 2018/05/19 14:02:10 thorpej Exp $ */
+/*     $NetBSD: bcm2835_gpio.c,v 1.8 2018/09/28 13:24:02 jmcneill 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.7 2018/05/19 14:02:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.8 2018/09/28 13:24:02 jmcneill Exp $");
 
 /*
  * Driver for BCM2835 GPIO
@@ -560,12 +560,11 @@
                return (NULL);
        }
 
-       /* 1st cell is the bank */
-       /* 2nd cell is the pin */
-       /* 3rd cell is flags */
-       const u_int bank = be32toh(specifier[0]);
-       const u_int pin = be32toh(specifier[1]);
-       const u_int type = be32toh(specifier[2]) & 0xf;
+       /* 1st cell is the GPIO number */
+       /* 2nd cell is flags */
+       const u_int bank = be32toh(specifier[0]) / 32;
+       const u_int pin = be32toh(specifier[0]) % 32;
+       const u_int type = be32toh(specifier[1]) & 0xf;
 
        switch (type) {
        case 0x1:
@@ -668,19 +667,16 @@
 bcmgpio_fdt_intrstr(device_t dev, u_int *specifier, char *buf, size_t buflen)
 {
 
-       /* 1st cell is the bank */
-       /* 2nd cell is the pin */
+       /* 1st cell is the GPIO number */
        /* 3rd cell is flags */
        if (!specifier)
                return (false);
-       const u_int bank = be32toh(specifier[0]);
-       const u_int pin = be32toh(specifier[1]);
+       const u_int bank = be32toh(specifier[0]) / 32;
+       const u_int pin = be32toh(specifier[0]) % 32;
 
        if (bank >= BCMGPIO_NBANKS)
                return (false);
-       if (pin >= 32)
-               return (false);
-       
+
        snprintf(buf, buflen, "GPIO %u", (bank * 32) + pin);
 
        return (true);