Skip to content

Commit 2aea0d1

Browse files
geertugregkh
authored andcommitted
dt-bindings: fuse: Move renesas,rcar-{efuse,otp} to nvmem
The R-Car E-FUSE blocks can be modelled better using the nvmem framework. Replace the R-Car V3U example by an R-Car S4-8 ES1.2 example, to show the definition of nvmem cells. While at it, drop unneeded labels from the examples, and fix indentation. Add an entry to the MAINTAINERS file. Reported-by: Arnd Bergmann <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Rob Herring (Arm) <[email protected]> Signed-off-by: Srinivas Kandagatla <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent eb33da0 commit 2aea0d1

File tree

3 files changed

+36
-17
lines changed

3 files changed

+36
-17
lines changed

Documentation/devicetree/bindings/fuse/renesas,rcar-efuse.yaml renamed to Documentation/devicetree/bindings/nvmem/renesas,rcar-efuse.yaml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/fuse/renesas,rcar-efuse.yaml#
4+
$id: http://devicetree.org/schemas/nvmem/renesas,rcar-efuse.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: R-Car E-FUSE connected to PFC
@@ -13,6 +13,9 @@ description:
1313
The E-FUSE is a type of non-volatile memory, which is accessible through the
1414
Pin Function Controller (PFC) on some R-Car Gen4 SoCs.
1515

16+
allOf:
17+
- $ref: nvmem.yaml#
18+
1619
properties:
1720
compatible:
1821
enum:
@@ -39,17 +42,27 @@ required:
3942
- power-domains
4043
- resets
4144

42-
additionalProperties: false
45+
unevaluatedProperties: false
4346

4447
examples:
4548
- |
46-
#include <dt-bindings/clock/r8a779a0-cpg-mssr.h>
47-
#include <dt-bindings/power/r8a779a0-sysc.h>
48-
49-
fuse: fuse@e6078800 {
50-
compatible = "renesas,r8a779a0-efuse";
51-
reg = <0xe6078800 0x100>;
52-
clocks = <&cpg CPG_MOD 916>;
53-
power-domains = <&sysc R8A779A0_PD_ALWAYS_ON>;
54-
resets = <&cpg 916>;
49+
#include <dt-bindings/clock/r8a779f0-cpg-mssr.h>
50+
#include <dt-bindings/power/r8a779f0-sysc.h>
51+
52+
fuse@e6078800 {
53+
compatible = "renesas,r8a779f0-efuse";
54+
reg = <0xe6078800 0x200>;
55+
clocks = <&cpg CPG_MOD 915>;
56+
power-domains = <&sysc R8A779F0_PD_ALWAYS_ON>;
57+
resets = <&cpg 915>;
58+
59+
nvmem-layout {
60+
compatible = "fixed-layout";
61+
#address-cells = <1>;
62+
#size-cells = <1>;
63+
64+
calib@144 {
65+
reg = <0x144 0x08>;
66+
};
67+
};
5568
};
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/fuse/renesas,rcar-otp.yaml#
4+
$id: http://devicetree.org/schemas/nvmem/renesas,rcar-otp.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: R-Car E-FUSE connected to OTP_MEM
@@ -13,6 +13,9 @@ description:
1313
The E-FUSE is a type of non-volatile memory, which is accessible through the
1414
One-Time Programmable Memory (OTP_MEM) module on some R-Car Gen4 SoCs.
1515

16+
allOf:
17+
- $ref: nvmem.yaml#
18+
1619
properties:
1720
compatible:
1821
enum:
@@ -22,17 +25,19 @@ properties:
2225
reg:
2326
items:
2427
- description: OTP_MEM_0
25-
- description: OTP_MEM_1
28+
- description: OTP_MEM_1.
29+
The addresses of cells defined under the optional nvmem-layout
30+
subnode are relative to this register bank.
2631

2732
required:
2833
- compatible
2934
- reg
3035

31-
additionalProperties: false
36+
unevaluatedProperties: false
3237

3338
examples:
3439
- |
35-
otp: otp@e61be000 {
36-
compatible = "renesas,r8a779g0-otp";
37-
reg = <0xe61be000 0x1000>, <0xe61bf000 0x1000>;
40+
otp@e61be000 {
41+
compatible = "renesas,r8a779g0-otp";
42+
reg = <0xe61be000 0x1000>, <0xe61bf000 0x1000>;
3843
};

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2922,6 +2922,7 @@ Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
29222922
C: irc://irc.libera.chat/renesas-soc
29232923
T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
29242924
F: Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
2925+
F: Documentation/devicetree/bindings/nvmem/renesas,*
29252926
F: Documentation/devicetree/bindings/soc/renesas/
29262927
F: arch/arm/boot/dts/renesas/
29272928
F: arch/arm/configs/shmobile_defconfig

0 commit comments

Comments
 (0)