diff options
author | Kevin Cernekee <cernekee@gmail.com> | 2014-11-25 19:49:48 -0500 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2015-01-21 20:25:32 -0500 |
commit | 79969f6aafcb4c5d02fc9b33afc58446e4e9dbac (patch) | |
tree | 834835a0ba35c5a08e3ed68a0dc40cdda492a4a0 | |
parent | bb1de7f61f1834af81a1665e6450f47dd18a0dd5 (diff) |
power/reset: brcmstb: Add support for old 65nm chips
The register bit fields are a little different, so add an entry and a
compatible string to accommodate them.
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r-- | Documentation/devicetree/bindings/arm/brcm-brcmstb.txt | 4 | ||||
-rw-r--r-- | drivers/power/reset/brcmstb-reboot.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/brcm-brcmstb.txt b/Documentation/devicetree/bindings/arm/brcm-brcmstb.txt index 3c436cc4f35d..430608ec09f0 100644 --- a/Documentation/devicetree/bindings/arm/brcm-brcmstb.txt +++ b/Documentation/devicetree/bindings/arm/brcm-brcmstb.txt | |||
@@ -79,7 +79,9 @@ reboot | |||
79 | Required properties | 79 | Required properties |
80 | 80 | ||
81 | - compatible | 81 | - compatible |
82 | The string property "brcm,brcmstb-reboot". | 82 | The string property "brcm,brcmstb-reboot" for 40nm/28nm chips with |
83 | the new SYS_CTRL interface, or "brcm,bcm7038-reboot" for 65nm | ||
84 | chips with the old SUN_TOP_CTRL interface. | ||
83 | 85 | ||
84 | - syscon | 86 | - syscon |
85 | A phandle / integer array that points to the syscon node which describes | 87 | A phandle / integer array that points to the syscon node which describes |
diff --git a/drivers/power/reset/brcmstb-reboot.c b/drivers/power/reset/brcmstb-reboot.c index af5aedf39261..884b53c483c0 100644 --- a/drivers/power/reset/brcmstb-reboot.c +++ b/drivers/power/reset/brcmstb-reboot.c | |||
@@ -88,8 +88,14 @@ static const struct reset_reg_mask reset_bits_40nm = { | |||
88 | .sw_mstr_rst_mask = BIT(0), | 88 | .sw_mstr_rst_mask = BIT(0), |
89 | }; | 89 | }; |
90 | 90 | ||
91 | static const struct reset_reg_mask reset_bits_65nm = { | ||
92 | .rst_src_en_mask = BIT(3), | ||
93 | .sw_mstr_rst_mask = BIT(31), | ||
94 | }; | ||
95 | |||
91 | static const struct of_device_id of_match[] = { | 96 | static const struct of_device_id of_match[] = { |
92 | { .compatible = "brcm,brcmstb-reboot", .data = &reset_bits_40nm }, | 97 | { .compatible = "brcm,brcmstb-reboot", .data = &reset_bits_40nm }, |
98 | { .compatible = "brcm,bcm7038-reboot", .data = &reset_bits_65nm }, | ||
93 | {}, | 99 | {}, |
94 | }; | 100 | }; |
95 | 101 | ||