| Message ID | 20170116101757.20483-1-martin.blumenstingl@googlemail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a62a77881b1b6708ffeddd9bf0529494f7b199e3 |
| Delegated to: | Kalle Valo |
| Headers | show |
On 16-1-2017 11:17, Martin Blumenstingl wrote: > BCM43455 is a more recent revision of the BCM4345. Some of the BCM43455 > got a dedicated SDIO device ID which is currently not supported by > brcmfmac. > Adding the new sdio_device_id to brcmfmac is enough to get the BCM43455 > supported because the chip itself is already supported (due to BCM4345 > support in the driver). Hopefully Kalle can take this through his tree, ie. wireless-drivers-next. Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- > This is the proper patch following the (short) discussion from [0] > > [0] https://marc.info/?l=linux-wireless&m=148455981002310&w=2 > > drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + > include/linux/mmc/sdio_ids.h | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > index 72139b579b18..5bc2ba214735 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > @@ -1104,6 +1104,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { > BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339), > BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430), > BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345), > + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455), > BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354), > BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356), > { /* end: all zeroes */ } > diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h > index d43ef96bf075..71b113e1223f 100644 > --- a/include/linux/mmc/sdio_ids.h > +++ b/include/linux/mmc/sdio_ids.h > @@ -36,6 +36,7 @@ > #define SDIO_DEVICE_ID_BROADCOM_43362 0xa962 > #define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6 > #define SDIO_DEVICE_ID_BROADCOM_4345 0x4345 > +#define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf > #define SDIO_DEVICE_ID_BROADCOM_4354 0x4354 > #define SDIO_DEVICE_ID_BROADCOM_4356 0x4356 > >
Hi Martin, Am 16.01.2017 um 11:17 schrieb Martin Blumenstingl: > BCM43455 is a more recent revision of the BCM4345. Some of the BCM43455 > got a dedicated SDIO device ID which is currently not supported by > brcmfmac. > Adding the new sdio_device_id to brcmfmac is enough to get the BCM43455 > supported because the chip itself is already supported (due to BCM4345 > support in the driver). > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> > --- > This is the proper patch following the (short) discussion from [0] > > [0] https://marc.info/?l=linux-wireless&m=148455981002310&w=2 > > drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + > include/linux/mmc/sdio_ids.h | 1 + > 2 files changed, 2 insertions(+) Reviewed-by: Andreas Färber <afaerber@suse.de> I encountered the same ID on my R-Box Pro 3G and tested the exact same patch based on [0] there: [ +0,130866] brcmfmac: brcmf_c_preinit_dcmds: Firmware version = wl0: Mar 1 2015 07:29:38 version 7.45.18 (r538002) FWID 01-6a2c8ad4 ... [ +0,156118] brcmfmac: brcmf_cfg80211_reg_notifier: not a ISO3166 code (0x30 0x30) ... [ +1,790419] brcmfmac: brcmf_cfg80211_reg_notifier: not a ISO3166 code (0x30 0x30) Tested-by: Andreas Färber <afaerber@suse.de> Thanks, Andreas
Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > BCM43455 is a more recent revision of the BCM4345. Some of the BCM43455 > got a dedicated SDIO device ID which is currently not supported by > brcmfmac. > Adding the new sdio_device_id to brcmfmac is enough to get the BCM43455 > supported because the chip itself is already supported (due to BCM4345 > support in the driver). > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> > Reviewed-by: Andreas Färber <afaerber@suse.de> > Tested-by: Andreas Färber <afaerber@suse.de> Patch applied to wireless-drivers-next.git, thanks. a62a77881b1b brcmfmac: add support for BCM43455 with modalias sdio:c00v02D0dA9BF
On 16 January 2017 at 11:17, Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > BCM43455 is a more recent revision of the BCM4345. Some of the BCM43455 > got a dedicated SDIO device ID which is currently not supported by > brcmfmac. > Adding the new sdio_device_id to brcmfmac is enough to get the BCM43455 > supported because the chip itself is already supported (due to BCM4345 > support in the driver). > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > --- > This is the proper patch following the (short) discussion from [0] > > [0] https://marc.info/?l=linux-wireless&m=148455981002310&w=2 > > drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + > include/linux/mmc/sdio_ids.h | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > index 72139b579b18..5bc2ba214735 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > @@ -1104,6 +1104,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { > BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339), > BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430), > BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345), > + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455), > BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354), > BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356), > { /* end: all zeroes */ } > diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h > index d43ef96bf075..71b113e1223f 100644 > --- a/include/linux/mmc/sdio_ids.h > +++ b/include/linux/mmc/sdio_ids.h > @@ -36,6 +36,7 @@ > #define SDIO_DEVICE_ID_BROADCOM_43362 0xa962 > #define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6 > #define SDIO_DEVICE_ID_BROADCOM_4345 0x4345 > +#define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf > #define SDIO_DEVICE_ID_BROADCOM_4354 0x4354 > #define SDIO_DEVICE_ID_BROADCOM_4356 0x4356 > > -- > 2.11.0 >
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c index 72139b579b18..5bc2ba214735 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c @@ -1104,6 +1104,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339), BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430), BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345), + BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455), BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354), BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356), { /* end: all zeroes */ } diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index d43ef96bf075..71b113e1223f 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -36,6 +36,7 @@ #define SDIO_DEVICE_ID_BROADCOM_43362 0xa962 #define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6 #define SDIO_DEVICE_ID_BROADCOM_4345 0x4345 +#define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf #define SDIO_DEVICE_ID_BROADCOM_4354 0x4354 #define SDIO_DEVICE_ID_BROADCOM_4356 0x4356
BCM43455 is a more recent revision of the BCM4345. Some of the BCM43455 got a dedicated SDIO device ID which is currently not supported by brcmfmac. Adding the new sdio_device_id to brcmfmac is enough to get the BCM43455 supported because the chip itself is already supported (due to BCM4345 support in the driver). Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- This is the proper patch following the (short) discussion from [0] [0] https://marc.info/?l=linux-wireless&m=148455981002310&w=2 drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + include/linux/mmc/sdio_ids.h | 1 + 2 files changed, 2 insertions(+)