3 @@ -1896,7 +1896,8 @@ dma64_txfast(dma_info_t *di, void *p0, bool commit)
4 if (!(flags & D64_CTRL1_EOF)) {
5 #if defined(linux) && defined(__mips__)
6 if (CHIPID(di->sih->chip) == BCM5356_CHIP_ID && di->sih->chiprev == 0) {
7 - uint32 ctrl1, ctrl2, addrlow, addrhigh;
8 + uint32 ctrl2, addrlow, addrhigh;
11 addrlow = R_SM((volatile uint32 *)&di->txd64[PREVTXD(txout)].addrlow);
12 addrhigh = R_SM((volatile uint32 *)&di->txd64[PREVTXD(txout)].addrhigh);
14 --- a/driver/include/linux_osl.h
15 +++ b/driver/include/linux_osl.h
16 @@ -580,9 +580,9 @@ extern void osl_writew(uint16 v, volatile uint16 *r);
17 extern void osl_writel(uint32 v, volatile uint32 *r);
19 /* uncached/cached virtual address */
20 -#define OSL_UNCACHED(va) osl_uncached((va))
21 +#define OSL_UNCACHED(va) osl_uncached((void *)(va))
22 extern void *osl_uncached(void *va);
23 -#define OSL_CACHED(va) osl_cached((va))
24 +#define OSL_CACHED(va) osl_cached((void *)(va))
25 extern void *osl_cached(void *va);
27 /* get processor cycle count */
28 --- a/driver/siutils.c
29 +++ b/driver/siutils.c
30 @@ -495,11 +495,13 @@ BCMATTACHFN(si_doattach)(si_info_t *sii, uint devid, osl_t *osh, void *regs,
33 sih->bustype = bustype;
35 if (bustype != BUSTYPE(bustype)) {
36 SI_ERROR(("si_doattach: bus type %d does not match configured bus type %d\n",
37 bustype, BUSTYPE(bustype)));
42 /* bus/core/clk setup for register access */
43 if (!si_buscore_prep(sii, bustype, devid, sdh)) {
44 @@ -1716,6 +1718,9 @@ si_clkctl_xtal(si_t *sih, uint what, bool on)
54 --- a/driver/bcmsrom.c
55 +++ b/driver/bcmsrom.c
56 @@ -1005,6 +1043,7 @@ BCMNMIATTACHFN(srom_parsecis)(osl_t *osh, uint8 *pcis[], uint ciscnt, char **var
61 case CISTPL_MANFID: FROMHOST();
62 varbuf_append(&b, vstr_manfid, (cis[i + 1] << 8) + cis[i]);
63 varbuf_append(&b, vstr_prodid, (cis[i + 3] << 8) + cis[i + 2]);