aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Wang <frank.wang@rock-chips.com>2017-07-14 04:38:43 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-17 10:15:57 -0400
commitd6e4bd1b52bf35e7fc14b52be7dbe784896398e3 (patch)
tree1ee2edb127222cb0f437b51d0db961fa89e70c13
parentceb8a12ff2d4b085f7cee1ac44523ee63ce51e20 (diff)
nvmem: rockchip-efuse: amend compatible rk322x-efuse to rk3228-efuse
As the comments from Heiko Stuebner <heiko@sntech.de> that compatible should not contain any placeholders, this patch fix it for rk3228 SoC. Note that this is a fix for v4.13, due to fixing the current non-standard binding name that should not become part of an official kernel release. Signed-off-by: Frank Wang <frank.wang@rock-chips.com> Acked-by: Rob Herring <robh@kernel.org> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt2
-rw-r--r--drivers/nvmem/rockchip-efuse.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt
index 194926f77194..1ff02afdc55a 100644
--- a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt
+++ b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt
@@ -4,7 +4,7 @@ Required properties:
4- compatible: Should be one of the following. 4- compatible: Should be one of the following.
5 - "rockchip,rk3066a-efuse" - for RK3066a SoCs. 5 - "rockchip,rk3066a-efuse" - for RK3066a SoCs.
6 - "rockchip,rk3188-efuse" - for RK3188 SoCs. 6 - "rockchip,rk3188-efuse" - for RK3188 SoCs.
7 - "rockchip,rk322x-efuse" - for RK322x SoCs. 7 - "rockchip,rk3228-efuse" - for RK3228 SoCs.
8 - "rockchip,rk3288-efuse" - for RK3288 SoCs. 8 - "rockchip,rk3288-efuse" - for RK3288 SoCs.
9 - "rockchip,rk3399-efuse" - for RK3399 SoCs. 9 - "rockchip,rk3399-efuse" - for RK3399 SoCs.
10- reg: Should contain the registers location and exact eFuse size 10- reg: Should contain the registers location and exact eFuse size
diff --git a/drivers/nvmem/rockchip-efuse.c b/drivers/nvmem/rockchip-efuse.c
index a0d4ede9b8fc..63e3eb55f3ac 100644
--- a/drivers/nvmem/rockchip-efuse.c
+++ b/drivers/nvmem/rockchip-efuse.c
@@ -170,7 +170,7 @@ static const struct of_device_id rockchip_efuse_match[] = {
170 .data = (void *)&rockchip_rk3288_efuse_read, 170 .data = (void *)&rockchip_rk3288_efuse_read,
171 }, 171 },
172 { 172 {
173 .compatible = "rockchip,rk322x-efuse", 173 .compatible = "rockchip,rk3228-efuse",
174 .data = (void *)&rockchip_rk3288_efuse_read, 174 .data = (void *)&rockchip_rk3288_efuse_read,
175 }, 175 },
176 { 176 {