summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorKevin Cernekee <cernekee@gmail.com>2014-11-26 01:49:48 +0100
committerSebastian Reichel <sre@kernel.org>2015-01-22 02:25:32 +0100
commit79969f6aafcb4c5d02fc9b33afc58446e4e9dbac (patch)
tree834835a0ba35c5a08e3ed68a0dc40cdda492a4a0 /drivers/power
parentpower/reset: brcmstb: Use the DT "compatible" string to indicate bit positions (diff)
downloadlinux-79969f6aafcb4c5d02fc9b33afc58446e4e9dbac.tar.xz
linux-79969f6aafcb4c5d02fc9b33afc58446e4e9dbac.zip
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>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/reset/brcmstb-reboot.c6
1 files changed, 6 insertions, 0 deletions
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 = {
.sw_mstr_rst_mask = BIT(0),
};
+static const struct reset_reg_mask reset_bits_65nm = {
+ .rst_src_en_mask = BIT(3),
+ .sw_mstr_rst_mask = BIT(31),
+};
+
static const struct of_device_id of_match[] = {
{ .compatible = "brcm,brcmstb-reboot", .data = &reset_bits_40nm },
+ { .compatible = "brcm,bcm7038-reboot", .data = &reset_bits_65nm },
{},
};