diff options
| author | Olof Johansson <olof@lixom.net> | 2017-05-18 23:56:26 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-05-18 23:56:26 -0700 |
| commit | 3d2ba3fb544385f335ddb34afd97e480acabb87e (patch) | |
| tree | a6d7b5d9b846a77f6ed8eef6472039f1b1d06d2e /drivers | |
| parent | 5cb1ac0f7906cea3d978e54023e9432e910579c8 (diff) | |
| parent | 31d848aa1d85530770f0bdf1b61a042335d340ad (diff) | |
| download | lwn-3d2ba3fb544385f335ddb34afd97e480acabb87e.tar.gz lwn-3d2ba3fb544385f335ddb34afd97e480acabb87e.zip | |
Merge tag 'arm-soc/for-4.12/drivers-fixes' of http://github.com/Broadcom/stblinux into fixes
This pull request contains Broadcom SoC drivers fixes for 4.12, please
pull the following:
- Florian removes the duplicate compatible string matched by the
SUN_TOP_CTRL driver and instead uses the correct one for 7435
* tag 'arm-soc/for-4.12/drivers-fixes' of http://github.com/Broadcom/stblinux:
soc: bcm: brcmstb: Correctly match 7435 SoC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/bcm/brcmstb/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/bcm/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c index b6195fdf0d00..22e98a90468c 100644 --- a/drivers/soc/bcm/brcmstb/common.c +++ b/drivers/soc/bcm/brcmstb/common.c @@ -49,7 +49,7 @@ static const struct of_device_id sun_top_ctrl_match[] = { { .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,bcm7435-sun-top-ctrl", }, { .compatible = "brcm,brcmstb-sun-top-ctrl", }, { } }; |