Renesas R8A7790 Common Clock Framework support
Subsystems (4)
cover Renesas R8A7790 Common Clock Framework support
Hello,
This patch set adds CCF drivers for the clocks found in the Renesas R-Car R8A7790 (H2) SoC.
The patches are pretty self-explanatory and described in their respective commit message. The R8A7790 datasheet is unfortunately not publicly available.
The code is available in my git tree at
git://linuxtv.org/pinchartl/fbdev.git clocks/ccf/r8a7790
The branch is based on a merge of renesas-devel-20131016, v3.12-rc7 and multiarch drivers and clk-prepare patches I've posted earlier today. A full DT description of the R8A7790 clocks is available in the clocks/ccf/lager branch of the same repository (see "ARM: shmobile: r8a7790: Add clocks" and "ARM: shmobile: r8a7790: Reference clocks" patches).
Laurent Pinchart (3):
clk: shmobile: Add DIV6 clock support
clk: shmobile: Add MSTP clock support
clk: shmobile: Add R8A7790 clocks support
.../bindings/clock/renesas,cpg-div6-clocks.txt | 27 +++ .../bindings/clock/renesas,cpg-mstp-clocks.txt | 47 +++++ .../bindings/clock/renesas,r8a7790-cpg-clocks.txt | 26 +++ drivers/clk/shmobile/Makefile | 6 +- drivers/clk/shmobile/clk-div6.c | 185 +++++++++++++++++ drivers/clk/shmobile/clk-mstp.c | 229 +++++++++++++++++++++ drivers/clk/shmobile/clk-r8a7790.c | 176 ++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 66 ++++++ include/linux/clk/shmobile.h | 19 ++ 9 files changed, 780 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt create mode 100644 drivers/clk/shmobile/clk-div6.c create mode 100644 drivers/clk/shmobile/clk-mstp.c create mode 100644 drivers/clk/shmobile/clk-r8a7790.c create mode 100644 include/dt-bindings/clock/r8a7790-clock.h create mode 100644 include/linux/clk/shmobile.h
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 1/3 clk: shmobile: Add DIV6 clock support
DIV6 clocks are divider gate clocks controlled through a single register. The divider is expressed on 6 bits, hence the name, and can take values from 1/1 to 1/64.
Those clocks are found on Renesas ARM SoCs.
--- .../bindings/clock/renesas,cpg-div6-clocks.txt | 27 +++ drivers/clk/shmobile/Makefile | 4 +- drivers/clk/shmobile/clk-div6.c | 185 +++++++++++++++++++++ 3 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt create mode 100644 drivers/clk/shmobile/clk-div6.c
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +27 -0
@@ -0,0 +1,27 @@ +* Renesas CPG DIV6 Clock + +The CPG DIV6 clocks are variable factor clocks provided by the Clock Pulse +Generator (CPG). They clock input is divided by a configurable factor from 1 +to 64. + +Required Properties: + + - compatible: Must be one of the following + - "renesas,r8a7790-div6-clock" for R8A7790 (R-Car H2) DIV6 clocks + - "renesas,cpg-div6-clock" for generic DIV6 clocks + - reg: Base address and length of the memory resource used by the DIV6 clock + - clocks: Reference to the parent clock + - #clock-cells: Must be 0 + - clock-output-name: The name of the clock as a free-form string + + +Example +------- + + sd2_clk: sd2_clk { + compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150078 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "sd2"; + };
drivers/clk/shmobile/Makefile +3 -1
@@ -1,3 +1,5 @@ -obj-$(CONFIG_ARCH_EMEV2) += clk-emev2.o +obj-$(CONFIG_ARCH_EMEV2) += clk-emev2.o +obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o + # for emply built-in.o obj-n := dummy
drivers/clk/shmobile/clk-div6.c new file +185 -0
185 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 1/3 clk: shmobile: Add DIV6 clock support
Quoted 26 lines · Laurent Pinchart
DIV6 clocks are divider gate clocks controlled through a single register. The divider is expressed on 6 bits, hence the name, and can take values from 1/1 to 1/64.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by Laurent Pinchart <[email protected]>---
.../bindings/clock/renesas,cpg-div6-clocks.txt | 27 +++ drivers/clk/shmobile/Makefile | 4 +- drivers/clk/shmobile/clk-div6.c | 185 +++++++++++++++++++++ 3 files changed, 215 insertions(+), 1 deletion(-)create mode 100644
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txtcreate mode 100644drivers/clk/shmobile/clk-div6.cDocumentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +5
-0@@ -0,0 +1,27 @@ +* Renesas CPG DIV6 Clock + +The CPG DIV6 clocks are variable factor clocks provided by the Clock Pulse +Generator (CPG). They clock input is divided by a configurable factor from 1 +to 64.
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 15
Quoted 10 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +10
-0+ +Required Properties: + + - compatible: Must be one of the following + - "renesas,r8a7790-div6-clock" for R8A7790 (R-Car H2) DIV6 clocks + - "renesas,cpg-div6-clock" for generic DIV6 clocks + - reg: Base address and length of the memory resource used by the DIV6 clock + - clocks: Reference to the parent clock + - #clock-cells: Must be 0 + - clock-output-name: The name of the clock as a free-form string
Is this suppose to be 'clock-output-names' (missing a 's')?
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 21
Quoted 6 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +6
-0+ + +Example +------- + + sd2_clk: sd2_clk {
example should be sd2_clk at e6150078
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 23
Quoted 2 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +2
-0+ compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150078 0 4>;
curious, do you really have a second register at 0?
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 27
Quoted 4 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +4
-0+ clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "sd2"; + };
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 1/3 clk: shmobile: Add DIV6 clock support
Hi Kumar,
Thank you for the review.
Quoted 38 lines · On Tuesday 29 October 2013 18:33:00 Kumar Gala wrote:
Quoted 37 lines · Laurent Pinchart
DIV6 clocks are divider gate clocks controlled through a single register. The divider is expressed on 6 bits, hence the name, and can take values from 1/1 to 1/64.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by: Laurent Pinchart
<[email protected]>
---.../bindings/clock/renesas,cpg-div6-clocks.txt | 27 +++ drivers/clk/shmobile/Makefile | 4 +- drivers/clk/shmobile/clk-div6.c | 185 +++++++++++++++++ 3 files changed, 215 insertions(+), 1 deletion(-)create mode 100644
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txtcreate mode 100644drivers/clk/shmobile/clk-div6.cdiff --git
a/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txtb/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txtnew file mode 100644
index 0000000..8036f3cDocumentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +3
-0@@ -0,0 +1,27 @@ +* Renesas CPG DIV6 Clock + +The CPG DIV6 clocks are variable factor clocks provided by the ClockPulse
+Generator (CPG). They clock input is divided by a configurable factor from 1Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +6
-0+to 64. + +Required Properties: + + - compatible: Must be one of the following + - "renesas,r8a7790-div6-clock" for R8A7790 (R-Car H2) DIV6 clocks
Quoted 8 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 15
Quoted 6 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +2
-0+ - "renesas,cpg-div6-clock" for generic DIV6 clocks + - reg: Base address and length of the memory resource used by the DIV6clock
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +3
-0+ - clocks: Reference to the parent clock + - #clock-cells: Must be 0 + - clock-output-name: The name of the clock as a free-form stringIs this suppose to be 'clock-output-names' (missing a 's')?
Yes it is, my bad. I'll fix that.
Quoted 8 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 21
Quoted 6 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +6
-0+ + +Example +------- + + sd2_clk: sd2_clk {example should be
sd2_clkate6150078
You're absolutely right.
Quoted 1 line
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt
Quoted 1 line
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +1
-0+ compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-
clock";
Quoted 3 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 23
Quoted 1 line
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +1
-0+ reg = <0 0xe6150078 0 4>;curious, do you really have a second register at 0?
No, but the r8a7790 has #address-cells and #size-cells set to 2.
Quoted 4 lines
Quoted 4 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +4
-0+ clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "sd2"; + };
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 1/3 clk: shmobile: Add DIV6 clock support
Quoted 65 lines · Laurent Pinchart
Hi Kumar,
Thank you for the review.
Quoted 38 lines · On Tuesday 29 October 2013 18:33:00 Kumar Gala wrote:
Quoted 37 lines · Laurent Pinchart
DIV6 clocks are divider gate clocks controlled through a single register. The divider is expressed on 6 bits, hence the name, and can take values from 1/1 to 1/64.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by: Laurent Pinchart
<[email protected]>
---.../bindings/clock/renesas,cpg-div6-clocks.txt | 27 +++ drivers/clk/shmobile/Makefile | 4 +- drivers/clk/shmobile/clk-div6.c | 185 +++++++++++++++++ 3 files changed, 215 insertions(+), 1 deletion(-)create mode 100644
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txtcreate mode 100644drivers/clk/shmobile/clk-div6.cdiff --git
a/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txtb/Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txtnew file mode 100644
index 0000000..8036f3cDocumentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +3
-0@@ -0,0 +1,27 @@ +* Renesas CPG DIV6 Clock + +The CPG DIV6 clocks are variable factor clocks provided by the ClockPulse
+Generator (CPG). They clock input is divided by a configurable factor from 1Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +6
-0+to 64. + +Required Properties: + + - compatible: Must be one of the following + - "renesas,r8a7790-div6-clock" for R8A7790 (R-Car H2) DIV6 clocksQuoted 8 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 15
Quoted 6 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +2
-0+ - "renesas,cpg-div6-clock" for generic DIV6 clocks + - reg: Base address and length of the memory resource used by the DIV6clock
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +3
-0+ - clocks: Reference to the parent clock + - #clock-cells: Must be 0 + - clock-output-name: The name of the clock as a free-form stringIs this suppose to be 'clock-output-names' (missing a 's')?
Yes it is, my bad. I'll fix that.
Quoted 8 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 21
Quoted 6 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +6
-0+ + +Example +------- + + sd2_clk: sd2_clk {example should be
sd2_clkate6150078You're absolutely right.
Quoted 7 lines
Quoted 1 line
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt
Quoted 1 line
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +1
-0+ compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
Quoted 3 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 23
Quoted 1 line
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +1
-0+ reg = <0 0xe6150078 0 4>;curious, do you really have a second register at 0?
No, but the r8a7790 has #address-cells and #size-cells set to 2.
Oh, duh. Its been a while since I've seen a reg with cells being 2 ;)
Quoted 5 lines
Quoted 5 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt line 27
Quoted 5 lines
Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt new file +4
-0+ clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "sd2"; + };
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/3 clk: shmobile: Add MSTP clock support
In reply to Laurent PinchartMSTP clocks are gate clocks controlled through a register that handles up to 32 clocks. The register is often sparsely populated.
Those clocks are found on Renesas ARM SoCs.
--- .../bindings/clock/renesas,cpg-mstp-clocks.txt | 47 +++++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-mstp.c | 229 +++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 56 +++++ 4 files changed, 333 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt create mode 100644 drivers/clk/shmobile/clk-mstp.c create mode 100644 include/dt-bindings/clock/r8a7790-clock.h
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +47 -0
@@ -0,0 +1,47 @@ +* Renesas R8A7790 MSTP Clocks + +The CPG can gate SoC device clocks. The gates are organized in groups of up to +32 gates. + +This device tree binding describes a single 32 gate clocks group per node. +Clocks are referenced by user nodes by the MSTP node phandle and the clock +index in the group, from 0 to 31. + +Required Properties: + + - compatible: Must be one of the following + - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks + - "renesas,cpg-mstp-clock" for generic MSTP gate clocks + - reg: Base address and length of the memory resource used by the MSTP + clocks + - clocks: Reference to the parent clocks + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks as free-form strings + - renesas,indices: Index of the gate clocks (0 to 31) + +The clocks, clock-output-names and renesas,indices properties contain one +entry per gate. The MSTP groups are sparsely populated. Unimplemented gates +must not be declared. + + +Example +------- + + #include <dt-bindings/clock/r8a7790-clock.h> + + mstp3_clks: mstp3_clks { + compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; + clocks = <&cp_clk>, <&mmc1_clk>, <&sd3_clk>, <&sd2_clk>, + <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks R8A7790_CLK_SD0>, + <&mmc0_clk>; + #clock-cells = <1>; + clock-output-names = + "tpu0", "mmcif1", "sdhi3", "sdhi2", + "sdhi1", "sdhi0", "mmcif0"; + renesas,clock-indices = < + R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 + R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 + R8A7790_CLK_MMCIF0 + >; + };
drivers/clk/shmobile/Makefile +1 -0
@@ -1,5 +1,6 @@ obj-$(CONFIG_ARCH_EMEV2) += clk-emev2.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o +obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.o # for emply built-in.o obj-n := dummy
drivers/clk/shmobile/clk-mstp.c new file +229 -0
229 lines not on this page · raw message
include/dt-bindings/clock/r8a7790-clock.h new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 2/3 clk: shmobile: Add MSTP clock support
Quoted 22 lines · Laurent Pinchart
MSTP clocks are gate clocks controlled through a register that handles up to 32 clocks. The register is often sparsely populated.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by Laurent Pinchart <[email protected]>---
.../bindings/clock/renesas,cpg-mstp-clocks.txt | 47 +++++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-mstp.c | 229 +++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 56 +++++ 4 files changed, 333 insertions(+)create mode 100644
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtcreate mode 100644drivers/clk/shmobile/clk-mstp.c
create mode 100644include/dt-bindings/clock/r8a7790-clock.hDocumentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +0
-0
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 1
Quoted 1 line
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +1
-0@@ -0,0 +1,47 @@ +* Renesas R8A7790 MSTP Clocks
can we spell out MSTP once in the heading?
Quoted 9 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +9
-0+ +The CPG can gate SoC device clocks. The gates are organized in groups of up to +32 gates. + +This device tree binding describes a single 32 gate clocks group per node. +Clocks are referenced by user nodes by the MSTP node phandle and the clock +index in the group, from 0 to 31. + +Required Properties:
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 20
Quoted 10 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +10
-0+ + - compatible: Must be one of the following + - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks + - "renesas,cpg-mstp-clock" for generic MSTP gate clocks + - reg: Base address and length of the memory resource used by the MSTP + clocks + - clocks: Reference to the parent clocks + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks as free-form strings + - renesas,indices: Index of the gate clocks (0 to 31)
Index of the gate clock into what?
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 23
Quoted 3 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +3
-0+ +The clocks, clock-output-names and renesas,indices properties contain one +entry per gate. The MSTP groups are sparsely populated. Unimplemented gates
per gate clock. (?)
Quoted 14 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +14
-0+must not be declared. + + +Example +------- + + #include <dt-bindings/clock/r8a7790-clock.h> + + mstp3_clks: mstp3_clks { + compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; + clocks = <&cp_clk>, <&mmc1_clk>, <&sd3_clk>, <&sd2_clk>, + <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks R8A7790_CLK_SD0>, + <&mmc0_clk>;
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 47
Quoted 10 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +10
-0+ #clock-cells = <1>; + clock-output-names = + "tpu0", "mmcif1", "sdhi3", "sdhi2", + "sdhi1", "sdhi0", "mmcif0"; + renesas,clock-indices = < + R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 + R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 + R8A7790_CLK_MMCIF0 + >; + };
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/3 clk: shmobile: Add MSTP clock support
Hi Kumar,
Thank you for the review.
Quoted 19 lines · On Tuesday 29 October 2013 18:36:06 Kumar Gala wrote:
Quoted 18 lines · Laurent Pinchart
MSTP clocks are gate clocks controlled through a register that handles up to 32 clocks. The register is often sparsely populated.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by: Laurent Pinchart
<[email protected]>
---.../bindings/clock/renesas,cpg-mstp-clocks.txt | 47 +++++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-mstp.c | 229 +++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 56 +++++ 4 files changed, 333 insertions(+)create mode 100644
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtcreate mode 100644drivers/clk/shmobile/clk-mstp.ccreate mode 100644include/dt-bindings/clock/r8a7790-clock.h
Quoted 11 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 1
Quoted 9 lines
diff --git
a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtb/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtnew file mode 100644
index 0000000..b3a1ce0Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +1
-0@@ -0,0 +1,47 @@ +* Renesas R8A7790 MSTP Clockscan we spell out MSTP once in the heading?
Sure thing. It stands for Module Stop.
Quoted 17 lines
Quoted 17 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +2
-0+ +The CPG can gate SoC device clocks. The gates are organized in groups ofup to
+32 gates.Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +2
-0+ +This device tree binding describes a single 32 gate clocks group pernode.
+Clocks are referenced by user nodes by the MSTP node phandle and the clockDocumentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +6
-0+index in the group, from 0 to 31. + +Required Properties: + + - compatible: Must be one of the following + - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gateclocks
+ - "renesas,cpg-mstp-clock" for generic MSTP gate clocks
Quoted 8 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 20
Quoted 6 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +6
-0+ - reg: Base address and length of the memory resource used by the MSTP + clocks + - clocks: Reference to the parent clocks + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks as free-form strings + - renesas,indices: Index of the gate clocks (0 to 31)Index of the gate clock into what?
Into the 32 gates clock group. Groups have 32 entries with a 32-bit register that controls 32 gate clocks. The groups (and thus registers) are sparsly populated, this property lists the indices for the register bits corresponding to the clocks.
Would
- renesas,indices: Indices of the gate clocks into the group (0 to 31)
be explicit enough ?
Quoted 5 lines
Quoted 4 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +3
-0+ +The clocks, clock-output-names and renesas,indices properties contain one +entry per gate. The MSTP groups are sparsely populated. Unimplementedgates
per gate clock. (?)
I'll change that.
Quoted 9 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 32
Quoted 9 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +9
-0+must not be declared. + + +Example +------- + + #include <dt-bindings/clock/r8a7790-clock.h> + + mstp3_clks: mstp3_clks {
mstp3_clks at e615013c I suppose.
Quoted 1 line
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
Quoted 1 line
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +1
-0+ compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-
clocks";
Quoted 3 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
Quoted 3 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +3
-0+ reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; + clocks = <&cp_clk>, <&mmc1_clk>, <&sd3_clk>, <&sd2_clk>, + <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks
R8A7790_CLK_SD0>,
Quoted 11 lines
Quoted 11 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +11
-0+ <&mmc0_clk>; + #clock-cells = <1>; + clock-output-names = + "tpu0", "mmcif1", "sdhi3", "sdhi2", + "sdhi1", "sdhi0", "mmcif0"; + renesas,clock-indices = < + R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 + R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 + R8A7790_CLK_MMCIF0 + >; + };
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 2/3 clk: shmobile: Add MSTP clock support
Quoted 69 lines · Laurent Pinchart
Hi Kumar,
Thank you for the review.
Quoted 19 lines · On Tuesday 29 October 2013 18:36:06 Kumar Gala wrote:
Quoted 18 lines · Laurent Pinchart
MSTP clocks are gate clocks controlled through a register that handles up to 32 clocks. The register is often sparsely populated.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by: Laurent Pinchart
<[email protected]>
---.../bindings/clock/renesas,cpg-mstp-clocks.txt | 47 +++++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-mstp.c | 229 +++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 56 +++++ 4 files changed, 333 insertions(+)create mode 100644
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtcreate mode 100644drivers/clk/shmobile/clk-mstp.ccreate mode 100644include/dt-bindings/clock/r8a7790-clock.hQuoted 11 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 1
Quoted 9 lines
diff --git
a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtb/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtnew file mode 100644
index 0000000..b3a1ce0Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +1
-0@@ -0,0 +1,47 @@ +* Renesas R8A7790 MSTP Clockscan we spell out MSTP once in the heading?
Sure thing. It stands for Module Stop.
Quoted 17 lines
Quoted 17 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +2
-0+ +The CPG can gate SoC device clocks. The gates are organized in groups ofup to
+32 gates.Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +2
-0+ +This device tree binding describes a single 32 gate clocks group pernode.
+Clocks are referenced by user nodes by the MSTP node phandle and the clockDocumentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +6
-0+index in the group, from 0 to 31. + +Required Properties: + + - compatible: Must be one of the following + - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gateclocks
+ - "renesas,cpg-mstp-clock" for generic MSTP gate clocksQuoted 8 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 20
Quoted 6 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +6
-0+ - reg: Base address and length of the memory resource used by the MSTP + clocks + - clocks: Reference to the parent clocks + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks as free-form strings + - renesas,indices: Index of the gate clocks (0 to 31)Index of the gate clock into what?
Into the 32 gates clock group. Groups have 32 entries with a 32-bit register that controls 32 gate clocks. The groups (and thus registers) are sparsly populated, this property lists the indices for the register bits corresponding to the clocks.
Quoted 5 lines
Would
- renesas,indices: Indices of the gate clocks into the group (0 to 31)
be explicit enough ?
I'm still confused. As I look at the code, I'm not quite clear how renesas,indices relates to a register or register bits.
Quoted 9 lines
Quoted 6 lines
Quoted 5 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +3
-0+ +The clocks, clock-output-names and renesas,indices properties contain one +entry per gate. The MSTP groups are sparsely populated. Unimplementedgates
per gate clock. (?)
I'll change that.
Quoted 11 lines
Quoted 9 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 32
Quoted 9 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +9
-0+must not be declared. + + +Example +------- + + #include <dt-bindings/clock/r8a7790-clock.h> + + mstp3_clks: mstp3_clks {
mstp3_clksate615013cI suppose.
yes, missed that
`
Quoted 28 lines
Quoted 2 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
Quoted 2 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +1
-0+ compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
Quoted 3 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
Quoted 3 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +3
-0+ reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; + clocks = <&cp_clk>, <&mmc1_clk>, <&sd3_clk>, <&sd2_clk>, + <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks
R8A7790_CLK_SD0>,Quoted 11 lines
Quoted 11 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +11
-0+ <&mmc0_clk>; + #clock-cells = <1>; + clock-output-names = + "tpu0", "mmcif1", "sdhi3", "sdhi2", + "sdhi1", "sdhi0", "mmcif0"; + renesas,clock-indices = < + R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 + R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 + R8A7790_CLK_MMCIF0 + >; + };Signature · 8 lines
Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/3 clk: shmobile: Add MSTP clock support
Hi Kumar,
Quoted 69 lines · On Tuesday 29 October 2013 19:19:35 Kumar Gala wrote:
Quoted 68 lines · Laurent Pinchart
Quoted 19 lines · On Tuesday 29 October 2013 18:36:06 Kumar Gala wrote:
Quoted 18 lines · Laurent Pinchart
MSTP clocks are gate clocks controlled through a register that handles up to 32 clocks. The register is often sparsely populated.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by: Laurent Pinchart
<[email protected]>
---.../bindings/clock/renesas,cpg-mstp-clocks.txt | 47 +++++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-mstp.c | 229 +++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 56 +++++ 4 files changed, 333 insertions(+)create mode 100644
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtcreate mode 100644drivers/clk/shmobile/clk-mstp.ccreate mode 100644include/dt-bindings/clock/r8a7790-clock.hQuoted 13 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 1
Quoted 11 lines
diff --git
a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtb/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtnew
file mode 100644
index 0000000..b3a1ce0
---/dev/null
+++b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txtDocumentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +1
-0@@ -0,0 +1,47 @@ +* Renesas R8A7790 MSTP Clockscan we spell out MSTP once in the heading?
Sure thing. It stands for Module Stop.
Quoted 18 lines
Quoted 18 lines
(quoted diff) +2
-0+ +The CPG can gate SoC device clocks. The gates are organized in groupsof> up to
+32 gates.(quoted diff) +2
-0+ +This device tree binding describes a single 32 gate clocks group pernode.
+Clocks are referenced by user nodes by the MSTP node phandle and the clockDocumentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +6
-0+index in the group, from 0 to 31. + +Required Properties: + + - compatible: Must be one of the following + - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gateclocks
(quoted diff) +2
-0+ - "renesas,cpg-mstp-clock" for generic MSTP gate clocks + - reg: Base address and length of the memory resource used by theQuoted 8 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 20
Quoted 6 lines
MSTP
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +5
-0+ clocks + - clocks: Reference to the parent clocks + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks as free-form strings + - renesas,indices: Index of the gate clocks (0 to 31)Index of the gate clock into what?
Into the 32 gates clock group. Groups have 32 entries with a 32-bit register that controls 32 gate clocks. The groups (and thus registers) are sparsly populated, this property lists the indices for the register bits corresponding to the clocks.
Quoted 8 lines
Quoted 5 lines
Would
- renesas,indices: Indices of the gate clocks into the group (0 to 31)
be explicit enough ?
I'm still confused. As I look at the code, I'm not quite clear how renesas,indices relates to a register or register bits.
OK, this probably means that the documentation isn't clear enough. Let me try to explain the situation, I'll then rephrase the bindings documentation.
Renesas SoCs have a large number of gate clocks, referred to as the MSTP clocks. Those gate clocks are controlled by a single bit each. From a control point of view, those bits are located in 32-bit registers referred to as the MSTP registers. Each MSTP register can thus control up to 32 gate clocks. As they are sparsely populated they usually control less than 32 gate clocks and have reserved bits for the clocks that are not present in the hardware. The reserved bits are randomly placed in the registers.
On the DT side, each MSTP register gets a DT node. The clocks handled by that register are listed in DT. The driver needs to map each clock to its bit index in the MSTP register. There are two main ways to do so:
- Specifying all 32 bits in the DT node, with 32 parent clocks and 32 clock output names. Reserved bits would get a dummy parent and an empty clock output name. The bit index would in that case be the clock index in the clock output names list with a one-to-one mapping between the clock cell and the clock index in the clock output names list.
- Specifying the available clocks only. No dummy parent clock and empty clock output name would be used. In that case there would be no one-to-one mapping between the clock cell and the corresponding clock index in the clock output names list. The mapping is then specified through the renesas,clock-indices property. Each entry in the property stores the bit number of the corresponding clock in the MSTP register.
Let's take MSTP3 of the R8A7790 as an example. The register controls the following clocks:
0 IIC2
1-3 Reserved
4 TPU0
5 MMC1
6-9 Reserved
10 IrDA
11 SDHI3
12 SDHI2
13 SDHI1
14 SDHI0
15 MMC0
16-17 Reserved
18 IIC0
19 PCIEC
20-22 Reserved
23 IIC1
24-27 Reserved
28 SSUSB
29 CMT1
30 USBDMAC0
31 USBDMAC1
The corresponding DT node would thus have the following properties
clock-output-names = "iic2", "tpu0", "mmcif1", "irda", "sdhi3", "sdhi2", "sdhi1", "sdhi0", "mmcif0", "iic0", "pciec", "iic1", "ssusb", "cmt1", "usbdmac0", "usbcma1"; renesas,clock-indices = < 0 4 5 10 11 12 13 14 15 18 19 23 28 29 30 31 >
The clock cell in clock users corresponds to the hardware bit index, not the index of the clock in the clock output names list. To make referencing clocks less error-prone, macros are defined for all bit indices in <dt- bindings/clock/r8a7790-clock.h>. Using this macros in the provider, we get
renesas,clock-indices = < R8A7790_CLK_IIC0 R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_IRDA R8A7790_CLK_SDHI3 R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 R8A7790_CLK_MMCIF0 R8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1 R8A7790_CLK_USBDMAC0 R8A7790_CLK_USBDMAC1 >;
Is the explanation clear enough ?
Quoted 46 lines
Quoted 10 lines
Quoted 7 lines
Quoted 5 lines
(quoted diff) +2
-0+ +The clocks, clock-output-names and renesas,indices properties containone
+entry per gate. The MSTP groups are sparsely populated. Unimplemented gatesper gate clock. (?)
I'll change that.
Quoted 11 lines
Quoted 9 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt line 32
Quoted 9 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +9
-0+must not be declared. + + +Example +------- + + #include <dt-bindings/clock/r8a7790-clock.h> + + mstp3_clks: mstp3_clks {
mstp3_clksate615013cI suppose.yes, missed that
`Quoted 21 lines
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +1
-0+ compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
Quoted 3 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
Quoted 3 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +3
-0+ reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; + clocks = <&cp_clk>, <&mmc1_clk>, <&sd3_clk>, <&sd2_clk>, + <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks
R8A7790_CLK_SD0>,Quoted 11 lines
Quoted 11 lines
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt new file +11
-0+ <&mmc0_clk>; + #clock-cells = <1>; + clock-output-names = + "tpu0", "mmcif1", "sdhi3", "sdhi2", + "sdhi1", "sdhi0", "mmcif0"; + renesas,clock-indices = < + R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 + R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 + R8A7790_CLK_MMCIF0 + >; + };
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 2/3 clk: shmobile: Add MSTP clock support
In reply to Laurent PinchartQuoted 15 lines · Laurent Pinchart
MSTP clocks are gate clocks controlled through a register that handles up to 32 clocks. The register is often sparsely populated.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by Laurent Pinchart <[email protected]>--- .../bindings/clock/renesas,cpg-mstp-clocks.txt | 47 +++++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-mstp.c | 229 +++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 56 +++++ 4 files changed, 333 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt create mode 100644 drivers/clk/shmobile/clk-mstp.c create mode 100644 include/dt-bindings/clock/r8a7790-clock.h
[snip]
include/dt-bindings/clock/r8a7790-clock.h
Quoted 5 lines
include/dt-bindings/clock/r8a7790-clock.h new file +0
-0
I wonder if it would be best to put this in a separate patch as it is SoC-specific.
Quoted 5 lines
include/dt-bindings/clock/r8a7790-clock.h new file +4
-0@@ -0,0 +1,56 @@ +/* +* Copyright 2013 Ideas On Board SPRL +* +* This program is free software; you can redistribute it and/or modify
include/dt-bindings/clock/r8a7790-clock.h line 14
Quoted 10 lines
include/dt-bindings/clock/r8a7790-clock.h new file +10
-0+* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +#ifndef __DT_BINDINGS_CLOCK_R8A7790_H__ +#define __DT_BINDINGS_CLOCK_R8A7790_H__ + +/* MSTP1 */ +#define R8A7790_CLK_CMT0 20
I believe that R8A7790_CLK_CMT0 should be 24.
Quoted 50 lines
include/dt-bindings/clock/r8a7790-clock.h new file +42
-0+ +/* MSTP2 */ +#define R8A7790_CLK_SCIFA2 2 +#define R8A7790_CLK_SCIFA1 3 +#define R8A7790_CLK_SCIFA0 4 +#define R8A7790_CLK_SCIFB0 6 +#define R8A7790_CLK_SCIFB1 7 +#define R8A7790_CLK_SCIFB2 16 + +/* MSTP3 */ +#define R8A7790_CLK_TPU0 4 +#define R8A7790_CLK_MMCIF1 5 +#define R8A7790_CLK_SDHI3 11 +#define R8A7790_CLK_SDHI2 12 +#define R8A7790_CLK_SDHI1 13 +#define R8A7790_CLK_SDHI0 14 +#define R8A7790_CLK_MMCIF0 15 + +/* MSTP5 */ +#define R8A7790_CLK_THERMAL 22 + +/* MSTP7 */ +#define R8A7790_CLK_HSCIF1 16 +#define R8A7790_CLK_HSCIF0 17 +#define R8A7790_CLK_SCIF1 20 +#define R8A7790_CLK_SCIF0 21 +#define R8A7790_CLK_DU2 22 +#define R8A7790_CLK_DU1 23 +#define R8A7790_CLK_DU0 24 +#define R8A7790_CLK_LVDS1 25 +#define R8A7790_CLK_LVDS0 26 + +/* MSTP8 */ +#define R8A7790_CLK_ETHER 13 + +/* MSTP9 */ +#define R8A7790_CLK_I2C3 28 +#define R8A7790_CLK_I2C2 29 +#define R8A7790_CLK_I2C1 30 +#define R8A7790_CLK_I2C0 31 + +#endif /* __DT_BINDINGS_CLOCK_R8A7790_H__ */ Signature · 6 lines
1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/3 clk: shmobile: Add MSTP clock support
Hi Simon,
Quoted 40 lines · On Wednesday 06 November 2013 11:09:31 Simon Horman wrote:
Quoted 18 lines · Laurent Pinchart
MSTP clocks are gate clocks controlled through a register that handles up to 32 clocks. The register is often sparsely populated.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by: Laurent Pinchart
<[email protected]>
---.../bindings/clock/renesas,cpg-mstp-clocks.txt | 47 +++++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-mstp.c | 229 ++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 56 +++++ 4 files changed, 333 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt create mode 100644 drivers/clk/shmobile/clk-mstp.c create mode 100644 include/dt-bindings/clock/r8a7790-clock.h[snip]
include/dt-bindings/clock/r8a7790-clock.h
Quoted 5 lines
(quoted diff) +0
-0
b/include/dt-bindings/clock/r8a7790-clock.hnew file mode 100644 index 0000000..19f2b48include/dt-bindings/clock/r8a7790-clock.h new file +0
-0I wonder if it would be best to put this in a separate patch as it is SoC-specific.
Quoted 9 lines
include/dt-bindings/clock/r8a7790-clock.h new file +8
-0@@ -0,0 +1,56 @@ +/* +* Copyright 2013 Ideas On Board SPRL +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/
Quoted 8 lines
include/dt-bindings/clock/r8a7790-clock.h line 14
Quoted 6 lines
include/dt-bindings/clock/r8a7790-clock.h new file +6
-0+ +#ifndef __DT_BINDINGS_CLOCK_R8A7790_H__ +#define __DT_BINDINGS_CLOCK_R8A7790_H__ + +/* MSTP1 */ +#define R8A7790_CLK_CMT0 20I believe that
R8A7790_CLK_CMT0should be 24.
Good catch, thank you.
Quoted 42 lines
Quoted 42 lines
include/dt-bindings/clock/r8a7790-clock.h new file +42
-0+ +/* MSTP2 */ +#define R8A7790_CLK_SCIFA2 2 +#define R8A7790_CLK_SCIFA1 3 +#define R8A7790_CLK_SCIFA0 4 +#define R8A7790_CLK_SCIFB0 6 +#define R8A7790_CLK_SCIFB1 7 +#define R8A7790_CLK_SCIFB2 16 + +/* MSTP3 */ +#define R8A7790_CLK_TPU0 4 +#define R8A7790_CLK_MMCIF1 5 +#define R8A7790_CLK_SDHI3 11 +#define R8A7790_CLK_SDHI2 12 +#define R8A7790_CLK_SDHI1 13 +#define R8A7790_CLK_SDHI0 14 +#define R8A7790_CLK_MMCIF0 15 + +/* MSTP5 */ +#define R8A7790_CLK_THERMAL 22 + +/* MSTP7 */ +#define R8A7790_CLK_HSCIF1 16 +#define R8A7790_CLK_HSCIF0 17 +#define R8A7790_CLK_SCIF1 20 +#define R8A7790_CLK_SCIF0 21 +#define R8A7790_CLK_DU2 22 +#define R8A7790_CLK_DU1 23 +#define R8A7790_CLK_DU0 24 +#define R8A7790_CLK_LVDS1 25 +#define R8A7790_CLK_LVDS0 26 + +/* MSTP8 */ +#define R8A7790_CLK_ETHER 13 + +/* MSTP9 */ +#define R8A7790_CLK_I2C3 28 +#define R8A7790_CLK_I2C2 29 +#define R8A7790_CLK_I2C1 30 +#define R8A7790_CLK_I2C0 31 + +#endif /* __DT_BINDINGS_CLOCK_R8A7790_H__ */
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 2/3 clk: shmobile: Add MSTP clock support
In reply to Laurent PinchartHi Laurent,
Quoted 6 lines · Laurent Pinchart
MSTP clocks are gate clocks controlled through a register that handles up to 32 clocks. The register is often sparsely populated.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by Laurent Pinchart <[email protected]>
Quoted 8 lines
--- .../bindings/clock/renesas,cpg-mstp-clocks.txt | 47 +++++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-mstp.c | 229 +++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 56 +++++ 4 files changed, 333 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt create mode 100644 drivers/clk/shmobile/clk-mstp.c
Thanks for this. The MSTP driver looks fine to me, but..
Quoted 1 line
create mode 100644 include/dt-bindings/clock/r8a7790-clock.h
.. why do you bundle r8a7790-specific bits with the generic MSTP driver in this patch?
It looks to me that you want these r8a7790 bits included with the r8a7790 support code.
Cheers,
/ magnus
PATCH 2/3 clk: shmobile: Add MSTP clock support
Hi Magnus,
Quoted 21 lines · On Wednesday 06 November 2013 17:33:39 Magnus Damm wrote:
Quoted 9 lines · Laurent Pinchart
MSTP clocks are gate clocks controlled through a register that handles up to 32 clocks. The register is often sparsely populated.
Those clocks are found on Renesas ARM SoCs.
Signed-off-by: Laurent Pinchart
<[email protected]>
---Quoted 8 lines
.../bindings/clock/renesas,cpg-mstp-clocks.txt | 47 +++++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-mstp.c | 229 ++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 56 +++++ 4 files changed, 333 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt create mode 100644 drivers/clk/shmobile/clk-mstp.cThanks for this. The MSTP driver looks fine to me, but..
Quoted 7 lines
Quoted 1 line
create mode 100644 include/dt-bindings/clock/r8a7790-clock.h.. why do you bundle r8a7790-specific bits with the generic MSTP driver in this patch?
It looks to me that you want these r8a7790 bits included with the r8a7790 support code.
My mistake, I'll fix that.
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
In reply to Laurent PinchartThe R8A7790 has several clocks that are too custom to be supported in a generic driver. Those clocks can be divided in two categories:
- Fixed rate clocks with multiplier and divisor set according to boot mode configuration
- Custom divider clocks with SoC-specific divider values
This driver supports both.
--- .../bindings/clock/renesas,r8a7790-cpg-clocks.txt | 26 +++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-r8a7790.c | 176 +++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 10 ++ include/linux/clk/shmobile.h | 19 +++ 5 files changed, 232 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt create mode 100644 drivers/clk/shmobile/clk-r8a7790.c create mode 100644 include/linux/clk/shmobile.h
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +26 -0
@@ -0,0 +1,26 @@ +* Renesas R8A7790 Clock Pulse Generator (CPG) + +The CPG generates core clocks for the R8A7790. It includes three PLLs and +several fixed ratio dividers. + +Required Properties: + + - compatible: Must be "renesas,r8a7790-cpg-clocks" + - reg: Base address and length of the memory resource used by the CPG + - clocks: Reference to the parent clock + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks, must be "main", "pll1", + "pll3", "lb", "qspi", "sdh", "sd0", "sd1". + + +Example +------- + + cpg_clocks: cpg_clocks { + compatible = "renesas,r8a7790-cpg-clocks"; + reg = <0 0xe6150000 0 0x1000>; + clocks = <&extal_clk>; + #clock-cells = <1>; + clock-output-names = "main", "pll1", "pll3", "lb", + "qspi", "sdh", "sd0", "sd1"; + };
drivers/clk/shmobile/Makefile +1 -0
@@ -1,4 +1,5 @@ obj-$(CONFIG_ARCH_EMEV2) += clk-emev2.o +obj-$(CONFIG_ARCH_R8A7790) += clk-r8a7790.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.o
drivers/clk/shmobile/clk-r8a7790.c new file +176 -0
176 lines not on this page · raw message
include/dt-bindings/clock/r8a7790-clock.h +10 -0
@@ -10,6 +10,16 @@#ifndef __DT_BINDINGS_CLOCK_R8A7790_H__#define __DT_BINDINGS_CLOCK_R8A7790_H__ +/* CPG */ +#define R8A7790_CLK_MAIN 0 +#define R8A7790_CLK_PLL1 1 +#define R8A7790_CLK_PLL3 2 +#define R8A7790_CLK_LB 3 +#define R8A7790_CLK_QSPI 4 +#define R8A7790_CLK_SDH 5 +#define R8A7790_CLK_SD0 6 +#define R8A7790_CLK_SD1 7 +/* MSTP1 */ #define R8A7790_CLK_CMT0 20
include/linux/clk/shmobile.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* Copyright 2013 Ideas On Board SPRL +* +* Contact: Laurent Pinchart <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +#ifndef __LINUX_CLK_SHMOBILE_H_ +#define __LINUX_CLK_SHMOBILE_H_ + +#include <linux/types.h> + +void r8a7790_clocks_init (u32 mode); + +#endif
Signature · 1 line
1.8.1.5
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Quoted 37 lines · Laurent Pinchart
The R8A7790 has several clocks that are too custom to be supported in a generic driver. Those clocks can be divided in two categories:
- Fixed rate clocks with multiplier and divisor set according to boot mode configuration
- Custom divider clocks with SoC-specific divider values
This driver supports both.
Signed-off-by Laurent Pinchart <[email protected]>---
.../bindings/clock/renesas,r8a7790-cpg-clocks.txt | 26 +++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-r8a7790.c | 176 +++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 10 ++ include/linux/clk/shmobile.h | 19 +++ 5 files changed, 232 insertions(+)create mode 100644
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txtcreate mode 100644drivers/clk/shmobile/clk-r8a7790.c
create mode 100644include/linux/clk/shmobile.hDocumentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +9
-0@@ -0,0 +1,26 @@ +* Renesas R8A7790 Clock Pulse Generator (CPG) + +The CPG generates core clocks for the R8A7790. It includes three PLLs and +several fixed ratio dividers. + +Required Properties: + + - compatible: Must be "renesas,r8a7790-cpg-clocks" + - reg: Base address and length of the memory resource used by the CPG
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt line 19
Quoted 10 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +10
-0+ - clocks: Reference to the parent clock + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks, must be "main", "pll1", + "pll3", "lb", "qspi", "sdh", "sd0", "sd1". + + +Example +------- + + cpg_clocks: cpg_clocks {
cpg_clocks at e6150000
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt line 26
Quoted 7 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +7
-0+ compatible = "renesas,r8a7790-cpg-clocks"; + reg = <0 0xe6150000 0 0x1000>; + clocks = <&extal_clk>; + #clock-cells = <1>; + clock-output-names = "main", "pll1", "pll3", "lb", + "qspi", "sdh", "sd0", "sd1"; + };
Other than minor nit, ack.
For the DT-Binding portion:
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
In reply to Laurent PinchartQuoted 236 lines · Laurent Pinchart
The R8A7790 has several clocks that are too custom to be supported in a generic driver. Those clocks can be divided in two categories:
- Fixed rate clocks with multiplier and divisor set according to boot mode configuration
- Custom divider clocks with SoC-specific divider values
This driver supports both.
Signed-off-by Laurent Pinchart <[email protected]>--- .../bindings/clock/renesas,r8a7790-cpg-clocks.txt | 26 +++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-r8a7790.c | 176 +++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 10 ++ include/linux/clk/shmobile.h | 19 +++ 5 files changed, 232 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt create mode 100644 drivers/clk/shmobile/clk-r8a7790.c create mode 100644 include/linux/clk/shmobile.hDocumentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +26
-0@@ -0,0 +1,26 @@ +* Renesas R8A7790 Clock Pulse Generator (CPG) + +The CPG generates core clocks for the R8A7790. It includes three PLLs and +several fixed ratio dividers. + +Required Properties: + + - compatible: Must be "renesas,r8a7790-cpg-clocks" + - reg: Base address and length of the memory resource used by the CPG + - clocks: Reference to the parent clock + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks, must be "main", "pll1", + "pll3", "lb", "qspi", "sdh", "sd0", "sd1". + + +Example +------- + + cpg_clocks: cpg_clocks { + compatible = "renesas,r8a7790-cpg-clocks"; + reg = <0 0xe6150000 0 0x1000>; + clocks = <&extal_clk>; + #clock-cells = <1>; + clock-output-names = "main", "pll1", "pll3", "lb", + "qspi", "sdh", "sd0", "sd1"; + };drivers/clk/shmobile/Makefile +1
-0@@ -1,4 +1,5 @@ obj-$(CONFIG_ARCH_EMEV2) += clk-emev2.o +obj-$(CONFIG_ARCH_R8A7790) += clk-r8a7790.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.odrivers/clk/shmobile/clk-r8a7790.c new file +166
-0@@ -0,0 +1,176 @@ +/* +* r8a7790 Core CPG Clocks +* +* Copyright (C) 2013 Ideas On Board SPRL +* +* Contact: Laurent Pinchart <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; version 2 of the License. +*/ + +#include <linux/clk-provider.h> +#include <linux/clkdev.h> +#include <linux/clk/shmobile.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/spinlock.h> + +#include <dt-bindings/clock/r8a7790-clock.h> + +#define CPG_NUM_CLOCKS (R8A7790_CLK_SD1 + 1) + +struct r8a7790_cpg { +struct clk_onecell_data data; +spinlock_t lock; +void __iomem *reg; +}; + +/* +* MD EXTAL PLL0 PLL1 PLL3 +* 14 13 19 (MHz) *1 *1 +*--------------------------------------------------- +* 0 0 0 15 x 1 x172/2 x208/2 x106 +* 0 0 1 15 x 1 x172/2 x208/2 x88 +* 0 1 0 20 x 1 x130/2 x156/2 x80 +* 0 1 1 20 x 1 x130/2 x156/2 x66 +* 1 0 0 26 / 2 x200/2 x240/2 x122 +* 1 0 1 26 / 2 x200/2 x240/2 x102 +* 1 1 0 30 / 2 x172/2 x208/2 x106 +* 1 1 1 30 / 2 x172/2 x208/2 x88 +* +* *1 : Table 7.6 indicates VCO ouput (PLLx = VCO/2) +*/ +#define CPG_PLL_CONFIG_INDEX (md) ((((md) & BIT(14)) >> 12) | \ + (((md) & BIT(13)) >> 12) | \ + (((md) & BIT(19)) >> 19)) +struct cpg_pll_config { +unsigned int extal_div; +unsigned int pll1_mult; +unsigned int pll3_mult; +}; + +static const struct cpg_pll_config cpg_pll_configs[8 ] = { + {1 ,208 ,106 }, {1 ,208 ,88 }, {1 ,156 ,80 }, {1 ,156 ,66 }, + {2 ,240 ,122 }, {2 ,240 ,102 }, {2 ,208 ,106 }, {2 ,208 ,88 }, +}; + +/* SDHI divisors */ +static const struct clk_div_table cpg_sdh_div_table[] = { + {0 ,2 }, {1 ,3 }, {2 ,4 }, {3 ,6 }, + {4 ,8 }, {5 ,12 }, {6 ,16 }, {7 ,18 }, + {8 ,24 }, {10 ,36 }, {11 ,48 }, {0 ,0 }, +}; + +static const struct clk_div_table cpg_sd01_div_table[] = { + {5 ,12 }, {6 ,16 }, {7 ,18 }, {8 ,24 }, + {10 ,36 }, {11 ,48 }, {12 ,10 }, {0 ,0 }, +}; + +static u32 cpg_mode__initdata ; + +#define CPG_SDCKCR 0x00000074 + +static void __init r8a7790_cpg_clocks_init (struct device_node *np) +{ +const struct cpg_pll_config *config; +struct r8a7790_cpg *cpg; +struct clk **clks; +unsigned int i; + + cpg =kzalloc (sizeof (*cpg),GFP_KERNEL ); + clks =kzalloc (CPG_NUM_CLOCKS *sizeof (*clks),GFP_KERNEL ); +if (cpg ==NULL || clks ==NULL ) { +kfree (clks); +kfree (cpg); +pr_err ("%s: failed to allocate cpg\n" , __func__); +return ; + } + +spin_lock_init (&cpg->lock); + + cpg->data.clks = clks; + cpg->data.clk_num =CPG_NUM_CLOCKS ; + + cpg->reg =of_iomap (np,0 ); +if (WARN_ON (cpg->reg ==NULL )) { +kfree (cpg->data.clks); +kfree (cpg); +return ; + } + + config = &cpg_pll_configs[CPG_PLL_CONFIG_INDEX (cpg_mode)]; + +for (i =0 ; i <CPG_NUM_CLOCKS ; ++i) { +const struct clk_div_table *table =NULL ; +const char *parent_name ="main" ; +const char *name; +unsigned int shift; +unsigned int mult =1 ; +unsigned int div =1 ; +struct clk *clk; + +of_property_read_string_index (np,"clock-output-names" , i, + &name); + +switch (i) { +case R8A7790_CLK_MAIN : + parent_name =of_clk_get_parent_name (np,0 ); + div = config->extal_div; +break ; +case R8A7790_CLK_PLL1 : + mult = config->pll1_mult /2 ; +break ; +case R8A7790_CLK_PLL3 : + mult = config->pll3_mult; +break ; +case R8A7790_CLK_LB : + div = cpg_mode &BIT (18 ) ?36 :24 ; +break ; +case R8A7790_CLK_QSPI : + div = (cpg_mode & (BIT (3 ) |BIT (2 ) |BIT (1 ))) ==BIT (2 ) + ?16 :20 ; +break ; +case R8A7790_CLK_SDH : + table = cpg_sdh_div_table; + shift =8 ; +break ; +case R8A7790_CLK_SD0 : + table = cpg_sd01_div_table; + shift =4 ; +break ; +case R8A7790_CLK_SD1 : + table = cpg_sd01_div_table; + shift =0 ; +break ; + } + +if (!table) + clk =clk_register_fixed_factor (NULL , name, parent_name, +0 , mult, div); +else + clk =clk_register_divider_table (NULL , name, + parent_name,0 , + cpg->reg +CPG_SDCKCR , + shift,4 ,0 , table, + &cpg->lock); + +if (IS_ERR (clk)) +pr_err ("%s: failed to register %s %s clock (%ld)\n" , + __func__, np->name, name,PTR_ERR (clk)); + } + +of_clk_add_provider (np, of_clk_src_onecell_get, &cpg->data);
drivers/clk/shmobile/clk-r8a7790.c line 176
Quoted 10 lines
drivers/clk/shmobile/clk-r8a7790.c new file +10
-0+} +CLK_OF_DECLARE (r8a7790_cpg_clks,"renesas,r8a7790-cpg-clocks" , + r8a7790_cpg_clocks_init); + +void __init r8a7790_clocks_init (u32 mode) +{ + cpg_mode = mode; + +of_clk_init (NULL ); +}
Hi Laurent,
Thanks a lot for your efforts on this. In general I think it all looks good, I have however one question regarding the "probe" interface between the SoC code in arch/arm/mach-shmobile and drivers/clk. The code above in r8a7790_clocks_init() looks a bit spaghetti-style to me, perhaps it is possible to make it cleaner somehow?
I realize that you need some way to read out the mode pin setting, and that is currently provided by the SoC code in arch/arm/mach-shmobile/. Today it seems that you instead of letting the drivers/clk/ code call SoC code to get the mode pin setting (and add a SoC link dependency) you simply feed the settings to the clk code from the SoC code using the parameter to r8a7790_clocks_init(). This direction seems good to me. I'm however not too keen on the current symbol dependency in the "other" direction.
If possible I'd like to keep the interface between the SoC code and the driver code to "standard" driver model functions. For instance, using of_clk_init(NULL) from the SoC code seems like a pretty good standard interface - without any link time dependencies. So with the current code, the r8a7790_clocks_init() function somehow goes against this no-symbol-dependency preference that I happen to have. =)
Would it for instance be possible let the SoC code read out the mode pin setting, and then pass the current setting using the argument of of_clk_init() to select different dividers? That way the symbol dependency goes away. Or maybe it becomes too verbose?
Let me know what you think. I would like to follow the same style for r8a7791.
Cheers,
/ magnus
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Magnus,
(And a question for Mike below)
Quoted 261 lines · On Tuesday 05 November 2013 16:56:40 Magnus Damm wrote:
Quoted 247 lines · Laurent Pinchart
The R8A7790 has several clocks that are too custom to be supported in a generic driver. Those clocks can be divided in two categories:
- Fixed rate clocks with multiplier and divisor set according to boot mode configuration
- Custom divider clocks with SoC-specific divider values
This driver supports both.
Signed-off-by: Laurent Pinchart
<[email protected]>
---.../bindings/clock/renesas,r8a7790-cpg-clocks.txt | 26 +++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-r8a7790.c | 176 ++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 10 ++ include/linux/clk/shmobile.h | 19 +++ 5 files changed, 232 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt create mode 100644 drivers/clk/shmobile/clk-r8a7790.c create mode 100644 include/linux/clk/shmobile.hdiff --git
a/Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txtb/Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txtnew file mode 100644
index 0000000..d889917
---/dev/null
+++b/Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txtDocumentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +26
-0@@ -0,0 +1,26 @@ +* Renesas R8A7790 Clock Pulse Generator (CPG) + +The CPG generates core clocks for the R8A7790. It includes three PLLs and +several fixed ratio dividers. + +Required Properties: + + - compatible: Must be "renesas,r8a7790-cpg-clocks" + - reg: Base address and length of the memory resource used by the CPG + - clocks: Reference to the parent clock + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks, must be "main", "pll1", + "pll3", "lb", "qspi", "sdh", "sd0", "sd1". + + +Example +------- + + cpg_clocks: cpg_clocks { + compatible = "renesas,r8a7790-cpg-clocks"; + reg = <0 0xe6150000 0 0x1000>; + clocks = <&extal_clk>; + #clock-cells = <1>; + clock-output-names = "main", "pll1", "pll3", "lb", + "qspi", "sdh", "sd0", "sd1"; + };drivers/clk/shmobile/Makefile +1
-0@@ -1,4 +1,5 @@ obj-$(CONFIG_ARCH_EMEV2) += clk-emev2.o +obj-$(CONFIG_ARCH_R8A7790) += clk-r8a7790.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.o(quoted diff) +0
-0
b/drivers/clk/shmobile/clk-r8a7790.cnew file mode 100644 index 0000000..2e76638drivers/clk/shmobile/clk-r8a7790.c new file +57
-0@@ -0,0 +1,176 @@ +/* +* r8a7790 Core CPG Clocks +* +* Copyright (C) 2013 Ideas On Board SPRL +* +* Contact: Laurent Pinchart <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; version 2 of the License. +*/ + +#include <linux/clk-provider.h> +#include <linux/clkdev.h> +#include <linux/clk/shmobile.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/spinlock.h> + +#include <dt-bindings/clock/r8a7790-clock.h> + +#define CPG_NUM_CLOCKS (R8A7790_CLK_SD1 + 1) + +struct r8a7790_cpg { +struct clk_onecell_data data; +spinlock_t lock; +void __iomem *reg; +}; + +/* +* MD EXTAL PLL0 PLL1 PLL3 +* 14 13 19 (MHz) *1 *1 +*--------------------------------------------------- +* 0 0 0 15 x 1 x172/2 x208/2 x106 +* 0 0 1 15 x 1 x172/2 x208/2 x88 +* 0 1 0 20 x 1 x130/2 x156/2 x80 +* 0 1 1 20 x 1 x130/2 x156/2 x66 +* 1 0 0 26 / 2 x200/2 x240/2 x122 +* 1 0 1 26 / 2 x200/2 x240/2 x102 +* 1 1 0 30 / 2 x172/2 x208/2 x106 +* 1 1 1 30 / 2 x172/2 x208/2 x88 +* +* *1 : Table 7.6 indicates VCO ouput (PLLx = VCO/2) +*/ +#define CPG_PLL_CONFIG_INDEX (md) ((((md) & BIT(14)) >> 12) | \ + (((md) & BIT(13)) >> 12) | \ + (((md) & BIT(19)) >> 19)) +struct cpg_pll_config { +unsigned int extal_div; +unsigned int pll1_mult; +unsigned int pll3_mult; +}; + +static const struct cpg_pll_config cpg_pll_configs[8 ] = { + {1 ,208 ,106 }, {1 ,208 ,88 }, {1 ,156 ,80 }, {1 ,156 ,66 },
+ { 2, 240, 122 }, { 2, 240, 102 }, { 2, 208, 106 }, { 2, 208, 88
},drivers/clk/shmobile/clk-r8a7790.c new file +76
-0+}; + +/* SDHI divisors */ +static const struct clk_div_table cpg_sdh_div_table[] = { + {0 ,2 }, {1 ,3 }, {2 ,4 }, {3 ,6 }, + {4 ,8 }, {5 ,12 }, {6 ,16 }, {7 ,18 }, + {8 ,24 }, {10 ,36 }, {11 ,48 }, {0 ,0 }, +}; + +static const struct clk_div_table cpg_sd01_div_table[] = { + {5 ,12 }, {6 ,16 }, {7 ,18 }, {8 ,24 }, + {10 ,36 }, {11 ,48 }, {12 ,10 }, {0 ,0 }, +}; + +static u32 cpg_mode__initdata ; + +#define CPG_SDCKCR 0x00000074 + +static void __init r8a7790_cpg_clocks_init (struct device_node *np) +{ +const struct cpg_pll_config *config; +struct r8a7790_cpg *cpg; +struct clk **clks; +unsigned int i; + + cpg =kzalloc (sizeof (*cpg),GFP_KERNEL ); + clks =kzalloc (CPG_NUM_CLOCKS *sizeof (*clks),GFP_KERNEL ); +if (cpg ==NULL || clks ==NULL ) { +kfree (clks); +kfree (cpg); +pr_err ("%s: failed to allocate cpg\n" , __func__); +return ; + } + +spin_lock_init (&cpg->lock); + + cpg->data.clks = clks; + cpg->data.clk_num =CPG_NUM_CLOCKS ; + + cpg->reg =of_iomap (np,0 ); +if (WARN_ON (cpg->reg ==NULL )) { +kfree (cpg->data.clks); +kfree (cpg); +return ; + } + + config = &cpg_pll_configs[CPG_PLL_CONFIG_INDEX (cpg_mode)]; + +for (i =0 ; i <CPG_NUM_CLOCKS ; ++i) { +const struct clk_div_table *table =NULL ; +const char *parent_name ="main" ; +const char *name; +unsigned int shift; +unsigned int mult =1 ; +unsigned int div =1 ; +struct clk *clk; + +of_property_read_string_index (np,"clock-output-names" , i, + &name); + +switch (i) { +case R8A7790_CLK_MAIN : + parent_name =of_clk_get_parent_name (np,0 ); + div = config->extal_div; +break ; +case R8A7790_CLK_PLL1 : + mult = config->pll1_mult /2 ; +break ; +case R8A7790_CLK_PLL3 : + mult = config->pll3_mult; +break ; +case R8A7790_CLK_LB : + div = cpg_mode &BIT (18 ) ?36 :24 ; +break ; +case R8A7790_CLK_QSPI : + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) ==BIT(2) + ? 16 : 20;
drivers/clk/shmobile/clk-r8a7790.c new file +17
-0+break ; +case R8A7790_CLK_SDH : + table = cpg_sdh_div_table; + shift =8 ; +break ; +case R8A7790_CLK_SD0 : + table = cpg_sd01_div_table; + shift =4 ; +break ; +case R8A7790_CLK_SD1 : + table = cpg_sd01_div_table; + shift =0 ; +break ; + } + +if (!table) + clk = clk_register_fixed_factor(NULL, name,
parent_name,drivers/clk/shmobile/clk-r8a7790.c new file +5
-0+ 0, mult, div); + else + clk = clk_register_divider_table(NULL, name, + parent_name, 0, + cpg->reg +
CPG_SDCKCR,
+ shift, 4, 0,
table,drivers/clk/shmobile/clk-r8a7790.c new file +4
-0+ &cpg->lock); + +if (IS_ERR (clk)) + pr_err("%s: failed to register %s %s clock(%ld)\n",
drivers/clk/shmobile/clk-r8a7790.c new file +4
-0+ __func__, np->name, name, PTR_ERR(clk)); + } + +of_clk_add_provider (np, of_clk_src_onecell_get, &cpg->data);drivers/clk/shmobile/clk-r8a7790.c line 176
Quoted 10 lines
drivers/clk/shmobile/clk-r8a7790.c new file +10
-0+} +CLK_OF_DECLARE (r8a7790_cpg_clks,"renesas,r8a7790-cpg-clocks" , + r8a7790_cpg_clocks_init); + +void __init r8a7790_clocks_init (u32 mode) +{ + cpg_mode = mode; + +of_clk_init (NULL ); +}Hi Laurent,
Quoted 1 line
Thanks a lot for your efforts on this. In general I think it all looks good,
Thank you.
Quoted 4 lines
I have however one question regarding the "probe" interface between the SoC code in
arch/arm/mach-shmobileanddrivers/clk. The code above inr8a7790_clocks_init()looks a bit spaghetti-style to me, perhaps it is possible to make it cleaner somehow?
Isn't it just a loop ? :-) The clocks handled by this driver are "special", they need to be initialized manually.
Quoted 15 lines
I realize that you need some way to read out the mode pin setting, and that is currently provided by the SoC code in
arch/arm/mach-shmobile/. Today it seems that you instead of letting thedrivers/clk/code call SoC code to get the mode pin setting (and add a SoC link dependency) you simply feed the settings to the clk code from the SoC code using the parameter tor8a7790_clocks_init(). This direction seems good to me. I'm however not too keen on the current symbol dependency in the "other" direction.If possible I'd like to keep the interface between the SoC code and the driver code to "standard" driver model functions. For instance, using
of_clk_init(NULL)from the SoC code seems like a pretty good standard interface - without any link time dependencies. So with the current code, ther8a7790_clocks_init()function somehow goes against this no-symbol- dependency preference that I happen to have. =)
Quoted 4 lines
Would it for instance be possible let the SoC code read out the mode pin setting, and then pass the current setting using the argument of
of_clk_init()to select different dividers? That way the symbol dependency goes away. Or maybe it becomes too verbose?
The of_clk_init() argument is an array of struct of_device_id that is used by the clock core to match device tree nodes. I don't really see how you would like to use it to pass the boot mode pins state to the driver.
There is currently no dedicated API (at least to my knowledge) to pass clock configuration information between arch/arm and drivers/clk. Here's a couple of methods that can be used.
- Call a drivers/clk function from platform code with the clock configuration information and store that information in a driver global variable for later use (this is the method currently used by this patch).
- Call a platform code function from driver code to read the configuration. This is pretty similar to the above, with a dependency in the other direction.
- Read the value directly from the hardware in the clock driver. This doesn't feel really right, as that's not the job of the clock driver. In a more general case this solution might not always be possible, as reading the configuration might require access to resources not available to drivers.
- Create a standard API for this purpose. It might be overengineering.
- Use AUXDATA filled by platform code.
There might be other solutions I haven't thought of. I went for the first method as there's already 8 other clock drivers that expose an initialization function to platform code. I might just have copied a mistake though.
Mike, do you have an opinion on this ? In a nutshell, the code clocks are fixed factor but their factor depend on a boot mode configuration. The configuration value is thus needed when instantiating the clocks. It can be read from a hardware register, outside of the clocks IP core.
Quoted 2 lines
Let me know what you think. I would like to follow the same style for r8a7791.
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Laurent,
Quoted 33 lines · Laurent Pinchart
Hi Magnus,
(And a question for Mike below)
Quoted 24 lines · On Tuesday 05 November 2013 16:56:40 Magnus Damm wrote:
Quoted 14 lines · Laurent Pinchart
The R8A7790 has several clocks that are too custom to be supported in a generic driver. Those clocks can be divided in two categories:
- Fixed rate clocks with multiplier and divisor set according to boot mode configuration
- Custom divider clocks with SoC-specific divider values
This driver supports both.
Signed-off-by: Laurent Pinchart
<[email protected]>
---Review
Quoted 6 lines
(quoted diff) +6
-0+void __init r8a7790_clocks_init(u32 mode) +{ + cpg_mode = mode; + + of_clk_init(NULL); +}Hi Laurent,
Quoted 1 line
Thanks a lot for your efforts on this. In general I think it all looks good,
Thank you.
Quoted 7 lines
Quoted 4 lines
I have however one question regarding the "probe" interface between the SoC code in
arch/arm/mach-shmobileanddrivers/clk. The code above inr8a7790_clocks_init()looks a bit spaghetti-style to me, perhaps it is possible to make it cleaner somehow?Isn't it just a loop ? :-) The clocks handled by this driver are "special", they need to be initialized manually.
Spaghetti-O's? =) I agree that some special handling is needed.
Quoted 15 lines
Quoted 15 lines
I realize that you need some way to read out the mode pin setting, and that is currently provided by the SoC code in
arch/arm/mach-shmobile/. Today it seems that you instead of letting thedrivers/clk/code call SoC code to get the mode pin setting (and add a SoC link dependency) you simply feed the settings to the clk code from the SoC code using the parameter tor8a7790_clocks_init(). This direction seems good to me. I'm however not too keen on the current symbol dependency in the "other" direction.If possible I'd like to keep the interface between the SoC code and the driver code to "standard" driver model functions. For instance, using
of_clk_init(NULL)from the SoC code seems like a pretty good standard interface - without any link time dependencies. So with the current code, ther8a7790_clocks_init()function somehow goes against this no-symbol- dependency preference that I happen to have. =)
Quoted 8 lines
Quoted 4 lines
Would it for instance be possible let the SoC code read out the mode pin setting, and then pass the current setting using the argument of
of_clk_init()to select different dividers? That way the symbol dependency goes away. Or maybe it becomes too verbose?The
of_clk_init()argument is an array of structof_device_idthat is used by the clock core to match device tree nodes. I don't really see how you would like to use it to pass the boot mode pins state to the driver.
Yeah, it seems that interface isn't such a good match. Thanks.
Quoted 16 lines
There is currently no dedicated API (at least to my knowledge) to pass clock configuration information between
arch/armanddrivers/clk. Here's a couple of methods that can be used.- Call a
drivers/clkfunction from platform code with the clock configuration information and store that information in a driver global variable for later use (this is the method currently used by this patch).- Call a platform code function from driver code to read the configuration. This is pretty similar to the above, with a dependency in the other direction.
- Read the value directly from the hardware in the clock driver. This doesn't feel really right, as that's not the job of the clock driver. In a more general case this solution might not always be possible, as reading the configuration might require access to resources not available to drivers.
Quoted 7 lines
- Create a standard API for this purpose. It might be overengineering.
- Use AUXDATA filled by platform code.
There might be other solutions I haven't thought of. I went for the first method as there's already 8 other clock drivers that expose an initialization function to platform code. I might just have copied a mistake though.
Thanks for listing these. I have come across another option:
Use of_update_property() and of_property_read_u32() to pass using a property, see below.
Quoted 4 lines
Mike, do you have an opinion on this ? In a nutshell, the code clocks are fixed factor but their factor depend on a boot mode configuration. The configuration value is thus needed when instantiating the clocks. It can be read from a hardware register, outside of the clocks IP core.
Yeah, I too would be interested to hear what Mike thinks about this matter.
Please see below for a prototype patch on top of your code that shows the driver side of my DT property proposal. The omitted SoC side becomes slightly more complicated but that code can be shared between multiple R-Car SoCs so I think it should be acceptable size-wise.
With this patch applied the interface between the driver and the SoC code is a DT property (that needs documentation) and of_clk_init(NULL). No more evil link time symbol dependencies between arch/ and drivers/...
drivers/clk/shmobile/clk-r8a7790.c | 15 ++++++--------- include/linux/clk/shmobile.h | 19 ------------------- 2 files changed, 6 insertions(+), 28 deletions(-)
--- 0018/drivers/clk/shmobile/clk-r8a7790.c
+++ work/drivers/clk/shmobile/clk-r8a7790.c 2013-11-06 16:59:59.000000000 +0
900
@@ -12,7 +12,6 @@
#include <linux/clk-provider.h>
#include <linux/clkdev.h>
-#include <linux/clk/shmobile.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/of.h>
@@ -70,8 +69,6 @@ static const struct clk_div_table cpg_sd
{ 10, 36 }, { 11, 48 }, { 12, 10 }, { 0, 0 },};
-static u32 cpg_mode __initdata;
-
#define CPG_SDCKCR 0x00000074
static void __init r8a7790_cpg_clocks_init(struct device_node *np)
@ -80,6 +77,12 @@ static void __init r8a7790_cpg_clocks_in
struct r8a7790_cpg *cpg;
struct clk **clks;
unsigned int i;+ u32 cpg_mode;
+
+ if (of_property_read_u32(node, "cpg-mode", &cpg_mode)) {
+ pr_err("%s: failed to determine CPG mode\n", __func__);
+ return;
+ }
cpg = kzalloc(sizeof(*cpg), GFP_KERNEL);
clks = kzalloc(CPG_NUM_CLOCKS * sizeof(*clks), GFP_KERNEL);
@ -168,9 +171,3 @@ static void __init r8a7790_cpg_clocks_in
CLK_OF_DECLARE(r8a7790_cpg_clks, "renesas,r8a7790-cpg-clocks",
r8a7790_cpg_clocks_init);-void __init r8a7790_clocks_init(u32 mode)
-{
- cpg_mode = mode;
-
- of_clk_init(NULL);
-}
dev/null 2013-06-03 21:41:10.638032047 +0900 renamed from include/linux/clk/shmobile.h +0 -19
@@ -1,19 +0,0 @@ -/* - * Copyright 2013 Ideas On Board SPRL - * - * Contact: Laurent Pinchart <[email protected]> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef __LINUX_CLK_SHMOBILE_H_ -#define __LINUX_CLK_SHMOBILE_H_ - -#include <linux/types.h> - -void r8a7790_clocks_init(u32 mode); - -#endif
Cheers,
/ magnus
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Magnus,
(CC'ing Grant Likely)
Quoted 112 lines · On Wednesday 06 November 2013 17:19:48 Magnus Damm wrote:
Quoted 30 lines · Laurent Pinchart
Quoted 24 lines · On Tuesday 05 November 2013 16:56:40 Magnus Damm wrote:
Quoted 14 lines · Laurent Pinchart
The R8A7790 has several clocks that are too custom to be supported in a generic driver. Those clocks can be divided in two categories:
- Fixed rate clocks with multiplier and divisor set according to boot mode configuration
- Custom divider clocks with SoC-specific divider values
This driver supports both.
Signed-off-by: Laurent Pinchart
<[email protected]>
---Review
Quoted 6 lines
(quoted diff) +6
-0+void __init r8a7790_clocks_init(u32 mode) +{ + cpg_mode = mode; + + of_clk_init(NULL); +}Hi Laurent,
Quoted 2 lines
Thanks a lot for your efforts on this. In general I think it all looks good,
Thank you.
Quoted 7 lines
Quoted 4 lines
I have however one question regarding the "probe" interface between the SoC code in
arch/arm/mach-shmobileanddrivers/clk. The code above inr8a7790_clocks_init()looks a bit spaghetti-style to me, perhaps it is possible to make it cleaner somehow?Isn't it just a loop ? :-) The clocks handled by this driver are "special", they need to be initialized manually.
Spaghetti-O's? =) I agree that some special handling is needed.
Quoted 16 lines
Quoted 16 lines
I realize that you need some way to read out the mode pin setting, and that is currently provided by the SoC code in
arch/arm/mach-shmobile/. Today it seems that you instead of letting thedrivers/clk/code call SoC code to get the mode pin setting (and add a SoC link dependency) you simply feed the settings to the clk code from the SoC code using the parameter tor8a7790_clocks_init(). This direction seems good to me. I'm however not too keen on the current symbol dependency in the "other" direction.If possible I'd like to keep the interface between the SoC code and the driver code to "standard" driver model functions. For instance, using
of_clk_init(NULL)from the SoC code seems like a pretty good standard interface - without any link time dependencies. So with the current code, ther8a7790_clocks_init()function somehow goes against this no-symbol- dependency preference that I happen to have. =)Quoted 8 lines
Quoted 4 lines
Would it for instance be possible let the SoC code read out the mode pin setting, and then pass the current setting using the argument of
of_clk_init()to select different dividers? That way the symbol dependency goes away. Or maybe it becomes too verbose?The
of_clk_init()argument is an array of structof_device_idthat is used by the clock core to match device tree nodes. I don't really see how you would like to use it to pass the boot mode pins state to the driver.Yeah, it seems that interface isn't such a good match. Thanks.
Quoted 18 lines
There is currently no dedicated API (at least to my knowledge) to pass clock configuration information between
arch/armanddrivers/clk. Here's a couple of methods that can be used.- Call a
drivers/clkfunction from platform code with the clock configuration information and store that information in a driver global variable for later use (this is the method currently used by this patch).- Call a platform code function from driver code to read the configuration. This is pretty similar to the above, with a dependency in the other direction.
- Read the value directly from the hardware in the clock driver. This doesn't feel really right, as that's not the job of the clock driver. In a more general case this solution might not always be possible, as reading the configuration might require access to resources not available to drivers.
Quoted 8 lines
- Create a standard API for this purpose. It might be overengineering.
- Use AUXDATA filled by platform code.
There might be other solutions I haven't thought of. I went for the first method as there's already 8 other clock drivers that expose an initialization function to platform code. I might just have copied a mistake though.
Thanks for listing these. I have come across another option:
Use
of_update_property()andof_property_read_u32()to pass using a property, see below.Quoted 4 lines
Mike, do you have an opinion on this ? In a nutshell, the code clocks are fixed factor but their factor depend on a boot mode configuration. The configuration value is thus needed when instantiating the clocks. It can be read from a hardware register, outside of the clocks IP core.
Yeah, I too would be interested to hear what Mike thinks about this matter.
Please see below for a prototype patch on top of your code that shows the driver side of my DT property proposal. The omitted SoC side becomes slightly more complicated but that code can be shared between multiple R-Car SoCs so I think it should be acceptable size-wise.
Quoted 4 lines
With this patch applied the interface between the driver and the SoC code is a DT property (that needs documentation) and
of_clk_init(NULL). No more evil link time symbol dependencies betweenarch/anddrivers/...
This feels a bit like a DT abuse to me. I'm not strongly opposed to this approach, but I would need an ack from Mike and Grant before implementing it.
Quoted 69 lines
drivers/clk/shmobile/clk-r8a7790.c | 15 ++++++--------- include/linux/clk/shmobile.h | 19 ------------------- 2 files changed, 6 insertions(+), 28 deletions(-)drivers/clk/shmobile/clk-r8a7790.c 2013-11-06 renamed from drivers/clk/shmobile/clk-r8a7790.c +0
-016:59:59.000000000 +0 900
drivers/clk/shmobile/clk-r8a7790.c 2013-11-06 renamed from drivers/clk/shmobile/clk-r8a7790.c +0
-3@@ -12,7 +12,6 @@ #include <linux/clk-provider.h> #include <linux/clkdev.h> -#include <linux/clk/shmobile.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/of.h>@@ -70,8 +69,6 @@ static const struct clk_div_table cpg_sd { 10, 36 }, { 11, 48 }, { 12, 10 }, { 0, 0 }, }; -static u32 cpg_mode __initdata; - #define CPG_SDCKCR 0x00000074 static void __init r8a7790_cpg_clocks_init(struct device_node *np)@ -80,6 +77,12 @@ static void
__initr8a7790_cpg_clocks_instruct r8a7790_cpg *cpg; struct clk **clks; unsigned int i;drivers/clk/shmobile/clk-r8a7790.c 2013-11-06 renamed from drivers/clk/shmobile/clk-r8a7790.c +6
-0+ u32 cpg_mode; + + if (of_property_read_u32(node, "cpg-mode", &cpg_mode)) { + pr_err("%s: failed to determine CPG mode\n", __func__); + return; + } cpg = kzalloc(sizeof(*cpg), GFP_KERNEL); clks = kzalloc(CPG_NUM_CLOCKS * sizeof(*clks), GFP_KERNEL);@ -168,9 +171,3 @@ static void
__initr8a7790_cpg_clocks_in
CLK_OF_DECLARE(r8a7790_cpg_clks, "renesas,r8a7790-cpg-clocks",r8a7790_cpg_clocks_init);drivers/clk/shmobile/clk-r8a7790.c 2013-11-06 renamed from drivers/clk/shmobile/clk-r8a7790.c +0
-6-void __init r8a7790_clocks_init(u32 mode) -{ - cpg_mode = mode; - - of_clk_init(NULL); -}dev/null 2013-06-03 21:41:10.638032047 +0900 renamed from include/linux/clk/shmobile.h +0
-19@@ -1,19 +0,0 @@ -/* - * Copyright 2013 Ideas On Board SPRL - * - * Contact: Laurent Pinchart <[email protected]> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef __LINUX_CLK_SHMOBILE_H_ -#define __LINUX_CLK_SHMOBILE_H_ - -#include <linux/types.h> - -void r8a7790_clocks_init(u32 mode); - -#endif
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
In reply to Laurent PinchartHi Laurent
Quoted 8 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +8
-0+Required Properties: + + - compatible: Must be "renesas,r8a7790-cpg-clocks" + - reg: Base address and length of the memory resource used by the CPG + - clocks: Reference to the parent clock + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks, must be "main", "pll1", + "pll3", "lb", "qspi", "sdh", "sd0", "sd1".
(snip)
Quoted 33 lines
drivers/clk/shmobile/clk-r8a7790.c new file +33
-0+for (i =0 ; i <CPG_NUM_CLOCKS ; ++i) { +const struct clk_div_table *table =NULL ; +const char *parent_name ="main" ; +const char *name; +unsigned int shift; +unsigned int mult =1 ; +unsigned int div =1 ; +struct clk *clk; + +of_property_read_string_index (np,"clock-output-names" , i, + &name); + +switch (i) { +case R8A7790_CLK_MAIN : + parent_name =of_clk_get_parent_name (np,0 ); + div = config->extal_div; +break ; +case R8A7790_CLK_PLL1 : + mult = config->pll1_mult /2 ; +break ; +case R8A7790_CLK_PLL3 : + mult = config->pll3_mult; +break ; +case R8A7790_CLK_LB : + div = cpg_mode &BIT (18 ) ?36 :24 ; +break ; +case R8A7790_CLK_QSPI : + div = (cpg_mode & (BIT (3 ) |BIT (2 ) |BIT (1 ))) ==BIT (2 ) + ?16 :20 ; +break ; +case R8A7790_CLK_SDH : + table = cpg_sdh_div_table; + shift =8 ;
drivers/clk/shmobile/clk-r8a7790.c line 149
Quoted 10 lines
drivers/clk/shmobile/clk-r8a7790.c new file +10
-0+break ; +case R8A7790_CLK_SD0 : + table = cpg_sd01_div_table; + shift =4 ; +break ; +case R8A7790_CLK_SD1 : + table = cpg_sd01_div_table; + shift =0 ; +break ; + }
Is this clock-output-names realy "Required" property ? The "name" and "order" seem fixed, then,
I guess it can simply use "name array" ?
Quoted 17 lines
drivers/clk/shmobile/clk-r8a7790.c new file +17
-0+static void __init r8a7790_cpg_clocks_init (struct device_node *np) +{ +const struct cpg_pll_config *config; +struct r8a7790_cpg *cpg; +struct clk **clks; +unsigned int i; + + cpg =kzalloc (sizeof (*cpg),GFP_KERNEL ); + clks =kzalloc (CPG_NUM_CLOCKS *sizeof (*clks),GFP_KERNEL ); +if (cpg ==NULL || clks ==NULL ) { +kfree (clks); +kfree (cpg); +pr_err ("%s: failed to allocate cpg\n" , __func__); +return ; + } + +spin_lock_init (&cpg->lock);
drivers/clk/shmobile/clk-r8a7790.c line 103
Quoted 10 lines
drivers/clk/shmobile/clk-r8a7790.c new file +10
-0+ + cpg->data.clks = clks; + cpg->data.clk_num =CPG_NUM_CLOCKS ; + + cpg->reg =of_iomap (np,0 ); +if (WARN_ON (cpg->reg ==NULL )) { +kfree (cpg->data.clks); +kfree (cpg); +return ; + }
Above 2 error cases are doing same thing.
If can use goto xxx_error.
Best regards
---
Kuninori Morimoto
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Morimoto-san,
Quoted 52 lines · On Tuesday 05 November 2013 00:52:29 Kuninori Morimoto wrote:
Hi Laurent
Quoted 8 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +8
-0+Required Properties: + + - compatible: Must be "renesas,r8a7790-cpg-clocks" + - reg: Base address and length of the memory resource used by the CPG + - clocks: Reference to the parent clock + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks, must be "main", "pll1", + "pll3", "lb", "qspi", "sdh", "sd0", "sd1".(snip)
Quoted 39 lines
drivers/clk/shmobile/clk-r8a7790.c new file +39
-0+for (i =0 ; i <CPG_NUM_CLOCKS ; ++i) { +const struct clk_div_table *table =NULL ; +const char *parent_name ="main" ; +const char *name; +unsigned int shift; +unsigned int mult =1 ; +unsigned int div =1 ; +struct clk *clk; + +of_property_read_string_index (np,"clock-output-names" , i, + &name); + +switch (i) { +case R8A7790_CLK_MAIN : + parent_name =of_clk_get_parent_name (np,0 ); + div = config->extal_div; +break ; +case R8A7790_CLK_PLL1 : + mult = config->pll1_mult /2 ; +break ; +case R8A7790_CLK_PLL3 : + mult = config->pll3_mult; +break ; +case R8A7790_CLK_LB : + div = cpg_mode &BIT (18 ) ?36 :24 ; +break ; +case R8A7790_CLK_QSPI : + div = (cpg_mode & (BIT (3 ) |BIT (2 ) |BIT (1 ))) ==BIT (2 ) + ?16 :20 ; +break ; +case R8A7790_CLK_SDH : + table = cpg_sdh_div_table; + shift =8 ; +break ; +case R8A7790_CLK_SD0 : + table = cpg_sd01_div_table; + shift =4 ; +break ; +case R8A7790_CLK_SD1 :
Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 149
Quoted 4 lines
drivers/clk/shmobile/clk-r8a7790.c new file +4
-0+ table = cpg_sd01_div_table; + shift =0 ; +break ; + }Is this clock-output-names realy "Required" property ? The "name" and "order" seem fixed, then,
I guess it can simply use "name array" ?
The clock-output-names property is required by the of_clk_get_parent_name() function. The property is mandatory for all clocks that need to be referenced by name, which is the case of all non-leaf clocks on our platforms. We thus need it.
Quoted 22 lines
Quoted 22 lines
drivers/clk/shmobile/clk-r8a7790.c new file +22
-0+static void __init r8a7790_cpg_clocks_init (struct device_node *np) +{ +const struct cpg_pll_config *config; +struct r8a7790_cpg *cpg; +struct clk **clks; +unsigned int i; + + cpg =kzalloc (sizeof (*cpg),GFP_KERNEL ); + clks =kzalloc (CPG_NUM_CLOCKS *sizeof (*clks),GFP_KERNEL ); +if (cpg ==NULL || clks ==NULL ) { +kfree (clks); +kfree (cpg); +pr_err ("%s: failed to allocate cpg\n" , __func__); +return ; + } + +spin_lock_init (&cpg->lock); + + cpg->data.clks = clks; + cpg->data.clk_num =CPG_NUM_CLOCKS ; + + cpg->reg =of_iomap (np,0 );
Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 103
Quoted 5 lines
drivers/clk/shmobile/clk-r8a7790.c new file +5
-0+if (WARN_ON (cpg->reg ==NULL )) { +kfree (cpg->data.clks); +kfree (cpg); +return ; + }Above 2 error cases are doing same thing.
If can use gotoxxx_error.
Good point.
Given that a failure to allocate memory or ioremap registers will lead to a boot failure, I wonder whether we couldn't just remove the kfree() calls and leak memory. Is there a point in cleaning up behind us if the system will no boot due to missing core clocks anyway ?
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Laurent
Quoted 48 lines
Quoted 39 lines
Quoted 39 lines
drivers/clk/shmobile/clk-r8a7790.c new file +39
-0+for (i =0 ; i <CPG_NUM_CLOCKS ; ++i) { +const struct clk_div_table *table =NULL ; +const char *parent_name ="main" ; +const char *name; +unsigned int shift; +unsigned int mult =1 ; +unsigned int div =1 ; +struct clk *clk; + +of_property_read_string_index (np,"clock-output-names" , i, + &name); + +switch (i) { +case R8A7790_CLK_MAIN : + parent_name =of_clk_get_parent_name (np,0 ); + div = config->extal_div; +break ; +case R8A7790_CLK_PLL1 : + mult = config->pll1_mult /2 ; +break ; +case R8A7790_CLK_PLL3 : + mult = config->pll3_mult; +break ; +case R8A7790_CLK_LB : + div = cpg_mode &BIT (18 ) ?36 :24 ; +break ; +case R8A7790_CLK_QSPI : + div = (cpg_mode & (BIT (3 ) |BIT (2 ) |BIT (1 ))) ==BIT (2 ) + ?16 :20 ; +break ; +case R8A7790_CLK_SDH : + table = cpg_sdh_div_table; + shift =8 ; +break ; +case R8A7790_CLK_SD0 : + table = cpg_sd01_div_table; + shift =4 ; +break ; +case R8A7790_CLK_SD1 :Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 149
Quoted 4 lines
drivers/clk/shmobile/clk-r8a7790.c new file +4
-0+ table = cpg_sd01_div_table; + shift =0 ; +break ; + }Is this clock-output-names realy "Required" property ? The "name" and "order" seem fixed, then,
I guess it can simply use "name array" ?
Quoted 4 lines
The clock-output-names property is required by the
of_clk_get_parent_name()function. The property is mandatory for all clocks that need to be referenced by name, which is the case of all non-leaf clocks on our platforms. We thus need it.
Please correct me if my understanding was wrong.
Does your "of_clk_get_parent_name()" means "case R8A7790_CLK_MAIN"'s one ? If Yes, it is needed on "parent" clock side, not here ?
If No, who need/call of_clk_get_parent_name() for this ?
does "qspi", "sdh", "sd0", "sd1" can be parent clock for some device ??
And, parent of main clock is fixed by MD pin settings. SW can't exchange it.
Best regards
---
Kuninori Morimoto
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Morimoto-san,
Quoted 56 lines · On Tuesday 05 November 2013 16:54:31 Kuninori Morimoto wrote:
Hi Laurent
Quoted 48 lines
Quoted 39 lines
Quoted 39 lines
drivers/clk/shmobile/clk-r8a7790.c new file +39
-0+for (i =0 ; i <CPG_NUM_CLOCKS ; ++i) { +const struct clk_div_table *table =NULL ; +const char *parent_name ="main" ; +const char *name; +unsigned int shift; +unsigned int mult =1 ; +unsigned int div =1 ; +struct clk *clk; + +of_property_read_string_index (np,"clock-output-names" , i, + &name); + +switch (i) { +case R8A7790_CLK_MAIN : + parent_name =of_clk_get_parent_name (np,0 ); + div = config->extal_div; +break ; +case R8A7790_CLK_PLL1 : + mult = config->pll1_mult /2 ; +break ; +case R8A7790_CLK_PLL3 : + mult = config->pll3_mult; +break ; +case R8A7790_CLK_LB : + div = cpg_mode &BIT (18 ) ?36 :24 ; +break ; +case R8A7790_CLK_QSPI : + div = (cpg_mode & (BIT (3 ) |BIT (2 ) |BIT (1 ))) ==BIT (2 ) + ?16 :20 ; +break ; +case R8A7790_CLK_SDH : + table = cpg_sdh_div_table; + shift =8 ; +break ; +case R8A7790_CLK_SD0 : + table = cpg_sd01_div_table; + shift =4 ; +break ; +case R8A7790_CLK_SD1 :Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 149
Quoted 4 lines
drivers/clk/shmobile/clk-r8a7790.c new file +4
-0+ table = cpg_sd01_div_table; + shift =0 ; +break ; + }Is this clock-output-names realy "Required" property ? The "name" and "order" seem fixed, then,
I guess it can simply use "name array" ?Quoted 5 lines
The clock-output-names property is required by the
of_clk_get_parent_name()
function. The property is mandatory for all clocks that need to be referenced by name, which is the case of all non-leaf clocks on our platforms. We thus need it.
Quoted 5 lines
Please correct me if my understanding was wrong.
Does your "of_clk_get_parent_name()" means "case R8A7790_CLK_MAIN"'s one ? If Yes, it is needed on "parent" clock side, not here ?
If No, who need/callof_clk_get_parent_name()for this ?
does "qspi", "sdh", "sd0", "sd1" can be parent clock for some device ??
All those clocks are parents of other clocks (DIV6, MSTP or fixed-factor clocks). The DIV6, MSTP and fixed-factor clock drivers call of_clk_get_parent_name() to get the name of their parent clock, which is required to register the clocks with CCF. See of_fixed_factor_clk_setup() for instance.
Quoted 2 lines
And, parent of main clock is fixed by MD pin settings. SW can't exchange it.
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Laurent
Quoted 11 lines
Quoted 5 lines
Please correct me if my understanding was wrong.
Does your "of_clk_get_parent_name()" means "case R8A7790_CLK_MAIN"'s one ? If Yes, it is needed on "parent" clock side, not here ?
If No, who need/callof_clk_get_parent_name()for this ?
does "qspi", "sdh", "sd0", "sd1" can be parent clock for some device ??All those clocks are parents of other clocks (DIV6, MSTP or fixed-factor clocks). The DIV6, MSTP and fixed-factor clock drivers call
of_clk_get_parent_name()to get the name of their parent clock, which is required to register the clocks with CCF. Seeof_fixed_factor_clk_setup()for instance.
Ahh... OK, I understand.
Hmm...
I guesss We can use [1/3] and [2/3] patches for all Renesas SoC as generic driver, but, all SoC needs clk/shmobile/clk-xxxx.c like [3/3].
Because it has SoC special divider values.
Is this correct ?
Now, your [1/3] patch (= for MSTP) added renesas special property
as "renesas,clock-indices".
Is it impossible to add renesas special property like "renesas,clock-custom-divider" which can specify custom divider values in generic cpg driver ?
If we can have it, all Renesas SoC can use generic driver ?
Best regards
---
Kuninori Morimoto
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Morimoto-san,
Quoted 15 lines · On Tuesday 05 November 2013 18:31:31 Kuninori Morimoto wrote:
Hi Laurent
Quoted 7 lines
Quoted 6 lines
Please correct me if my understanding was wrong.
Does your "of_clk_get_parent_name()" means "case R8A7790_CLK_MAIN"'s one ?
If Yes, it is needed on "parent" clock side, not here ?
If No, who need/callof_clk_get_parent_name()for this ? does "qspi", "sdh", "sd0", "sd1" can be parent clock for some device ??Quoted 5 lines
All those clocks are parents of other clocks (DIV6, MSTP or fixed-factor clocks). The DIV6, MSTP and fixed-factor clock drivers call
of_clk_get_parent_name()to get the name of their parent clock, which is required to register the clocks with CCF. Seeof_fixed_factor_clk_setup()for instance.
Quoted 7 lines
Ahh... OK, I understand.
Hmm...
I guesss We can use [1/3] and [2/3] patches for all Renesas SoC as generic driver, but, all SoC needsclk/shmobile/clk-xxxx.clike [3/3]. Because it has SoC special divider values.
Is this correct ?
That's correct.
Quoted 6 lines
Now, your [1/3] patch (= for MSTP) added renesas special property as "renesas,clock-indices".
Is it impossible to add renesas special property like "renesas,clock-custom-divider" which can specify custom divider values in generic cpg driver ?
If we can have it, all Renesas SoC can use generic driver ?
The clocks supported by the SoC CPG driver are special in the sense that they're not really standardized. Most of them are fixed-factor clocks with a factor that depends on boot mode pins. The others are DIV4 clocks that vary widely from SoC to SoC. Expressing all that information in DT would be much more complex than expressing it in C code, which is why I've decided to go for a per-SoC CPG driver, especially given that the amount of code isn't that large.
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Laurent
Quoted 7 lines
Quoted 6 lines
Now, your [1/3] patch (= for MSTP) added renesas special property as "renesas,clock-indices".
Is it impossible to add renesas special property like "renesas,clock-custom-divider" which can specify custom divider values in generic cpg driver ?
If we can have it, all Renesas SoC can use generic driver ?
Quoted 7 lines
The clocks supported by the SoC CPG driver are special in the sense that they're not really standardized. Most of them are fixed-factor clocks with a factor that depends on boot mode pins. The others are DIV4 clocks that vary widely from SoC to SoC. Expressing all that information in DT would be much more complex than expressing it in C code, which is why I've decided to go for a per-SoC CPG driver, especially given that the amount of code isn't that large.
In my SuperH experience, CPG clock divier has same pattern. In H2's SDCKCR register, SDHFC and SD0FC looks different. But, the real different is only enabled bit area, the value is same.
You can find same pattern on FRQCRB register too, and, you can find same pattern on M2.
I guess FRQCRB/SDHFC can share code if it has mask. This idea was used on R-Mobile series on div4. (ex clock-sh73a0.c :: div4_clks)
Do you think we can use this idea on DT?
like this ?
div4_sdh {
compatible = "renesas,cpg-clocks-1/x";
renesas,clock-divider-mask = 0xdff;
...
}Best regards
---
Kuninori Morimoto
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Laurent again
Quoted 10 lines
In my SuperH experience, CPG clock divier has same pattern. In H2's SDCKCR register, SDHFC and SD0FC looks different. But, the real different is only enabled bit area, the value is same.
You can find same pattern on FRQCRB register too, and, you can find same pattern on M2.I guess FRQCRB/SDHFC can share code if it has mask. This idea was used on R-Mobile series on div4. (ex
clock-sh73a0.c::div4_clks)
I talked it with Magnus, and I understand your headache. I can agree about your approach now.
But, I guess H2 and M2 are very similar SoC. and I don't want too many clock-${SoC} files. Is it possible to share code like clk-gen2.c ?
Best regards
---
Kuninori Morimoto
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Morimoto-san,
Quoted 13 lines · On Wednesday 06 November 2013 23:20:32 Kuninori Morimoto wrote:
Hi Laurent again
Quoted 10 lines
In my SuperH experience, CPG clock divier has same pattern. In H2's SDCKCR register, SDHFC and SD0FC looks different. But, the real different is only enabled bit area, the value is same.
You can find same pattern on FRQCRB register too, and, you can find same pattern on M2.I guess FRQCRB/SDHFC can share code if it has mask. This idea was used on R-Mobile series on div4. (ex
clock-sh73a0.c::div4_clks)
Quoted 6 lines
I talked it with Magnus, and I understand your headache. I can agree about your approach now.
But, I guess H2 and M2 are very similar SoC. and I don't want too many clock-${SoC} files. Is it possible to share code like
clk-gen2.c?
Sure, if the hardware is very similar, it makes sense to share code. I've had a quick look at the M2 documentation, and it seems to be indeed mostly identical to H2. Only a couple of clocks are missing, and a new GPU clock register is documented. As the GPU clock is mentioned in the H2 documentation as being programmable I would assume that the GPU clock register exists and is identical in H2 but has been forgotten in the documentation.
We should probably extend clock-r8a7790.c with M2 support and rename it to clock-rcar-gen2.c before pushing it to mainline. Would you like to submit a patch ? :-)
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Laurent
Quoted 10 lines
Sure, if the hardware is very similar, it makes sense to share code. I've had a quick look at the M2 documentation, and it seems to be indeed mostly identical to H2. Only a couple of clocks are missing, and a new GPU clock register is documented. As the GPU clock is mentioned in the H2 documentation as being programmable I would assume that the GPU clock register exists and is identical in H2 but has been forgotten in the documentation.
We should probably extend
clock-r8a7790.cwith M2 support and rename it toclock-rcar-gen2.cbefore pushing it to mainline. Would you like to submit a patch ? :-)
Thank yor for your agreement.
I don't want to send "rename patch", please consider it in your v2 patch if possible :P
Best regards
---
Kuninori Morimoto
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Morimoto-san,
Quoted 10 lines · On Thursday 07 November 2013 16:06:29 Kuninori Morimoto wrote:
Hi Laurent
Quoted 8 lines
Sure, if the hardware is very similar, it makes sense to share code. I've had a quick look at the M2 documentation, and it seems to be indeed mostly identical to H2. Only a couple of clocks are missing, and a new GPU clock register is documented. As the GPU clock is mentioned in the H2 documentation as being programmable I would assume that the GPU clock register exists and is identical in H2 but has been forgotten in the documentation.
Quoted 7 lines
Quoted 3 lines
We should probably extend
clock-r8a7790.cwith M2 support and rename it toclock-rcar-gen2.cbefore pushing it to mainline. Would you like to submit a patch ? :-)Thank yor for your agreement.
I don't want to send "rename patch", please consider it in your v2 patch if possible :P
We also need to take into account that the two SoCs will have a different number of clocks. I'm thus inclined to replace the index-based switch statement by a similar construct that will match on the clock name instead. Do you have any opinion on that ?
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Laurent
Quoted 8 lines
Quoted 3 lines
Thank yor for your agreement.
I don't want to send "rename patch", please consider it in your v2 patch if possible :PWe also need to take into account that the two SoCs will have a different number of clocks. I'm thus inclined to replace the index-based switch statement by a similar construct that will match on the clock name instead. Do you have any opinion on that ?
Of course sharing code is very nice, but,
sometimes, it makes code difficult/dirty.
Now, I understand your headache (I have same headache :), and, you and I are sharing same opinion I think. So, I believe your decision.
Best regards
---
Kuninori Morimoto
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
In reply to Laurent PinchartQuoted 30 lines · Laurent Pinchart
The R8A7790 has several clocks that are too custom to be supported in a generic driver. Those clocks can be divided in two categories:
- Fixed rate clocks with multiplier and divisor set according to boot mode configuration
- Custom divider clocks with SoC-specific divider values
This driver supports both.
Signed-off-by Laurent Pinchart <[email protected]>--- .../bindings/clock/renesas,r8a7790-cpg-clocks.txt | 26 +++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-r8a7790.c | 176 +++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 10 ++ include/linux/clk/shmobile.h | 19 +++ 5 files changed, 232 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt create mode 100644 drivers/clk/shmobile/clk-r8a7790.c create mode 100644 include/linux/clk/shmobile.hDocumentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +2
-0@@ -0,0 +1,26 @@ +* Renesas R8A7790 Clock Pulse Generator (CPG) +
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt line 12
Quoted 10 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +10
-0+The CPG generates core clocks for the R8A7790. It includes three PLLs and +several fixed ratio dividers. + +Required Properties: + + - compatible: Must be "renesas,r8a7790-cpg-clocks" + - reg: Base address and length of the memory resource used by the CPG + - clocks: Reference to the parent clock + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks, must be "main", "pll1",
s/The name/The names/
Quoted 4 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +4
-0+ "pll3", "lb", "qspi", "sdh", "sd0", "sd1". + + +Example
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt line 26
Quoted 10 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +10
-0+------- + + cpg_clocks: cpg_clocks { + compatible = "renesas,r8a7790-cpg-clocks"; + reg = <0 0xe6150000 0 0x1000>; + clocks = <&extal_clk>; + #clock-cells = <1>; + clock-output-names = "main", "pll1", "pll3", "lb", + "qspi", "sdh", "sd0", "sd1"; + };
I wonder if it makes sense to craft a more generic bindings document.
I am currently working on clock support for the r8a7779 (H1) based on this patch series and I expect the bindings to end up being more or less the same.
I expect there to be similar support to be added for many other renesas SoCs over time.
Quoted 30 lines
drivers/clk/shmobile/Makefile +1
-0@@ -1,4 +1,5 @@ obj-$(CONFIG_ARCH_EMEV2) += clk-emev2.o +obj-$(CONFIG_ARCH_R8A7790) += clk-r8a7790.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.odrivers/clk/shmobile/clk-r8a7790.c new file +14
-0@@ -0,0 +1,176 @@ +/* +* r8a7790 Core CPG Clocks +* +* Copyright (C) 2013 Ideas On Board SPRL +* +* Contact: Laurent Pinchart <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; version 2 of the License. +*/ + +#include <linux/clk-provider.h> +#include <linux/clkdev.h>
drivers/clk/shmobile/clk-r8a7790.c line 24
Quoted 10 lines
drivers/clk/shmobile/clk-r8a7790.c new file +10
-0+#include <linux/clk/shmobile.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/spinlock.h> + +#include <dt-bindings/clock/r8a7790-clock.h> + +#define CPG_NUM_CLOCKS (R8A7790_CLK_SD1 + 1)
Perhaps R8A7790_NUM_CLOCKS in r8a7790-clock.h would be nicer.
Quoted 37 lines
drivers/clk/shmobile/clk-r8a7790.c new file +37
-0+ +struct r8a7790_cpg { +struct clk_onecell_data data; +spinlock_t lock; +void __iomem *reg; +}; + +/* +* MD EXTAL PLL0 PLL1 PLL3 +* 14 13 19 (MHz) *1 *1 +*--------------------------------------------------- +* 0 0 0 15 x 1 x172/2 x208/2 x106 +* 0 0 1 15 x 1 x172/2 x208/2 x88 +* 0 1 0 20 x 1 x130/2 x156/2 x80 +* 0 1 1 20 x 1 x130/2 x156/2 x66 +* 1 0 0 26 / 2 x200/2 x240/2 x122 +* 1 0 1 26 / 2 x200/2 x240/2 x102 +* 1 1 0 30 / 2 x172/2 x208/2 x106 +* 1 1 1 30 / 2 x172/2 x208/2 x88 +* +* *1 : Table 7.6 indicates VCO ouput (PLLx = VCO/2) +*/ +#define CPG_PLL_CONFIG_INDEX (md) ((((md) & BIT(14)) >> 12) | \ + (((md) & BIT(13)) >> 12) | \ + (((md) & BIT(19)) >> 19)) +struct cpg_pll_config { +unsigned int extal_div; +unsigned int pll1_mult; +unsigned int pll3_mult; +}; + +static const struct cpg_pll_config cpg_pll_configs[8 ] = { + {1 ,208 ,106 }, {1 ,208 ,88 }, {1 ,156 ,80 }, {1 ,156 ,66 }, + {2 ,240 ,122 }, {2 ,240 ,102 }, {2 ,208 ,106 }, {2 ,208 ,88 }, +}; + +/* SDHI divisors */
drivers/clk/shmobile/clk-r8a7790.c line 71
Quoted 10 lines
drivers/clk/shmobile/clk-r8a7790.c new file +10
-0+static const struct clk_div_table cpg_sdh_div_table[] = { + {0 ,2 }, {1 ,3 }, {2 ,4 }, {3 ,6 }, + {4 ,8 }, {5 ,12 }, {6 ,16 }, {7 ,18 }, + {8 ,24 }, {10 ,36 }, {11 ,48 }, {0 ,0 }, +}; + +static const struct clk_div_table cpg_sd01_div_table[] = { + {5 ,12 }, {6 ,16 }, {7 ,18 }, {8 ,24 }, + {10 ,36 }, {11 ,48 }, {12 ,10 }, {0 ,0 }, +};
Can any or all of the above three constants be __initconst?
drivers/clk/shmobile/clk-r8a7790.c line 84
Quoted 13 lines
drivers/clk/shmobile/clk-r8a7790.c new file +13
-0+ +static u32 cpg_mode__initdata ; + +#define CPG_SDCKCR 0x00000074 + +static void __init r8a7790_cpg_clocks_init (struct device_node *np) +{ +const struct cpg_pll_config *config; +struct r8a7790_cpg *cpg; +struct clk **clks; +unsigned int i; + + cpg =kzalloc (sizeof (*cpg),GFP_KERNEL );
Nit: s/sizeof(*cpg)/sizeof *cpg/, sizeof is an operator.
Quoted 9 lines
drivers/clk/shmobile/clk-r8a7790.c new file +9
-0+ clks =kzalloc (CPG_NUM_CLOCKS *sizeof (*clks),GFP_KERNEL ); +if (cpg ==NULL || clks ==NULL ) { +kfree (clks); +kfree (cpg); +pr_err ("%s: failed to allocate cpg\n" , __func__); +return ; + } + +spin_lock_init (&cpg->lock);
drivers/clk/shmobile/clk-r8a7790.c line 103
Quoted 10 lines
drivers/clk/shmobile/clk-r8a7790.c new file +10
-0+ + cpg->data.clks = clks; + cpg->data.clk_num =CPG_NUM_CLOCKS ; + + cpg->reg =of_iomap (np,0 ); +if (WARN_ON (cpg->reg ==NULL )) { +kfree (cpg->data.clks); +kfree (cpg); +return ; + }
Perhaps this error checking could be merged with that of cpg and clks?
Quoted 36 lines
drivers/clk/shmobile/clk-r8a7790.c new file +36
-0+ + config = &cpg_pll_configs[CPG_PLL_CONFIG_INDEX (cpg_mode)]; + +for (i =0 ; i <CPG_NUM_CLOCKS ; ++i) { +const struct clk_div_table *table =NULL ; +const char *parent_name ="main" ; +const char *name; +unsigned int shift; +unsigned int mult =1 ; +unsigned int div =1 ; +struct clk *clk; + +of_property_read_string_index (np,"clock-output-names" , i, + &name); + +switch (i) { +case R8A7790_CLK_MAIN : + parent_name =of_clk_get_parent_name (np,0 ); + div = config->extal_div; +break ; +case R8A7790_CLK_PLL1 : + mult = config->pll1_mult /2 ; +break ; +case R8A7790_CLK_PLL3 : + mult = config->pll3_mult; +break ; +case R8A7790_CLK_LB : + div = cpg_mode &BIT (18 ) ?36 :24 ; +break ; +case R8A7790_CLK_QSPI : + div = (cpg_mode & (BIT (3 ) |BIT (2 ) |BIT (1 ))) ==BIT (2 ) + ?16 :20 ; +break ; +case R8A7790_CLK_SDH : + table = cpg_sdh_div_table; + shift =8 ;
drivers/clk/shmobile/clk-r8a7790.c line 149
Quoted 10 lines
drivers/clk/shmobile/clk-r8a7790.c new file +10
-0+break ; +case R8A7790_CLK_SD0 : + table = cpg_sd01_div_table; + shift =4 ; +break ; +case R8A7790_CLK_SD1 : + table = cpg_sd01_div_table; + shift =0 ; +break ; + }
I wonder if it would be good to and skip the portions below if the switch statement hits a default: case.
Also, if i was an enum type then I think the C compiler would warn about any missing cases. That might be nice too.
Quoted 81 lines
drivers/clk/shmobile/clk-r8a7790.c new file +27
-0+ +if (!table) + clk =clk_register_fixed_factor (NULL , name, parent_name, +0 , mult, div); +else + clk =clk_register_divider_table (NULL , name, + parent_name,0 , + cpg->reg +CPG_SDCKCR , + shift,4 ,0 , table, + &cpg->lock); + +if (IS_ERR (clk)) +pr_err ("%s: failed to register %s %s clock (%ld)\n" , + __func__, np->name, name,PTR_ERR (clk)); + } + +of_clk_add_provider (np, of_clk_src_onecell_get, &cpg->data); +} +CLK_OF_DECLARE (r8a7790_cpg_clks,"renesas,r8a7790-cpg-clocks" , + r8a7790_cpg_clocks_init); + +void __init r8a7790_clocks_init (u32 mode) +{ + cpg_mode = mode; + +of_clk_init (NULL ); +}include/dt-bindings/clock/r8a7790-clock.h +10
-0@@ -10,6 +10,16 @@#ifndef __DT_BINDINGS_CLOCK_R8A7790_H__#define __DT_BINDINGS_CLOCK_R8A7790_H__ +/* CPG */ +#define R8A7790_CLK_MAIN 0 +#define R8A7790_CLK_PLL1 1 +#define R8A7790_CLK_PLL3 2 +#define R8A7790_CLK_LB 3 +#define R8A7790_CLK_QSPI 4 +#define R8A7790_CLK_SDH 5 +#define R8A7790_CLK_SD0 6 +#define R8A7790_CLK_SD1 7 +/* MSTP1 */ #define R8A7790_CLK_CMT0 20include/linux/clk/shmobile.h new file +19
-0@@ -0,0 +1,19 @@ +/* +* Copyright 2013 Ideas On Board SPRL +* +* Contact: Laurent Pinchart <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +#ifndef __LINUX_CLK_SHMOBILE_H_ +#define __LINUX_CLK_SHMOBILE_H_ + +#include <linux/types.h> + +void r8a7790_clocks_init (u32 mode); + +#endif Signature · 6 lines
1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Hi Simon,
Quoted 41 lines · On Wednesday 06 November 2013 16:18:09 Simon Horman wrote:
Quoted 40 lines · Laurent Pinchart
The R8A7790 has several clocks that are too custom to be supported in a generic driver. Those clocks can be divided in two categories:
- Fixed rate clocks with multiplier and divisor set according to boot mode configuration
- Custom divider clocks with SoC-specific divider values
This driver supports both.
Signed-off-by: Laurent Pinchart
<[email protected]>
---.../bindings/clock/renesas,r8a7790-cpg-clocks.txt | 26 +++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-r8a7790.c | 176 ++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 10 ++ include/linux/clk/shmobile.h | 19 +++ 5 files changed, 232 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt create mode 100644 drivers/clk/shmobile/clk-r8a7790.c create mode 100644 include/linux/clk/shmobile.hdiff --git
a/Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txtb/Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txtnew file mode 100644
index 0000000..d889917
---/dev/null
+++b/Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txtDocumentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +6
-0@@ -0,0 +1,26 @@ +* Renesas R8A7790 Clock Pulse Generator (CPG) + +The CPG generates core clocks for the R8A7790. It includes three PLLs and +several fixed ratio dividers. + +Required Properties:
Quoted 8 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt line 12
Quoted 6 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +6
-0+ + - compatible: Must be "renesas,r8a7790-cpg-clocks" + - reg: Base address and length of the memory resource used by the CPG + - clocks: Reference to the parent clock + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks, must be "main", "pll1",s/The name/The names/
Will fix, thank you.
Quoted 17 lines
Quoted 4 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +4
-0+ "pll3", "lb", "qspi", "sdh", "sd0", "sd1". + + +ExampleDocumentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt line 26
Quoted 10 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +10
-0+------- + + cpg_clocks: cpg_clocks { + compatible = "renesas,r8a7790-cpg-clocks"; + reg = <0 0xe6150000 0 0x1000>; + clocks = <&extal_clk>; + #clock-cells = <1>; + clock-output-names = "main", "pll1", "pll3", "lb", + "qspi", "sdh", "sd0", "sd1"; + };I wonder if it makes sense to craft a more generic bindings document.
Quoted 6 lines
I am currently working on clock support for the r8a7779 (H1) based on this patch series and I expect the bindings to end up being more or less the same.
I expect there to be similar support to be added for many other renesas SoCs over time.
That's a good idea. I'll gladly review patches :-)
Quoted 33 lines
Quoted 33 lines
drivers/clk/shmobile/Makefile +1
-0@@ -1,4 +1,5 @@ obj-$(CONFIG_ARCH_EMEV2) += clk-emev2.o +obj-$(CONFIG_ARCH_R8A7790) += clk-r8a7790.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.o(quoted diff) +0
-0
b/drivers/clk/shmobile/clk-r8a7790.cnew file mode 100644 index 0000000..2e76638drivers/clk/shmobile/clk-r8a7790.c new file +18
-0@@ -0,0 +1,176 @@ +/* +* r8a7790 Core CPG Clocks +* +* Copyright (C) 2013 Ideas On Board SPRL +* +* Contact: Laurent Pinchart <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; version 2 of the License. +*/ + +#include <linux/clk-provider.h> +#include <linux/clkdev.h> +#include <linux/clk/shmobile.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/of.h>
Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 24
Quoted 6 lines
drivers/clk/shmobile/clk-r8a7790.c new file +6
-0+#include <linux/of_address.h> +#include <linux/spinlock.h> + +#include <dt-bindings/clock/r8a7790-clock.h> + +#define CPG_NUM_CLOCKS (R8A7790_CLK_SD1 + 1)Perhaps
R8A7790_NUM_CLOCKSinr8a7790-clock.hwould be nicer.
Good question. The dt-bindings/ headers are primarly meant to store macros used by .dts files and (possibly) shared with C code. Given that R8A7790_NUM_CLOCKS isn't used by .dts files I'm not sure it would belong to that header.
Quoted 41 lines
Quoted 41 lines
drivers/clk/shmobile/clk-r8a7790.c new file +41
-0+ +struct r8a7790_cpg { +struct clk_onecell_data data; +spinlock_t lock; +void __iomem *reg; +}; + +/* +* MD EXTAL PLL0 PLL1 PLL3 +* 14 13 19 (MHz) *1 *1 +*--------------------------------------------------- +* 0 0 0 15 x 1 x172/2 x208/2 x106 +* 0 0 1 15 x 1 x172/2 x208/2 x88 +* 0 1 0 20 x 1 x130/2 x156/2 x80 +* 0 1 1 20 x 1 x130/2 x156/2 x66 +* 1 0 0 26 / 2 x200/2 x240/2 x122 +* 1 0 1 26 / 2 x200/2 x240/2 x102 +* 1 1 0 30 / 2 x172/2 x208/2 x106 +* 1 1 1 30 / 2 x172/2 x208/2 x88 +* +* *1 : Table 7.6 indicates VCO ouput (PLLx = VCO/2) +*/ +#define CPG_PLL_CONFIG_INDEX (md) ((((md) & BIT(14)) >> 12) | \ + (((md) & BIT(13)) >> 12) | \ + (((md) & BIT(19)) >> 19)) +struct cpg_pll_config { +unsigned int extal_div; +unsigned int pll1_mult; +unsigned int pll3_mult; +}; + +static const struct cpg_pll_config cpg_pll_configs[8 ] = { + {1 ,208 ,106 }, {1 ,208 ,88 }, {1 ,156 ,80 }, {1 ,156 ,66 }, + {2 ,240 ,122 }, {2 ,240 ,102 }, {2 ,208 ,106 }, {2 ,208 ,88 }, +}; + +/* SDHI divisors */ +static const struct clk_div_table cpg_sdh_div_table[] = { + {0 ,2 }, {1 ,3 }, {2 ,4 }, {3 ,6 }, + {4 ,8 }, {5 ,12 }, {6 ,16 }, {7 ,18 }, + {8 ,24 }, {10 ,36 }, {11 ,48 }, {0 ,0 },
Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 71
Quoted 6 lines
drivers/clk/shmobile/clk-r8a7790.c new file +6
-0+}; + +static const struct clk_div_table cpg_sd01_div_table[] = { + {5 ,12 }, {6 ,16 }, {7 ,18 }, {8 ,24 }, + {10 ,36 }, {11 ,48 }, {12 ,10 }, {0 ,0 }, +};Can any or all of the above three constants be
__initconst?
Not the clk_div_table arrays, as they're stored in the divider clock structure internally and used at runtime. The cpg_pll_configs array, however, can. I'll fix that.
Quoted 7 lines
Quoted 7 lines
drivers/clk/shmobile/clk-r8a7790.c new file +7
-0+ +static u32 cpg_mode__initdata ; + +#define CPG_SDCKCR 0x00000074 + +static void __init r8a7790_cpg_clocks_init (struct device_node *np) +{
Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 84
Quoted 6 lines
drivers/clk/shmobile/clk-r8a7790.c new file +6
-0+const struct cpg_pll_config *config; +struct r8a7790_cpg *cpg; +struct clk **clks; +unsigned int i; + + cpg =kzalloc (sizeof (*cpg),GFP_KERNEL );Nit: s/sizeof(*cpg)/sizeof *cpg/, sizeof is an operator.
That's what I do in my non-kernel code, but the kernel coding style uses (). It took me a bit of time to get used to it :-)
Quoted 13 lines
Quoted 13 lines
drivers/clk/shmobile/clk-r8a7790.c new file +13
-0+ clks =kzalloc (CPG_NUM_CLOCKS *sizeof (*clks),GFP_KERNEL ); +if (cpg ==NULL || clks ==NULL ) { +kfree (clks); +kfree (cpg); +pr_err ("%s: failed to allocate cpg\n" , __func__); +return ; + } + +spin_lock_init (&cpg->lock); + + cpg->data.clks = clks; + cpg->data.clk_num =CPG_NUM_CLOCKS ; +
Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 103
Quoted 6 lines
drivers/clk/shmobile/clk-r8a7790.c new file +6
-0+ cpg->reg =of_iomap (np,0 ); +if (WARN_ON (cpg->reg ==NULL )) { +kfree (cpg->data.clks); +kfree (cpg); +return ; + }Perhaps this error checking could be merged with that of cpg and clks?
Morimoto-san has already pointed-out that issue. Here was my answer, your opinion would be appreciated.
Given that a failure to allocate memory or ioremap registers will lead to a boot failure, I wonder whether we couldn't just remove the kfree() calls and leak memory. Is there a point in cleaning up behind us if the system will no boot due to missing core clocks anyway ?
Quoted 41 lines
Quoted 41 lines
drivers/clk/shmobile/clk-r8a7790.c new file +41
-0+ + config = &cpg_pll_configs[CPG_PLL_CONFIG_INDEX (cpg_mode)]; + +for (i =0 ; i <CPG_NUM_CLOCKS ; ++i) { +const struct clk_div_table *table =NULL ; +const char *parent_name ="main" ; +const char *name; +unsigned int shift; +unsigned int mult =1 ; +unsigned int div =1 ; +struct clk *clk; + +of_property_read_string_index (np,"clock-output-names" , i, + &name); + +switch (i) { +case R8A7790_CLK_MAIN : + parent_name =of_clk_get_parent_name (np,0 ); + div = config->extal_div; +break ; +case R8A7790_CLK_PLL1 : + mult = config->pll1_mult /2 ; +break ; +case R8A7790_CLK_PLL3 : + mult = config->pll3_mult; +break ; +case R8A7790_CLK_LB : + div = cpg_mode &BIT (18 ) ?36 :24 ; +break ; +case R8A7790_CLK_QSPI : + div = (cpg_mode & (BIT (3 ) |BIT (2 ) |BIT (1 ))) ==BIT (2 ) + ?16 :20 ; +break ; +case R8A7790_CLK_SDH : + table = cpg_sdh_div_table; + shift =8 ; +break ; +case R8A7790_CLK_SD0 : + table = cpg_sd01_div_table; + shift =4 ; +break ;
Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 149
Quoted 5 lines
drivers/clk/shmobile/clk-r8a7790.c new file +5
-0+case R8A7790_CLK_SD1 : + table = cpg_sd01_div_table; + shift =0 ; +break ; + }I wonder if it would be good to and skip the portions below if the switch statement hits a default: case.
Yes, but that would be a bug in the driver, as all cases should be handled :-)
Quoted 2 lines
Also, if i was an enum type then I think the C compiler would warn about any missing cases. That might be nice too.
It would be, but the DT compiler doesn't support enums, so we're stuck with #define's if we want to share them between .dts and C files.
Quoted 75 lines
Quoted 75 lines
drivers/clk/shmobile/clk-r8a7790.c new file +27
-0+ +if (!table) + clk =clk_register_fixed_factor (NULL , name, parent_name, +0 , mult, div); +else + clk =clk_register_divider_table (NULL , name, + parent_name,0 , + cpg->reg +CPG_SDCKCR , + shift,4 ,0 , table, + &cpg->lock); + +if (IS_ERR (clk)) +pr_err ("%s: failed to register %s %s clock (%ld)\n" , + __func__, np->name, name,PTR_ERR (clk)); + } + +of_clk_add_provider (np, of_clk_src_onecell_get, &cpg->data); +} +CLK_OF_DECLARE (r8a7790_cpg_clks,"renesas,r8a7790-cpg-clocks" , + r8a7790_cpg_clocks_init); + +void __init r8a7790_clocks_init (u32 mode) +{ + cpg_mode = mode; + +of_clk_init (NULL ); +}(quoted diff) +0
-0
b/include/dt-bindings/clock/r8a7790-clock.hindex 19f2b48..f0ed742 100644include/dt-bindings/clock/r8a7790-clock.h +10
-0@@ -10,6 +10,16 @@#ifndef __DT_BINDINGS_CLOCK_R8A7790_H__#define __DT_BINDINGS_CLOCK_R8A7790_H__ +/* CPG */ +#define R8A7790_CLK_MAIN 0 +#define R8A7790_CLK_PLL1 1 +#define R8A7790_CLK_PLL3 2 +#define R8A7790_CLK_LB 3 +#define R8A7790_CLK_QSPI 4 +#define R8A7790_CLK_SDH 5 +#define R8A7790_CLK_SD0 6 +#define R8A7790_CLK_SD1 7 +/* MSTP1 */ #define
R8A7790_CLK_CMT020include/linux/clk/shmobile.h new file +19
-0@@ -0,0 +1,19 @@ +/* +* Copyright 2013 Ideas On Board SPRL +* +* Contact: Laurent Pinchart <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +#ifndef __LINUX_CLK_SHMOBILE_H_ +#define __LINUX_CLK_SHMOBILE_H_ + +#include <linux/types.h> + +void r8a7790_clocks_init (u32 mode); + +#endif
Signature · 3 lines
Regards, Laurent Pinchart
PATCH 3/3 clk: shmobile: Add R8A7790 clocks support
Quoted 123 lines · Laurent Pinchart
Hi Simon,
Quoted 41 lines · On Wednesday 06 November 2013 16:18:09 Simon Horman wrote:
Quoted 40 lines · Laurent Pinchart
The R8A7790 has several clocks that are too custom to be supported in a generic driver. Those clocks can be divided in two categories:
- Fixed rate clocks with multiplier and divisor set according to boot mode configuration
- Custom divider clocks with SoC-specific divider values
This driver supports both.
Signed-off-by: Laurent Pinchart
<[email protected]>
---.../bindings/clock/renesas,r8a7790-cpg-clocks.txt | 26 +++ drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-r8a7790.c | 176 ++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 10 ++ include/linux/clk/shmobile.h | 19 +++ 5 files changed, 232 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt create mode 100644 drivers/clk/shmobile/clk-r8a7790.c create mode 100644 include/linux/clk/shmobile.hdiff --git
a/Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txtb/Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txtnew file mode 100644
index 0000000..d889917
---/dev/null
+++b/Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txtDocumentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +6
-0@@ -0,0 +1,26 @@ +* Renesas R8A7790 Clock Pulse Generator (CPG) + +The CPG generates core clocks for the R8A7790. It includes three PLLs and +several fixed ratio dividers. + +Required Properties:Quoted 8 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt line 12
Quoted 6 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +6
-0+ + - compatible: Must be "renesas,r8a7790-cpg-clocks" + - reg: Base address and length of the memory resource used by the CPG + - clocks: Reference to the parent clock + - #clock-cells: Must be 1 + - clock-output-names: The name of the clocks, must be "main", "pll1",s/The name/The names/
Will fix, thank you.
Quoted 17 lines
Quoted 4 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +4
-0+ "pll3", "lb", "qspi", "sdh", "sd0", "sd1". + + +ExampleDocumentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt line 26
Quoted 10 lines
Documentation/devicetree/bindings/clock/renesas,r8a7790-cpg-clocks.txt new file +10
-0+------- + + cpg_clocks: cpg_clocks { + compatible = "renesas,r8a7790-cpg-clocks"; + reg = <0 0xe6150000 0 0x1000>; + clocks = <&extal_clk>; + #clock-cells = <1>; + clock-output-names = "main", "pll1", "pll3", "lb", + "qspi", "sdh", "sd0", "sd1"; + };I wonder if it makes sense to craft a more generic bindings document.
Quoted 6 lines
I am currently working on clock support for the r8a7779 (H1) based on this patch series and I expect the bindings to end up being more or less the same.
I expect there to be similar support to be added for many other renesas SoCs over time.
That's a good idea. I'll gladly review patches :-)
Quoted 33 lines
Quoted 33 lines
drivers/clk/shmobile/Makefile +1
-0@@ -1,4 +1,5 @@ obj-$(CONFIG_ARCH_EMEV2) += clk-emev2.o +obj-$(CONFIG_ARCH_R8A7790) += clk-r8a7790.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.o(quoted diff) +0
-0
b/drivers/clk/shmobile/clk-r8a7790.cnew file mode 100644 index 0000000..2e76638drivers/clk/shmobile/clk-r8a7790.c new file +18
-0@@ -0,0 +1,176 @@ +/* +* r8a7790 Core CPG Clocks +* +* Copyright (C) 2013 Ideas On Board SPRL +* +* Contact: Laurent Pinchart <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; version 2 of the License. +*/ + +#include <linux/clk-provider.h> +#include <linux/clkdev.h> +#include <linux/clk/shmobile.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/of.h> Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 24
Quoted 6 lines
drivers/clk/shmobile/clk-r8a7790.c new file +6
-0+#include <linux/of_address.h> +#include <linux/spinlock.h> + +#include <dt-bindings/clock/r8a7790-clock.h> + +#define CPG_NUM_CLOCKS (R8A7790_CLK_SD1 + 1)Perhaps
R8A7790_NUM_CLOCKSinr8a7790-clock.hwould be nicer.
Quoted 4 lines
Good question. The dt-bindings/ headers are primarly meant to store macros used by .dts files and (possibly) shared with C code. Given that
R8A7790_NUM_CLOCKSisn't used by .dts files I'm not sure it would belong to that header.
That makes sense. Lets leave things as you have them.
Quoted 95 lines
Quoted 41 lines
Quoted 41 lines
drivers/clk/shmobile/clk-r8a7790.c new file +41
-0+ +struct r8a7790_cpg { +struct clk_onecell_data data; +spinlock_t lock; +void __iomem *reg; +}; + +/* +* MD EXTAL PLL0 PLL1 PLL3 +* 14 13 19 (MHz) *1 *1 +*--------------------------------------------------- +* 0 0 0 15 x 1 x172/2 x208/2 x106 +* 0 0 1 15 x 1 x172/2 x208/2 x88 +* 0 1 0 20 x 1 x130/2 x156/2 x80 +* 0 1 1 20 x 1 x130/2 x156/2 x66 +* 1 0 0 26 / 2 x200/2 x240/2 x122 +* 1 0 1 26 / 2 x200/2 x240/2 x102 +* 1 1 0 30 / 2 x172/2 x208/2 x106 +* 1 1 1 30 / 2 x172/2 x208/2 x88 +* +* *1 : Table 7.6 indicates VCO ouput (PLLx = VCO/2) +*/ +#define CPG_PLL_CONFIG_INDEX (md) ((((md) & BIT(14)) >> 12) | \ + (((md) & BIT(13)) >> 12) | \ + (((md) & BIT(19)) >> 19)) +struct cpg_pll_config { +unsigned int extal_div; +unsigned int pll1_mult; +unsigned int pll3_mult; +}; + +static const struct cpg_pll_config cpg_pll_configs[8 ] = { + {1 ,208 ,106 }, {1 ,208 ,88 }, {1 ,156 ,80 }, {1 ,156 ,66 }, + {2 ,240 ,122 }, {2 ,240 ,102 }, {2 ,208 ,106 }, {2 ,208 ,88 }, +}; + +/* SDHI divisors */ +static const struct clk_div_table cpg_sdh_div_table[] = { + {0 ,2 }, {1 ,3 }, {2 ,4 }, {3 ,6 }, + {4 ,8 }, {5 ,12 }, {6 ,16 }, {7 ,18 }, + {8 ,24 }, {10 ,36 }, {11 ,48 }, {0 ,0 },Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 71
Quoted 6 lines
drivers/clk/shmobile/clk-r8a7790.c new file +6
-0+}; + +static const struct clk_div_table cpg_sd01_div_table[] = { + {5 ,12 }, {6 ,16 }, {7 ,18 }, {8 ,24 }, + {10 ,36 }, {11 ,48 }, {12 ,10 }, {0 ,0 }, +};Can any or all of the above three constants be
__initconst?Not the
clk_div_tablearrays, as they're stored in the divider clock structure internally and used at runtime. Thecpg_pll_configsarray, however, can. I'll fix that.Quoted 7 lines
Quoted 7 lines
drivers/clk/shmobile/clk-r8a7790.c new file +7
-0+ +static u32 cpg_mode__initdata ; + +#define CPG_SDCKCR 0x00000074 + +static void __init r8a7790_cpg_clocks_init (struct device_node *np) +{Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 84
Quoted 6 lines
drivers/clk/shmobile/clk-r8a7790.c new file +6
-0+const struct cpg_pll_config *config; +struct r8a7790_cpg *cpg; +struct clk **clks; +unsigned int i; + + cpg =kzalloc (sizeof (*cpg),GFP_KERNEL );Nit: s/sizeof(*cpg)/sizeof *cpg/, sizeof is an operator.
That's what I do in my non-kernel code, but the kernel coding style uses (). It took me a bit of time to get used to it :-)
Quoted 13 lines
Quoted 13 lines
drivers/clk/shmobile/clk-r8a7790.c new file +13
-0+ clks =kzalloc (CPG_NUM_CLOCKS *sizeof (*clks),GFP_KERNEL ); +if (cpg ==NULL || clks ==NULL ) { +kfree (clks); +kfree (cpg); +pr_err ("%s: failed to allocate cpg\n" , __func__); +return ; + } + +spin_lock_init (&cpg->lock); + + cpg->data.clks = clks; + cpg->data.clk_num =CPG_NUM_CLOCKS ; +Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 103
Quoted 6 lines
drivers/clk/shmobile/clk-r8a7790.c new file +6
-0+ cpg->reg =of_iomap (np,0 ); +if (WARN_ON (cpg->reg ==NULL )) { +kfree (cpg->data.clks); +kfree (cpg); +return ; + }Perhaps this error checking could be merged with that of cpg and clks?
Quoted 7 lines
Morimoto-san has already pointed-out that issue. Here was my answer, your opinion would be appreciated.
Given that a failure to allocate memory or ioremap registers will lead to a boot failure, I wonder whether we couldn't just remove the
kfree()calls and leak memory. Is there a point in cleaning up behind us if the system will no boot due to missing core clocks anyway ?
That sounds reasonable to me. But if you go that way I think you should put detail the decision in a comment in r8a7790_cpg_clocks_init(). Otherwise it seems likely that someone will come and clean up the memory leak at some later date.
Quoted 51 lines
Quoted 42 lines
Quoted 42 lines
drivers/clk/shmobile/clk-r8a7790.c new file +41
-0+ + config = &cpg_pll_configs[CPG_PLL_CONFIG_INDEX (cpg_mode)]; + +for (i =0 ; i <CPG_NUM_CLOCKS ; ++i) { +const struct clk_div_table *table =NULL ; +const char *parent_name ="main" ; +const char *name; +unsigned int shift; +unsigned int mult =1 ; +unsigned int div =1 ; +struct clk *clk; + +of_property_read_string_index (np,"clock-output-names" , i, + &name); + +switch (i) { +case R8A7790_CLK_MAIN : + parent_name =of_clk_get_parent_name (np,0 ); + div = config->extal_div; +break ; +case R8A7790_CLK_PLL1 : + mult = config->pll1_mult /2 ; +break ; +case R8A7790_CLK_PLL3 : + mult = config->pll3_mult; +break ; +case R8A7790_CLK_LB : + div = cpg_mode &BIT (18 ) ?36 :24 ; +break ; +case R8A7790_CLK_QSPI : + div = (cpg_mode & (BIT (3 ) |BIT (2 ) |BIT (1 ))) ==BIT (2 ) + ?16 :20 ; +break ; +case R8A7790_CLK_SDH : + table = cpg_sdh_div_table; + shift =8 ; +break ; +case R8A7790_CLK_SD0 : + table = cpg_sd01_div_table; + shift =4 ; +break ;Quoted 8 lines
drivers/clk/shmobile/clk-r8a7790.c line 149
Quoted 5 lines
drivers/clk/shmobile/clk-r8a7790.c new file +5
-0+case R8A7790_CLK_SD1 : + table = cpg_sd01_div_table; + shift =0 ; +break ; + }I wonder if it would be good to and skip the portions below if the switch statement hits a default: case.
Quoted 7 lines
Yes, but that would be a bug in the driver, as all cases should be handled :-)
Quoted 2 lines
Also, if i was an enum type then I think the C compiler would warn about any missing cases. That might be nice too.
It would be, but the DT compiler doesn't support enums, so we're stuck with #define's if we want to share them between .dts and C files.
That makes sense. Lets leave things as you have them.
Quoted 81 lines
Quoted 76 lines
Quoted 76 lines
drivers/clk/shmobile/clk-r8a7790.c new file +27
-0+ +if (!table) + clk =clk_register_fixed_factor (NULL , name, parent_name, +0 , mult, div); +else + clk =clk_register_divider_table (NULL , name, + parent_name,0 , + cpg->reg +CPG_SDCKCR , + shift,4 ,0 , table, + &cpg->lock); + +if (IS_ERR (clk)) +pr_err ("%s: failed to register %s %s clock (%ld)\n" , + __func__, np->name, name,PTR_ERR (clk)); + } + +of_clk_add_provider (np, of_clk_src_onecell_get, &cpg->data); +} +CLK_OF_DECLARE (r8a7790_cpg_clks,"renesas,r8a7790-cpg-clocks" , + r8a7790_cpg_clocks_init); + +void __init r8a7790_clocks_init (u32 mode) +{ + cpg_mode = mode; + +of_clk_init (NULL ); +}(quoted diff) +0
-0
b/include/dt-bindings/clock/r8a7790-clock.hindex 19f2b48..f0ed742 100644include/dt-bindings/clock/r8a7790-clock.h +10
-0@@ -10,6 +10,16 @@#ifndef __DT_BINDINGS_CLOCK_R8A7790_H__#define __DT_BINDINGS_CLOCK_R8A7790_H__ +/* CPG */ +#define R8A7790_CLK_MAIN 0 +#define R8A7790_CLK_PLL1 1 +#define R8A7790_CLK_PLL3 2 +#define R8A7790_CLK_LB 3 +#define R8A7790_CLK_QSPI 4 +#define R8A7790_CLK_SDH 5 +#define R8A7790_CLK_SD0 6 +#define R8A7790_CLK_SD1 7 +/* MSTP1 */ #define
R8A7790_CLK_CMT020include/linux/clk/shmobile.h new file +19
-0@@ -0,0 +1,19 @@ +/* +* Copyright 2013 Ideas On Board SPRL +* +* Contact: Laurent Pinchart <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +#ifndef __LINUX_CLK_SHMOBILE_H_ +#define __LINUX_CLK_SHMOBILE_H_ + +#include <linux/types.h> + +void r8a7790_clocks_init (u32 mode); + +#endif Signature · 3 lines
Regards, Laurent Pinchart