Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kevin Cernekee and committed by
Sebastian Reichel
79969f6a bb1de7f6

+9 -1
+3 -1
Documentation/devicetree/bindings/arm/brcm-brcmstb.txt
··· 79 79 Required properties 80 80 81 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 86 - syscon 85 87 A phandle / integer array that points to the syscon node which describes
+6
drivers/power/reset/brcmstb-reboot.c
··· 88 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 96 static const struct of_device_id of_match[] = { 92 97 { .compatible = "brcm,brcmstb-reboot", .data = &reset_bits_40nm }, 98 + { .compatible = "brcm,bcm7038-reboot", .data = &reset_bits_65nm }, 93 99 {}, 94 100 }; 95 101