Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeef8a5d authored by Ian Molton's avatar Ian Molton Committed by Kalle Valo
Browse files

brcmfmac: Tidy register definitions a little 



Trivial tidy of register definitions.

Signed-off-by: default avatarIan Molton <ian@mnementh.co.uk>
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 71bd508d

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -153,9 +153,9 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev) 
		brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_IENx, data, &ret);

		brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_IENx, data, &ret);





		/* redirect, configure and enable io for interrupt signal */

		/* redirect, configure and enable io for interrupt signal */

		data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE;

		data = SDIO_CCCR_BRCM_SEPINT_MASK | SDIO_CCCR_BRCM_SEPINT_OE;

		if (pdata->oob_irq_flags & IRQF_TRIGGER_HIGH)

		if (pdata->oob_irq_flags & IRQF_TRIGGER_HIGH)

			data |= SDIO_SEPINT_ACT_HI;

			data |= SDIO_CCCR_BRCM_SEPINT_ACT_HI;

		brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_BRCM_SEPINT,

		brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_BRCM_SEPINT,

				     data, &ret);

				     data, &ret);

		sdio_release_host(sdiodev->func[1]);

		sdio_release_host(sdiodev->func[1]);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h

+10 −9
Original line number Original line Diff line number Diff line
@@ -52,16 +52,17 @@ 
/* function 0 vendor specific CCCR registers */

/* function 0 vendor specific CCCR registers */





#define SDIO_CCCR_BRCM_CARDCAP			0xf0

#define SDIO_CCCR_BRCM_CARDCAP			0xf0

#define SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT	0x02

#define SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT	BIT(1)

#define SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT	0x04

#define SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT	BIT(2)

#define SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC	0x08

#define SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC	BIT(3)



#define SDIO_CCCR_BRCM_CARDCTRL			0xf1

#define SDIO_CCCR_BRCM_CARDCTRL			0xf1

#define SDIO_CCCR_BRCM_CARDCTRL_WLANRESET	0x02

#define SDIO_CCCR_BRCM_CARDCTRL_WLANRESET	BIT(1)

#define SDIO_CCCR_BRCM_SEPINT			0xf2





#define  SDIO_SEPINT_MASK		0x01

#define SDIO_CCCR_BRCM_SEPINT			0xf2

#define  SDIO_SEPINT_OE			0x02

#define SDIO_CCCR_BRCM_SEPINT_MASK		BIT(0)

#define  SDIO_SEPINT_ACT_HI		0x04

#define SDIO_CCCR_BRCM_SEPINT_OE		BIT(1)

#define SDIO_CCCR_BRCM_SEPINT_ACT_HI		BIT(2)





/* function 1 miscellaneous registers */

/* function 1 miscellaneous registers */