diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-31 11:56:59 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-31 11:56:59 +0300 |
| commit | 3ed0b8a76a6dc4158d7ba1ab7297a0477f7ea31d (patch) | |
| tree | f2f05174be956e3b169facac9b8328d508188de1 /drivers/soc | |
| parent | 99b19a1f21c68334f8c919c3d6ca4a18be31cf69 (diff) | |
| parent | bd0faf08dc7fcb3e555b35f556c9012b3c93de3b (diff) | |
| download | linux-3ed0b8a76a6dc4158d7ba1ab7297a0477f7ea31d.tar.xz | |
Merge tag 'arm-soc/for-4.12/drivers' of http://github.com/Broadcom/stblinux into next/drivers
Pull "Broadcom drivers changes for 4.12" from Florian Fainelli:
This pull request contains Broadcom ARM-based SoC drivers updates for 4.12,
please pull the following changes:
- Florian updates the Broadcom STB GISB arbiter driver with a bunch of
compatible strings for MIPS-based STBs found under arch/mips/boot/dts/brcm/ in
order for the SoC identification driver to recognize these chips
* tag 'arm-soc/for-4.12/drivers' of http://github.com/Broadcom/stblinux:
soc: bcm: brcmstb: Match additional compatible strings
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/bcm/brcmstb/common.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/soc/bcm/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c index 94e7335553f4..b6195fdf0d00 100644 --- a/drivers/soc/bcm/brcmstb/common.c +++ b/drivers/soc/bcm/brcmstb/common.c @@ -41,6 +41,15 @@ bool soc_is_brcmstb(void) } static const struct of_device_id sun_top_ctrl_match[] = { + { .compatible = "brcm,bcm7125-sun-top-ctrl", }, + { .compatible = "brcm,bcm7346-sun-top-ctrl", }, + { .compatible = "brcm,bcm7358-sun-top-ctrl", }, + { .compatible = "brcm,bcm7360-sun-top-ctrl", }, + { .compatible = "brcm,bcm7362-sun-top-ctrl", }, + { .compatible = "brcm,bcm7420-sun-top-ctrl", }, + { .compatible = "brcm,bcm7425-sun-top-ctrl", }, + { .compatible = "brcm,bcm7429-sun-top-ctrl", }, + { .compatible = "brcm,bcm7425-sun-top-ctrl", }, { .compatible = "brcm,brcmstb-sun-top-ctrl", }, { } }; |