OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2ea659a
)
soc: bcm: brcmstb: Correctly match 7435 SoC
author
Florian Fainelli
<f.fainelli@gmail.com>
Wed, 19 Apr 2017 16:58:23 +0000
(09:58 -0700)
committer
Florian Fainelli
<f.fainelli@gmail.com>
Sun, 14 May 2017 03:27:33 +0000
(20:27 -0700)
Remove the duplicate brcm,bcm7425-sun-top-ctrl compatible string and
replace it with brcm,bcm7435-sun-top-ctrl which was intended.
Fixes:
bd0faf08dc7f
("soc: bcm: brcmstb: Match additional compatible strings")
Reported-by: Andreas Oberritter <obi@saftware.de>
Acked-by: Gregory Fong <gregory.0xf0@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
drivers/soc/bcm/brcmstb/common.c
patch
|
blob
|
history
diff --git
a/drivers/soc/bcm/brcmstb/common.c
b/drivers/soc/bcm/brcmstb/common.c
index
b6195fd
..
22e98a9
100644
(file)
--- 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,bcm74
2
5-sun-top-ctrl", },
+ { .compatible = "brcm,bcm74
3
5-sun-top-ctrl", },
{ .compatible = "brcm,brcmstb-sun-top-ctrl", },
{ }
};