d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a mask to match only the relative base address of BSC controllers.

Browse Source 
This should fix the attach of BSC on RPI2 (based on andrew@ dmesg).
This commit is contained in:
Luiz Otavio O Souza 2015-02-16 19:06:31 +00:00
parent 69d4c287d3
commit b4ae2f3c55
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arm/broadcom/bcm2835/bcm2835_bsc.c
View File

@ -247,7 +247,7 @@ bcm_bsc_attach(device_t dev)
/* Check the unit we are attaching by its base address. */
start = rman_get_start(sc->sc_mem_res);
for (i = 0; i < nitems(bcm_bsc_pins); i++) {
if (bcm_bsc_pins[i].start == start)
if (bcm_bsc_pins[i].start == (start & BCM_BSC_BASE_MASK))
break;
}
if (i == nitems(bcm_bsc_pins)) {

5
sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
View File

@ -35,9 +35,10 @@ struct {
uint32_t scl;
unsigned long start;
} bcm_bsc_pins[] = {
{ 0, 1, 0x20205000 }, /* BSC0 GPIO pins and base address. */
{ 2, 3, 0x20804000 } /* BSC1 GPIO pins and base address. */
{ 0, 1, 0x205000 }, /* BSC0 GPIO pins and base address. */
{ 2, 3, 0x804000 } /* BSC1 GPIO pins and base address. */
};
#define BCM_BSC_BASE_MASK 0x00ffffff
struct bcm_bsc_softc {
device_t sc_dev;