tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'clk-shmobile-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-next
+10
-6
+4
-2
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt
+4
-2
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt
···
10
10
- "renesas,r8a73a4-div6-clock" for R8A73A4 (R-Mobile APE6) DIV6 clocks
11
11
- "renesas,r8a7740-div6-clock" for R8A7740 (R-Mobile A1) DIV6 clocks
12
12
- "renesas,r8a7790-div6-clock" for R8A7790 (R-Car H2) DIV6 clocks
13
-
- "renesas,r8a7791-div6-clock" for R8A7791 (R-Car M2) DIV6 clocks
13
+
- "renesas,r8a7791-div6-clock" for R8A7791 (R-Car M2-W) DIV6 clocks
14
+
- "renesas,r8a7793-div6-clock" for R8A7793 (R-Car M2-N) DIV6 clocks
15
+
- "renesas,r8a7794-div6-clock" for R8A7794 (R-Car E2) DIV6 clocks
14
16
- "renesas,sh73a0-div6-clock" for SH73A0 (SH-Mobile AG5) DIV6 clocks
15
-
- "renesas,cpg-div6-clock" for generic DIV6 clocks
17
+
and "renesas,cpg-div6-clock" as a fallback.
16
18
- reg: Base address and length of the memory resource used by the DIV6 clock
17
19
- clocks: Reference to the parent clock(s); either one, four, or eight
18
20
clocks must be specified. For clocks with multiple parents, invalid
+4
-2
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+4
-2
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
···
13
13
- "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks
14
14
- "renesas,r8a73a4-mstp-clocks" for R8A73A4 (R-Mobile APE6) MSTP gate clocks
15
15
- "renesas,r8a7740-mstp-clocks" for R8A7740 (R-Mobile A1) MSTP gate clocks
16
+
- "renesas,r8a7778-mstp-clocks" for R8A7778 (R-Car M1) MSTP gate clocks
16
17
- "renesas,r8a7779-mstp-clocks" for R8A7779 (R-Car H1) MSTP gate clocks
17
18
- "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks
18
-
- "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks
19
+
- "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2-W) MSTP gate clocks
20
+
- "renesas,r8a7793-mstp-clocks" for R8A7793 (R-Car M2-N) MSTP gate clocks
19
21
- "renesas,r8a7794-mstp-clocks" for R8A7794 (R-Car E2) MSTP gate clocks
20
22
- "renesas,sh73a0-mstp-clocks" for SH73A0 (SH-MobileAG5) MSTP gate clocks
21
-
- "renesas,cpg-mstp-clock" for generic MSTP gate clocks
23
+
and "renesas,cpg-mstp-clocks" as a fallback.
22
24
- reg: Base address and length of the I/O mapped registers used by the MSTP
23
25
clocks. The first register is the clock control register and is mandatory.
24
26
The second register is the clock status register and is optional when not
+1
-1
Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
+1
-1
Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
···
10
10
- "renesas,r8a7791-cpg-clocks" for the r8a7791 CPG
11
11
- "renesas,r8a7793-cpg-clocks" for the r8a7793 CPG
12
12
- "renesas,r8a7794-cpg-clocks" for the r8a7794 CPG
13
-
- "renesas,rcar-gen2-cpg-clocks" for the generic R-Car Gen2 CPG
13
+
and "renesas,rcar-gen2-cpg-clocks" as a fallback.
14
14
15
15
- reg: Base address and length of the memory resource used by the CPG
16
16
+1
-1
Documentation/devicetree/bindings/clock/renesas,rz-cpg-clocks.txt
+1
-1
Documentation/devicetree/bindings/clock/renesas,rz-cpg-clocks.txt
···
7
7
8
8
- compatible: Must be one of
9
9
- "renesas,r7s72100-cpg-clocks" for the r7s72100 CPG
10
-
- "renesas,rz-cpg-clocks" for the generic RZ CPG
10
+
and "renesas,rz-cpg-clocks" as a fallback.
11
11
- reg: Base address and length of the memory resource used by the CPG
12
12
- clocks: References to possible parent clocks. Order must match clock modes
13
13
in the datasheet. For the r7s72100, this is extal, usb_x1.