diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c
index f78305b154e1..15febf8811bf 100644
--- a/sys/arm/broadcom/bcm2835/bcm2836.c
+++ b/sys/arm/broadcom/bcm2835/bcm2836.c
@@ -454,9 +454,11 @@ bcm_lintc_map_intr(device_t dev, struct intr_map_data *data,
 		return (ENOTSUP);
 
 	daf = (struct intr_map_data_fdt *)data;
-	if (daf->ncells != 1 || daf->cells[0] >= BCM_LINTC_NIRQS)
+	if (daf->ncells > 2 || daf->cells[0] >= BCM_LINTC_NIRQS)
 		return (EINVAL);
 
+	/* TODO: handle IRQ type here */
+
 	sc = device_get_softc(dev);
 	*isrcp = &sc->bls_isrcs[daf->cells[0]].bli_isrc;
 	return (0);