diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2018-03-01 18:15:43 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2018-03-01 18:15:51 +0100 |
| commit | 66bdf62a2ad2a6c2d339a6949b647301994e629d (patch) | |
| tree | abdb8064093bb1effb2128d1d90fdf7caf0181e8 /package/kernel/mac80211/patches/312-v4.16-0005-brcmfmac-Tidy-register-definitions-a-little.patch | |
| parent | bb04b7ced7047c93e907134ede6b74b0cf438aa0 (diff) | |
| download | upstream-66bdf62a2ad2a6c2d339a6949b647301994e629d.tar.gz upstream-66bdf62a2ad2a6c2d339a6949b647301994e629d.tar.bz2 upstream-66bdf62a2ad2a6c2d339a6949b647301994e629d.zip | |
mac80211: brcmfmac: restructuring sdio access functions - take 2
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/kernel/mac80211/patches/312-v4.16-0005-brcmfmac-Tidy-register-definitions-a-little.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/312-v4.16-0005-brcmfmac-Tidy-register-definitions-a-little.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/312-v4.16-0005-brcmfmac-Tidy-register-definitions-a-little.patch b/package/kernel/mac80211/patches/312-v4.16-0005-brcmfmac-Tidy-register-definitions-a-little.patch new file mode 100644 index 0000000000..e77d601a81 --- /dev/null +++ b/package/kernel/mac80211/patches/312-v4.16-0005-brcmfmac-Tidy-register-definitions-a-little.patch @@ -0,0 +1,59 @@ +From eeef8a5da781e11746347b3cd9f1942be48ebaf0 Mon Sep 17 00:00:00 2001 +From: Ian Molton <ian@mnementh.co.uk> +Date: Fri, 8 Dec 2017 13:10:30 +0100 +Subject: [PATCH] brcmfmac: Tidy register definitions a little + +Trivial tidy of register definitions. + +Signed-off-by: Ian Molton <ian@mnementh.co.uk> +Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> +Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> +Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +--- + .../net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 4 ++-- + .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.h | 19 ++++++++++--------- + 2 files changed, 12 insertions(+), 11 deletions(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +@@ -153,9 +153,9 @@ int brcmf_sdiod_intr_register(struct brc + brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_IENx, data, &ret); + + /* 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) +- data |= SDIO_SEPINT_ACT_HI; ++ data |= SDIO_CCCR_BRCM_SEPINT_ACT_HI; + brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_BRCM_SEPINT, + data, &ret); + sdio_release_host(sdiodev->func[1]); +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h +@@ -52,16 +52,17 @@ + /* function 0 vendor specific CCCR registers */ + + #define SDIO_CCCR_BRCM_CARDCAP 0xf0 +-#define SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT 0x02 +-#define SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT 0x04 +-#define SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC 0x08 +-#define SDIO_CCCR_BRCM_CARDCTRL 0xf1 +-#define SDIO_CCCR_BRCM_CARDCTRL_WLANRESET 0x02 +-#define SDIO_CCCR_BRCM_SEPINT 0xf2 ++#define SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT BIT(1) ++#define SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT BIT(2) ++#define SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC BIT(3) ++ ++#define SDIO_CCCR_BRCM_CARDCTRL 0xf1 ++#define SDIO_CCCR_BRCM_CARDCTRL_WLANRESET BIT(1) + +-#define SDIO_SEPINT_MASK 0x01 +-#define SDIO_SEPINT_OE 0x02 +-#define SDIO_SEPINT_ACT_HI 0x04 ++#define SDIO_CCCR_BRCM_SEPINT 0xf2 ++#define SDIO_CCCR_BRCM_SEPINT_MASK BIT(0) ++#define SDIO_CCCR_BRCM_SEPINT_OE BIT(1) ++#define SDIO_CCCR_BRCM_SEPINT_ACT_HI BIT(2) + + /* function 1 miscellaneous registers */ + |