Renesas R-Car Gen2 Common Clock Framework arch/ support
Subsystems (3)
v4 cover Renesas R-Car Gen2 Common Clock Framework arch/ support
Hello,
This is a repost of the arch patches from the "[PATCH v3 0/8] Renesas R-Car Gen2 Common Clock Framework support" patch series. The first three patches in that series have been reposted separately in the "[PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers" series to get merged through Mike Turquette's tree, while this series will go through the ARM SoC tree.
I've asked Mike to provide a stable branch when merging the CCF driver patches.
Laurent Pinchart (5):
ARM: shmobile: r8a7790: Add clock index macros for DT sources
ARM: shmobile: r8a7791: Add clock index macros for DT sources
ARM: shmobile: r8a7790: Add clocks
ARM: shmobile: r8a7790: Reference clocks
ARM: shmobile: r8a7791: Add clocks
arch/arm/boot/dts/r8a7790.dtsi | 328 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/r8a7791.dtsi | 313 ++++++++++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 100 +++++++++ include/dt-bindings/clock/r8a7791-clock.h | 105 ++++++++++ 4 files changed, 846 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7790-clock.h create mode 100644 include/dt-bindings/clock/r8a7791-clock.h
Signature · 3 lines
Regards, Laurent Pinchart
PATCH v4 1/5 ARM: shmobile: r8a7790: Add clock index macros for DT sources
Add macros usable by device tree sources to reference r8a7790 clocks by index.
--- include/dt-bindings/clock/r8a7790-clock.h | 100 ++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7790-clock.h
include/dt-bindings/clock/r8a7790-clock.h new file +100 -0
@@ -0,0 +1,100 @@ +/* +* 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. +*/ + +#ifndef __DT_BINDINGS_CLOCK_R8A7790_H__ +#define __DT_BINDINGS_CLOCK_R8A7790_H__ + +/* CPG */ +#define R8A7790_CLK_MAIN 0 +#define R8A7790_CLK_PLL0 1 +#define R8A7790_CLK_PLL1 2 +#define R8A7790_CLK_PLL3 3 +#define R8A7790_CLK_LB 4 +#define R8A7790_CLK_QSPI 5 +#define R8A7790_CLK_SDH 6 +#define R8A7790_CLK_SD0 7 +#define R8A7790_CLK_SD1 8 +#define R8A7790_CLK_Z 9 + +/* MSTP1 */ +#define R8A7790_CLK_TMU1 11 +#define R8A7790_CLK_TMU3 21 +#define R8A7790_CLK_TMU2 22 +#define R8A7790_CLK_CMT0 24 +#define R8A7790_CLK_TMU0 25 +#define R8A7790_CLK_VSP1_DU1 27 +#define R8A7790_CLK_VSP1_DU0 28 +#define R8A7790_CLK_VSP1_RT 30 +#define R8A7790_CLK_VSP1_SY 31 + +/* 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 +#define R8A7790_CLK_SYS_DMAC0 18 +#define R8A7790_CLK_SYS_DMAC1 19 + +/* 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 +#define R8A7790_CLK_SSUSB 28 +#define R8A7790_CLK_CMT1 29 +#define R8A7790_CLK_USBDMAC0 30 +#define R8A7790_CLK_USBDMAC1 31 + +/* MSTP5 */ +#define R8A7790_CLK_THERMAL 22 +#define R8A7790_CLK_PWM 23 + +/* MSTP7 */ +#define R8A7790_CLK_EHCI 3 +#define R8A7790_CLK_HSUSB 4 +#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_VIN3 8 +#define R8A7790_CLK_VIN2 9 +#define R8A7790_CLK_VIN1 10 +#define R8A7790_CLK_VIN0 11 +#define R8A7790_CLK_ETHER 13 +#define R8A7790_CLK_SATA1 14 +#define R8A7790_CLK_SATA0 15 + +/* MSTP9 */ +#define R8A7790_CLK_GPIO5 7 +#define R8A7790_CLK_GPIO4 8 +#define R8A7790_CLK_GPIO3 9 +#define R8A7790_CLK_GPIO2 10 +#define R8A7790_CLK_GPIO1 11 +#define R8A7790_CLK_GPIO0 12 +#define R8A7790_CLK_RCAN1 15 +#define R8A7790_CLK_RCAN0 16 +#define R8A7790_CLK_IICDVFS 26 +#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 · 1 line
1.8.3.2
PATCH v4 2/5 ARM: shmobile: r8a7791: Add clock index macros for DT sources
In reply to Laurent PinchartAdd macros usable by device tree sources to reference r8a7791 clocks by index.
--- include/dt-bindings/clock/r8a7791-clock.h | 105 ++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7791-clock.h
include/dt-bindings/clock/r8a7791-clock.h new file +105 -0
@@ -0,0 +1,105 @@ +/* +* 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. +*/ + +#ifndef __DT_BINDINGS_CLOCK_R8A7791_H__ +#define __DT_BINDINGS_CLOCK_R8A7791_H__ + +/* CPG */ +#define R8A7791_CLK_MAIN 0 +#define R8A7791_CLK_PLL0 1 +#define R8A7791_CLK_PLL1 2 +#define R8A7791_CLK_PLL3 3 +#define R8A7791_CLK_LB 4 +#define R8A7791_CLK_QSPI 5 +#define R8A7791_CLK_SDH 6 +#define R8A7791_CLK_SD0 7 +#define R8A7791_CLK_Z 8 + +/* MSTP1 */ +#define R8A7791_CLK_TMU1 11 +#define R8A7791_CLK_TMU3 21 +#define R8A7791_CLK_TMU2 22 +#define R8A7791_CLK_CMT0 24 +#define R8A7791_CLK_TMU0 25 +#define R8A7791_CLK_VSP1_DU1 27 +#define R8A7791_CLK_VSP1_DU0 28 +#define R8A7791_CLK_VSP1_SY 31 + +/* MSTP2 */ +#define R8A7791_CLK_SCIFA2 2 +#define R8A7791_CLK_SCIFA1 3 +#define R8A7791_CLK_SCIFA0 4 +#define R8A7791_CLK_SCIFB0 6 +#define R8A7791_CLK_SCIFB1 7 +#define R8A7791_CLK_SCIFB2 16 +#define R8A7791_CLK_DMAC 18 + +/* MSTP3 */ +#define R8A7791_CLK_TPU0 4 +#define R8A7791_CLK_SDHI2 11 +#define R8A7791_CLK_SDHI1 12 +#define R8A7791_CLK_SDHI0 14 +#define R8A7791_CLK_MMCIF0 15 +#define R8A7791_CLK_SSUSB 28 +#define R8A7791_CLK_CMT1 29 +#define R8A7791_CLK_USBDMAC0 30 +#define R8A7791_CLK_USBDMAC1 31 + +/* MSTP5 */ +#define R8A7791_CLK_THERMAL 22 +#define R8A7791_CLK_PWM 23 + +/* MSTP7 */ +#define R8A7791_CLK_HSUSB 4 +#define R8A7791_CLK_HSCIF2 13 +#define R8A7791_CLK_SCIF5 14 +#define R8A7791_CLK_SCIF4 15 +#define R8A7791_CLK_HSCIF1 16 +#define R8A7791_CLK_HSCIF0 17 +#define R8A7791_CLK_SCIF3 18 +#define R8A7791_CLK_SCIF2 19 +#define R8A7791_CLK_SCIF1 20 +#define R8A7791_CLK_SCIF0 21 +#define R8A7791_CLK_DU1 23 +#define R8A7791_CLK_DU0 24 +#define R8A7791_CLK_LVDS0 26 + +/* MSTP8 */ +#define R8A7791_CLK_VIN2 9 +#define R8A7791_CLK_VIN1 10 +#define R8A7791_CLK_VIN0 11 +#define R8A7791_CLK_ETHER 13 +#define R8A7791_CLK_SATA1 14 +#define R8A7791_CLK_SATA0 15 + +/* MSTP9 */ +#define R8A7791_CLK_GPIO7 4 +#define R8A7791_CLK_GPIO6 5 +#define R8A7791_CLK_GPIO5 7 +#define R8A7791_CLK_GPIO4 8 +#define R8A7791_CLK_GPIO3 9 +#define R8A7791_CLK_GPIO2 10 +#define R8A7791_CLK_GPIO1 11 +#define R8A7791_CLK_GPIO0 12 +#define R8A7791_CLK_RCAN1 15 +#define R8A7791_CLK_RCAN0 16 +#define R8A7791_CLK_I2C5 25 +#define R8A7791_CLK_IICDVFS 26 +#define R8A7791_CLK_I2C4 27 +#define R8A7791_CLK_I2C3 28 +#define R8A7791_CLK_I2C2 29 +#define R8A7791_CLK_I2C1 30 +#define R8A7791_CLK_I2C0 31 + +/* MSTP11 */ +#define R8A7791_CLK_SCIFA3 6 +#define R8A7791_CLK_SCIFA4 7 +#define R8A7791_CLK_SCIFA5 8 + +#endif /* __DT_BINDINGS_CLOCK_R8A7791_H__ */
Signature · 1 line
1.8.3.2
PATCH v4 3/5 ARM: shmobile: r8a7790: Add clocks
In reply to Laurent PinchartDeclare all core clocks and DIV6 clocks, as well as all MSTP clocks currently used by r8a7790 boards.
--- arch/arm/boot/dts/r8a7790.dtsi | 318 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 318 insertions(+)
arch/arm/boot/dts/r8a7790.dtsi +318 -0
@@ -8,6 +8,7 @@ * kind, whether express or implied. */ +#include <dt-bindings/clock/r8a7790-clock.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h>
@@ -287,4 +288,321 @@ cap-sd-highspeed; status = "disabled"; }; + + clocks { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* External root clock */ + extal_clk: extal_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + /* This value must be overriden by the board. */ + clock-frequency = <0>; + clock-output-names = "extal"; + }; + + /* Special CPG clocks */ + cpg_clocks: cpg_clocks at e6150000 { + compatible = "renesas,r8a7790-cpg-clocks", + "renesas,rcar-gen2-cpg-clocks"; + reg = <0 0xe6150000 0 0x1000>; + clocks = <&extal_clk>; + #clock-cells = <1>; + clock-output-names = "main", "pll0", "pll1", "pll3", + "lb", "qspi", "sdh", "sd0", "sd1", + "z"; + }; + + /* Variable factor clocks */ + sd2_clk: sd2_clk at e6150078 { + 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"; + }; + sd3_clk: sd3_clk at e615007c { + compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe615007c 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "sd3"; + }; + mmc0_clk: mmc0_clk at e6150240 { + compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150240 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "mmc0"; + }; + mmc1_clk: mmc1_clk at e6150244 { + compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150244 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "mmc1"; + }; + ssp_clk: ssp_clk at e6150248 { + compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150248 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "ssp"; + }; + ssprs_clk: ssprs_clk at e615024c { + compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe615024c 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "ssprs"; + }; + + /* Fixed factor clocks */ + pll1_div2_clk: pll1_div2_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "pll1_div2"; + }; + z2_clk: z2_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "z2"; + }; + zg_clk: zg_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <3>; + clock-mult = <1>; + clock-output-names = "zg"; + }; + zx_clk: zx_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <3>; + clock-mult = <1>; + clock-output-names = "zx"; + }; + zs_clk: zs_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <6>; + clock-mult = <1>; + clock-output-names = "zs"; + }; + hp_clk: hp_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <12>; + clock-mult = <1>; + clock-output-names = "hp"; + }; + i_clk: i_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "i"; + }; + b_clk: b_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <12>; + clock-mult = <1>; + clock-output-names = "b"; + }; + p_clk: p_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <24>; + clock-mult = <1>; + clock-output-names = "p"; + }; + cl_clk: cl_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <48>; + clock-mult = <1>; + clock-output-names = "cl"; + }; + m2_clk: m2_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <8>; + clock-mult = <1>; + clock-output-names = "m2"; + }; + imp_clk: imp_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <4>; + clock-mult = <1>; + clock-output-names = "imp"; + }; + rclk_clk: rclk_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <(48 * 1024)>; + clock-mult = <1>; + clock-output-names = "rclk"; + }; + oscclk_clk: oscclk_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <(12 * 1024)>; + clock-mult = <1>; + clock-output-names = "oscclk"; + }; + zb3_clk: zb3_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL3>; + #clock-cells = <0>; + clock-div = <4>; + clock-mult = <1>; + clock-output-names = "zb3"; + }; + zb3d2_clk: zb3d2_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL3>; + #clock-cells = <0>; + clock-div = <8>; + clock-mult = <1>; + clock-output-names = "zb3d2"; + }; + ddr_clk: ddr_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7790_CLK_PLL3>; + #clock-cells = <0>; + clock-div = <8>; + clock-mult = <1>; + clock-output-names = "ddr"; + }; + mp_clk: mp_clk { + compatible = "fixed-factor-clock"; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-div = <15>; + clock-mult = <1>; + clock-output-names = "mp"; + }; + cp_clk: cp_clk { + compatible = "fixed-factor-clock"; + clocks = <&extal_clk>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "cp"; + }; + + /* Gate clocks */ + mstp1_clks: mstp1_clks at e6150134 { + compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>; + clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>, + <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>, + <&zs_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7790_CLK_TMU1 R8A7790_CLK_TMU3 R8A7790_CLK_TMU2 + R8A7790_CLK_CMT0 R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1 + R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_RT R8A7790_CLK_VSP1_SY + >; + clock-output-names = + "tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1", + "vsp1-du0", "vsp1-rt", "vsp1-sy"; + }; + mstp2_clks: mstp2_clks at e6150138 { + compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; + clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, + <&mp_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7790_CLK_SCIFA2 R8A7790_CLK_SCIFA1 R8A7790_CLK_SCIFA0 + R8A7790_CLK_SCIFB0 R8A7790_CLK_SCIFB1 R8A7790_CLK_SCIFB2 + >; + clock-output-names = + "scifa2", "scifa1", "scifa0", "scifb0", "scifb1", + "scifb2"; + }; + mstp3_clks: mstp3_clks at e615013c { + 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>, <&rclk_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 + R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 + R8A7790_CLK_MMCIF0 R8A7790_CLK_CMT1 + >; + clock-output-names = + "tpu0", "mmcif1", "sdhi3", "sdhi2", + "sdhi1", "sdhi0", "mmcif0", "cmt1"; + }; + mstp5_clks: mstp5_clks at e6150144 { + compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; + clocks = <&extal_clk>, <&p_clk>; + #clock-cells = <1>; + renesas,clock-indices = <R8A7790_CLK_THERMAL R8A7790_CLK_PWM>; + clock-output-names = "thermal", "pwm"; + }; + mstp7_clks: mstp7_clks at e615014c { + compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>; + clocks = <&mp_clk>, <&mp_clk>, <&zs_clk>, <&zs_clk>, <&p_clk>, + <&p_clk>, <&zx_clk>, <&zx_clk>, <&zx_clk>, <&zx_clk>, + <&zx_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7790_CLK_EHCI R8A7790_CLK_HSUSB R8A7790_CLK_HSCIF1 + R8A7790_CLK_HSCIF0 R8A7790_CLK_SCIF1 R8A7790_CLK_SCIF0 + R8A7790_CLK_DU2 R8A7790_CLK_DU1 R8A7790_CLK_DU0 + R8A7790_CLK_LVDS1 R8A7790_CLK_LVDS0 + >; + clock-output-names = + "ehci", "hsusb", "hscif1", "hscif0", "scif1", + "scif0", "du2", "du1", "du0", "lvds1", "lvds0"; + }; + mstp8_clks: mstp8_clks at e6150990 { + compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>; + clocks = <&p_clk>; + #clock-cells = <1>; + renesas,clock-indices = <R8A7790_CLK_ETHER>; + clock-output-names = "ether"; + }; + mstp9_clks: mstp9_clks at e6150994 { + compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>; + clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7790_CLK_RCAN1 R8A7790_CLK_RCAN0 R8A7790_CLK_I2C3 + R8A7790_CLK_I2C2 R8A7790_CLK_I2C1 R8A7790_CLK_I2C0 + >; + clock-output-names = "rcan1", "rcan0", "i2c3", "i2c2", "i2c1", "i2c0"; + }; + }; };
Signature · 1 line
1.8.3.2
PATCH v4 4/5 ARM: shmobile: r8a7790: Reference clocks
In reply to Laurent PinchartReference clocks using a "clocks" property in all nodes corresponding to devices that require a clock.
--- arch/arm/boot/dts/r8a7790.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/boot/dts/r8a7790.dtsi +10 -0
@@ -197,6 +197,7 @@ reg = <0 0xe6508000 0 0x40>; interrupt-parent = <&gic>; interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_I2C0>; status = "disabled"; };
@@ -207,6 +208,7 @@ reg = <0 0xe6518000 0 0x40>; interrupt-parent = <&gic>; interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_I2C1>; status = "disabled"; };
@@ -217,6 +219,7 @@ reg = <0 0xe6530000 0 0x40>; interrupt-parent = <&gic>; interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_I2C2>; status = "disabled"; };
@@ -227,6 +230,7 @@ reg = <0 0xe6540000 0 0x40>; interrupt-parent = <&gic>; interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_I2C3>; status = "disabled"; };
@@ -235,6 +239,7 @@ reg = <0 0xee200000 0 0x80>; interrupt-parent = <&gic>; interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_MMCIF0>; reg-io-width = <4>; status = "disabled"; };
@@ -244,6 +249,7 @@ reg = <0 0xee220000 0 0x80>; interrupt-parent = <&gic>; interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_MMCIF1>; reg-io-width = <4>; status = "disabled"; };
@@ -258,6 +264,7 @@ reg = <0 0xee100000 0 0x100>; interrupt-parent = <&gic>; interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_SDHI0>; cap-sd-highspeed; status = "disabled"; };
@@ -267,6 +274,7 @@ reg = <0 0xee120000 0 0x100>; interrupt-parent = <&gic>; interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_SDHI1>; cap-sd-highspeed; status = "disabled"; };
@@ -276,6 +284,7 @@ reg = <0 0xee140000 0 0x100>; interrupt-parent = <&gic>; interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_SDHI2>; cap-sd-highspeed; status = "disabled"; };
@@ -285,6 +294,7 @@ reg = <0 0xee160000 0 0x100>; interrupt-parent = <&gic>; interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_SDHI3>; cap-sd-highspeed; status = "disabled"; };
Signature · 1 line
1.8.3.2
PATCH v4 5/5 ARM: shmobile: r8a7791: Add clocks
In reply to Laurent PinchartDeclare all core clocks and DIV6 clocks, as well as all MSTP clocks currently used by r8a7791 boards.
--- arch/arm/boot/dts/r8a7791.dtsi | 313 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 313 insertions(+)
arch/arm/boot/dts/r8a7791.dtsi +313 -0
@@ -9,6 +9,7 @@ * kind, whether express or implied. */ +#include <dt-bindings/clock/r8a7791-clock.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h>
@@ -183,4 +184,316 @@ reg = <0 0xe6060000 0 0x250>; #gpio-range-cells = <3>; }; + + clocks { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* External root clock */ + extal_clk: extal_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + /* This value must be overriden by the board. */ + clock-frequency = <0>; + clock-output-names = "extal"; + }; + + /* Special CPG clocks */ + cpg_clocks: cpg_clocks at e6150000 { + compatible = "renesas,r8a7791-cpg-clocks", + "renesas,rcar-gen2-cpg-clocks"; + reg = <0 0xe6150000 0 0x1000>; + clocks = <&extal_clk>; + #clock-cells = <1>; + clock-output-names = "main", "pll0", "pll1", "pll3", + "lb", "qspi", "sdh", "sd0", "z"; + }; + + /* Variable factor clocks */ + sd1_clk: sd2_clk at e6150078 { + compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150078 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "sd1"; + }; + sd2_clk: sd3_clk at e615007c { + compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe615007c 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "sd2"; + }; + mmc0_clk: mmc0_clk at e6150240 { + compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150240 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "mmc0"; + }; + ssp_clk: ssp_clk at e6150248 { + compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe6150248 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "ssp"; + }; + ssprs_clk: ssprs_clk at e615024c { + compatible = "renesas,r8a7791-div6-clock", "renesas,cpg-div6-clock"; + reg = <0 0xe615024c 0 4>; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-output-names = "ssprs"; + }; + + /* Fixed factor clocks */ + pll1_div2_clk: pll1_div2_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "pll1_div2"; + }; + zg_clk: zg_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <3>; + clock-mult = <1>; + clock-output-names = "zg"; + }; + zx_clk: zx_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <3>; + clock-mult = <1>; + clock-output-names = "zx"; + }; + zs_clk: zs_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <6>; + clock-mult = <1>; + clock-output-names = "zs"; + }; + hp_clk: hp_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <12>; + clock-mult = <1>; + clock-output-names = "hp"; + }; + i_clk: i_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "i"; + }; + b_clk: b_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <12>; + clock-mult = <1>; + clock-output-names = "b"; + }; + p_clk: p_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <24>; + clock-mult = <1>; + clock-output-names = "p"; + }; + cl_clk: cl_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <48>; + clock-mult = <1>; + clock-output-names = "cl"; + }; + m2_clk: m2_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <8>; + clock-mult = <1>; + clock-output-names = "m2"; + }; + imp_clk: imp_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <4>; + clock-mult = <1>; + clock-output-names = "imp"; + }; + rclk_clk: rclk_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <(48 * 1024)>; + clock-mult = <1>; + clock-output-names = "rclk"; + }; + oscclk_clk: oscclk_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL1>; + #clock-cells = <0>; + clock-div = <(12 * 1024)>; + clock-mult = <1>; + clock-output-names = "oscclk"; + }; + zb3_clk: zb3_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL3>; + #clock-cells = <0>; + clock-div = <4>; + clock-mult = <1>; + clock-output-names = "zb3"; + }; + zb3d2_clk: zb3d2_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL3>; + #clock-cells = <0>; + clock-div = <8>; + clock-mult = <1>; + clock-output-names = "zb3d2"; + }; + ddr_clk: ddr_clk { + compatible = "fixed-factor-clock"; + clocks = <&cpg_clocks R8A7791_CLK_PLL3>; + #clock-cells = <0>; + clock-div = <8>; + clock-mult = <1>; + clock-output-names = "ddr"; + }; + mp_clk: mp_clk { + compatible = "fixed-factor-clock"; + clocks = <&pll1_div2_clk>; + #clock-cells = <0>; + clock-div = <15>; + clock-mult = <1>; + clock-output-names = "mp"; + }; + cp_clk: cp_clk { + compatible = "fixed-factor-clock"; + clocks = <&extal_clk>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + clock-output-names = "cp"; + }; + + /* Gate clocks */ + mstp1_clks: mstp1_clks at e6150134 { + compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>; + clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>, + <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7791_CLK_TMU1 R8A7791_CLK_TMU3 R8A7791_CLK_TMU2 + R8A7791_CLK_CMT0 R8A7791_CLK_TMU0 R8A7791_CLK_VSP1_DU1 + R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_SY + >; + clock-output-names = + "tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1", + "vsp1-du0", "vsp1-sy"; + }; + mstp2_clks: mstp2_clks at e6150138 { + compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; + clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, + <&mp_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7791_CLK_SCIFA2 R8A7791_CLK_SCIFA1 R8A7791_CLK_SCIFA0 + R8A7791_CLK_SCIFB0 R8A7791_CLK_SCIFB1 R8A7791_CLK_SCIFB2 + >; + clock-output-names = + "scifa2", "scifa1", "scifa0", "scifb0", "scifb1", + "scifb2"; + }; + mstp3_clks: mstp3_clks at e615013c { + compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; + clocks = <&cp_clk>, <&sd2_clk>, <&sd1_clk>, + <&cpg_clocks R8A7791_CLK_SD0>, <&mmc0_clk>, <&rclk_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7791_CLK_TPU0 R8A7791_CLK_SDHI2 R8A7791_CLK_SDHI1 + R8A7791_CLK_SDHI0 R8A7791_CLK_MMCIF0 R8A7791_CLK_CMT1 + >; + clock-output-names = + "tpu0", "sdhi2", "sdhi1", "sdhi0", "mmcif0", "cmt1"; + }; + mstp5_clks: mstp5_clks at e6150144 { + compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; + clocks = <&extal_clk>, <&p_clk>; + #clock-cells = <1>; + renesas,clock-indices = <R8A7791_CLK_THERMAL R8A7791_CLK_PWM>; + clock-output-names = "thermal", "pwm"; + }; + mstp7_clks: mstp7_clks at e615014c { + compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>; + clocks = <&mp_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>, + <&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, + <&zx_clk>, <&zx_clk>, <&zx_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7791_CLK_HSUSB R8A7791_CLK_HSCIF2 R8A7791_CLK_SCIF5 + R8A7791_CLK_SCIF4 R8A7791_CLK_HSCIF1 R8A7791_CLK_HSCIF0 + R8A7791_CLK_SCIF3 R8A7791_CLK_SCIF2 R8A7791_CLK_SCIF1 + R8A7791_CLK_SCIF0 R8A7791_CLK_DU1 R8A7791_CLK_DU0 + R8A7791_CLK_LVDS0 + >; + clock-output-names = + "hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0", + "scif3", "scif2", "scif1", "scif0", "du1", "du0", "lvds0"; + }; + mstp8_clks: mstp8_clks at e6150990 { + compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>; + clocks = <&p_clk>; + #clock-cells = <1>; + renesas,clock-indices = <R8A7791_CLK_ETHER>; + clock-output-names = "ether"; + }; + mstp9_clks: mstp9_clks at e6150994 { + compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>; + clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, + <&p_clk>, <&p_clk>, <&p_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7791_CLK_RCAN1 R8A7791_CLK_RCAN0 R8A7791_CLK_I2C4 + R8A7791_CLK_I2C4 R8A7791_CLK_I2C3 R8A7791_CLK_I2C2 + R8A7791_CLK_I2C1 R8A7791_CLK_I2C0 + >; + clock-output-names = + "rcan1", "rcan0", "i2c5", "i2c4", "i2c3", "i2c2", "i2c1", + "i2c0"; + }; + mstp11_clks: mstp11_clks at e615099c { + compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>; + clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>; + #clock-cells = <1>; + renesas,clock-indices = < + R8A7791_CLK_SCIFA3 R8A7791_CLK_SCIFA4 R8A7791_CLK_SCIFA5 + >; + clock-output-names = "scifa3", "scifa4", "scifa5"; + }; + }; };
Signature · 1 line
1.8.3.2
v4 cover Renesas R-Car Gen2 Common Clock Framework arch/ support
In reply to Laurent Pinchart[ CC Magnus ]
Quoted 18 lines · Laurent Pinchart
Hello,
This is a repost of the arch patches from the "[PATCH v3 0/8] Renesas R-Car Gen2 Common Clock Framework support" patch series. The first three patches in that series have been reposted separately in the "[PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers" series to get merged through Mike Turquette's tree, while this series will go through the ARM SoC tree.
I've asked Mike to provide a stable branch when merging the CCF driver patches.
Laurent Pinchart (5):
ARM: shmobile: r8a7790: Add clock index macros for DT sources
ARM: shmobile: r8a7791: Add clock index macros for DT sources
ARM: shmobile: r8a7790: Add clocks
ARM: shmobile: r8a7790: Reference clocks
ARM: shmobile: r8a7791: Add clocks
Quoted 7 lines
arch/arm/boot/dts/r8a7790.dtsi | 328 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/r8a7791.dtsi | 313 ++++++++++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 100 +++++++++ include/dt-bindings/clock/r8a7791-clock.h | 105 ++++++++++ 4 files changed, 846 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7790-clock.h create mode 100644 include/dt-bindings/clock/r8a7791-clock.h
Hi Laurent,
I would like to confirm the dependencies of this series with you. As I understand things the dependencies that were not present in renesas-devel-v3.13-rc2-20131211 are as follows.
If any of the patches below can be skipped without breaking this series or the followup series "[PATCH v4 00/16] Lager and Koelsch multiplatform support" then I am all for not treating them as dependencies at all.
* [PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers
Status: Waiting for response from Mike Turquette
* mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare
Status: Merged by Chris Ball. I believe we need a stable branch from him.
* spi: sh-msiof: Convert to clk_prepare/unprepare
spi: sh-msiof: Use devm_* managed allocators
Status: Merged by Mark Brown. I believe we need a stable branch from him.
* usb: gadget: r8a66597-udc: Convert to clk_prepare/unprepare
Status: In Felipe Balbi's next branch. It is stable, right?
* clocksource: sh_tmu: Add clk_prepare/unprepare support
clocksource: sh_tmu: Release clock when sh_tmu_register() fails
clocksource: sh_mtu2: Add clk_prepare/unprepare support
clocksource: sh_mtu2: Release clock when sh_mtu2_register() fails
Status: Present in v3.13-rc3. No problem!
* clocksource: sh_cmt: Add clk_prepare/unprepare support
Status: I think I have dropped the ball here.
Regardless, I think it it needs to be accepted by Daniel Lezcano
* serial: sh-sci: Convert to clk_prepare/unprepare
serial: sh-sci: Don't enable/disable port from within break timer
Status: I have queued these up
v4 cover Renesas R-Car Gen2 Common Clock Framework arch/ support
Hi Simon,
Quoted 36 lines · On Saturday 14 December 2013 10:26:24 Simon Horman wrote:
[ CC Magnus ]
Quoted 19 lines · Laurent Pinchart
Hello,
This is a repost of the arch patches from the "[PATCH v3 0/8] Renesas R-Car Gen2 Common Clock Framework support" patch series. The first three patches in that series have been reposted separately in the "[PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers" series to get merged through Mike Turquette's tree, while this series will go through the ARM SoC tree.
I've asked Mike to provide a stable branch when merging the CCF driver patches.
Laurent Pinchart (5):
ARM: shmobile: r8a7790: Add clock index macros for DT sources
ARM: shmobile: r8a7791: Add clock index macros for DT sources
ARM: shmobile: r8a7790: Add clocks
ARM: shmobile: r8a7790: Reference clocks
ARM: shmobile: r8a7791: Add clocksQuoted 7 lines
arch/arm/boot/dts/r8a7790.dtsi | 328 +++++++++++++++++++++++++ arch/arm/boot/dts/r8a7791.dtsi | 313 +++++++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 100 +++++++++ include/dt-bindings/clock/r8a7791-clock.h | 105 ++++++++++ 4 files changed, 846 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7790-clock.h create mode 100644 include/dt-bindings/clock/r8a7791-clock.hHi Laurent,
I would like to confirm the dependencies of this series with you. As I understand things the dependencies that were not present in renesas-devel-v3.13-rc2-20131211 are as follows.
Quoted 7 lines
If any of the patches below can be skipped without breaking this series or the followup series "[PATCH v4 00/16] Lager and Koelsch multiplatform support" then I am all for not treating them as dependencies at all.
* [PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers
Status: Waiting for response from Mike Turquette
The dependency is correct, but the status has changed. Mike has merged the patches in his tree in the clk-next-shmobile branch
(https://git.linaro.org/people/mike.turquette/linux.git/shortlog/refs/heads/clk-next-shmobile).
Quoted 2 lines
* mmc:
sh_mobile_sdhi: Convert to clk_prepare/unprepare
Status: Merged by Chris Ball. I believe we need a stable branch from him.
You can drop this dependency as the koelsch reference boards lack SDHI support and the lager reference board has the SDHI devices disabled.
Quoted 3 lines
* spi: sh-msiof: Convert to clk_prepare/unprepare
spi: sh-msiof: Use devm_* managed allocators
Status: Merged by Mark Brown. I believe we need a stable branch from him.
You can drop this dependency as the lager and koelsch reference boards lack SPI support.
Quoted 2 lines
* usb: gadget: r8a66597-udc: Convert to clk_prepare/unprepare
Status: In Felipe Balbi's next branch. It is stable, right?
Correct, but you can drop this dependency as the lager and koelsch reference boards lack USB support.
Quoted 9 lines
* clocksource:
sh_tmu: Add clk_prepare/unprepare support
clocksource:sh_tmu: Release clock whensh_tmu_register()fails
clocksource:sh_mtu2: Add clk_prepare/unprepare support
clocksource:sh_mtu2: Release clock whensh_mtu2_register()fails
Status: Present in v3.13-rc3. No problem!* clocksource:
sh_cmt: Add clk_prepare/unprepare support
Status: I think I have dropped the ball here.
Regardless, I think it it needs to be accepted by Daniel Lezcano
That's the only missing one. Do you plan to handle this with Daniel ?
Quoted 3 lines
* serial: sh-sci: Convert to clk_prepare/unprepare
serial: sh-sci: Don't enable/disable port from within break timer
Status: I have queued these up
Signature · 3 lines
Regards, Laurent Pinchart
v4 cover Renesas R-Car Gen2 Common Clock Framework arch/ support
Quoted 44 lines · Laurent Pinchart
Hi Simon,
Quoted 41 lines · On Saturday 14 December 2013 10:26:24 Simon Horman wrote:
[ CC Magnus ]
Quoted 19 lines · Laurent Pinchart
Hello,
This is a repost of the arch patches from the "[PATCH v3 0/8] Renesas R-Car Gen2 Common Clock Framework support" patch series. The first three patches in that series have been reposted separately in the "[PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers" series to get merged through Mike Turquette's tree, while this series will go through the ARM SoC tree.
I've asked Mike to provide a stable branch when merging the CCF driver patches.
Laurent Pinchart (5):
ARM: shmobile: r8a7790: Add clock index macros for DT sources
ARM: shmobile: r8a7791: Add clock index macros for DT sources
ARM: shmobile: r8a7790: Add clocks
ARM: shmobile: r8a7790: Reference clocks
ARM: shmobile: r8a7791: Add clocksQuoted 7 lines
arch/arm/boot/dts/r8a7790.dtsi | 328 +++++++++++++++++++++++++ arch/arm/boot/dts/r8a7791.dtsi | 313 +++++++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 100 +++++++++ include/dt-bindings/clock/r8a7791-clock.h | 105 ++++++++++ 4 files changed, 846 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7790-clock.h create mode 100644 include/dt-bindings/clock/r8a7791-clock.hHi Laurent,
I would like to confirm the dependencies of this series with you. As I understand things the dependencies that were not present in renesas-devel-v3.13-rc2-20131211 are as follows.
If any of the patches below can be skipped without breaking this series or the followup series "[PATCH v4 00/16] Lager and Koelsch multiplatform support" then I am all for not treating them as dependencies at all.
Quoted 6 lines
Quoted 2 lines
* [PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers
Status: Waiting for response from Mike TurquetteThe dependency is correct, but the status has changed. Mike has merged the patches in his tree in the clk-next-shmobile branch
(https://git.linaro.org/people/mike.turquette/linux.git/shortlog/refs/heads/clk-next-shmobile).
Great!
Quoted 5 lines
Quoted 2 lines
* mmc:
sh_mobile_sdhi: Convert to clk_prepare/unprepare
Status: Merged by Chris Ball. I believe we need a stable branch from him.You can drop this dependency as the koelsch reference boards lack SDHI support and the lager reference board has the SDHI devices disabled.
Thanks, got it.
Quoted 4 lines
Quoted 3 lines
* spi: sh-msiof: Convert to clk_prepare/unprepare
spi: sh-msiof: Use devm_* managed allocators
Status: Merged by Mark Brown. I believe we need a stable branch from him.
Quoted 8 lines
You can drop this dependency as the lager and koelsch reference boards lack SPI support.
Quoted 2 lines
* usb: gadget: r8a66597-udc: Convert to clk_prepare/unprepare
Status: In Felipe Balbi's next branch. It is stable, right?Correct, but you can drop this dependency as the lager and koelsch reference boards lack USB support.
Understood.
Quoted 11 lines
Quoted 9 lines
* clocksource:
sh_tmu: Add clk_prepare/unprepare support
clocksource:sh_tmu: Release clock whensh_tmu_register()fails
clocksource:sh_mtu2: Add clk_prepare/unprepare support
clocksource:sh_mtu2: Release clock whensh_mtu2_register()fails
Status: Present in v3.13-rc3. No problem!* clocksource:
sh_cmt: Add clk_prepare/unprepare support
Status: I think I have dropped the ball here.
Regardless, I think it it needs to be accepted by Daniel LezcanoThat's the only missing one. Do you plan to handle this with Daniel ?
Yes, I will ask him to pick it up ASAP. Sorry for the mess there.
Quoted 9 lines
Quoted 3 lines
* serial: sh-sci: Convert to clk_prepare/unprepare
serial: sh-sci: Don't enable/disable port from within break timer
Status: I have queued these upSignature · 3 lines
Regards, Laurent Pinchart
v4 cover Renesas R-Car Gen2 Common Clock Framework arch/ support
Quoted 83 lines · Simon Horman
Quoted 44 lines · Laurent Pinchart
Hi Simon,
Quoted 41 lines · On Saturday 14 December 2013 10:26:24 Simon Horman wrote:
[ CC Magnus ]
Quoted 19 lines · Laurent Pinchart
Hello,
This is a repost of the arch patches from the "[PATCH v3 0/8] Renesas R-Car Gen2 Common Clock Framework support" patch series. The first three patches in that series have been reposted separately in the "[PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers" series to get merged through Mike Turquette's tree, while this series will go through the ARM SoC tree.
I've asked Mike to provide a stable branch when merging the CCF driver patches.
Laurent Pinchart (5):
ARM: shmobile: r8a7790: Add clock index macros for DT sources
ARM: shmobile: r8a7791: Add clock index macros for DT sources
ARM: shmobile: r8a7790: Add clocks
ARM: shmobile: r8a7790: Reference clocks
ARM: shmobile: r8a7791: Add clocksQuoted 7 lines
arch/arm/boot/dts/r8a7790.dtsi | 328 +++++++++++++++++++++++++ arch/arm/boot/dts/r8a7791.dtsi | 313 +++++++++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 100 +++++++++ include/dt-bindings/clock/r8a7791-clock.h | 105 ++++++++++ 4 files changed, 846 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7790-clock.h create mode 100644 include/dt-bindings/clock/r8a7791-clock.hHi Laurent,
I would like to confirm the dependencies of this series with you. As I understand things the dependencies that were not present in renesas-devel-v3.13-rc2-20131211 are as follows.
If any of the patches below can be skipped without breaking this series or the followup series "[PATCH v4 00/16] Lager and Koelsch multiplatform support" then I am all for not treating them as dependencies at all.
Quoted 6 lines
Quoted 2 lines
* [PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers
Status: Waiting for response from Mike TurquetteThe dependency is correct, but the status has changed. Mike has merged the patches in his tree in the clk-next-shmobile branch
(https://git.linaro.org/people/mike.turquette/linux.git/shortlog/refs/heads/clk-next-shmobile).Great!
Quoted 5 lines
Quoted 2 lines
* mmc:
sh_mobile_sdhi: Convert to clk_prepare/unprepare
Status: Merged by Chris Ball. I believe we need a stable branch from him.You can drop this dependency as the koelsch reference boards lack SDHI support and the lager reference board has the SDHI devices disabled.
Thanks, got it.
Quoted 4 lines
Quoted 3 lines
* spi: sh-msiof: Convert to clk_prepare/unprepare
spi: sh-msiof: Use devm_* managed allocators
Status: Merged by Mark Brown. I believe we need a stable branch from him.Quoted 8 lines
You can drop this dependency as the lager and koelsch reference boards lack SPI support.
Quoted 2 lines
* usb: gadget: r8a66597-udc: Convert to clk_prepare/unprepare
Status: In Felipe Balbi's next branch. It is stable, right?Correct, but you can drop this dependency as the lager and koelsch reference boards lack USB support.
Understood.
Quoted 6 lines
Quoted 6 lines
* clocksource:
sh_tmu: Add clk_prepare/unprepare support
clocksource:sh_tmu: Release clock whensh_tmu_register()fails
clocksource:sh_mtu2: Add clk_prepare/unprepare support
clocksource:sh_mtu2: Release clock whensh_mtu2_register()fails
Status: Present in v3.13-rc3. No problem!
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
* clocksource:
sh_cmt: Add clk_prepare/unprepare support
Status: I think I have dropped the ball here.
Regardless, I think it it needs to be accepted by Daniel LezcanoThat's the only missing one. Do you plan to handle this with Daniel ?
Yes, I will ask him to pick it up ASAP. Sorry for the mess there.
Hi,
I think I may have found the reason that I dropped the ball, which is that I was waiting for v2 of the patch but never saw it.
In order to stop me making a further mess of this would you be able to re-post it to Daniel directly?
Quoted 14 lines
Quoted 9 lines
Quoted 3 lines
* serial: sh-sci: Convert to clk_prepare/unprepare
serial: sh-sci: Don't enable/disable port from within break timer
Status: I have queued these upSignature · 3 lines
Regards, Laurent Pinchart--
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
v4 cover Renesas R-Car Gen2 Common Clock Framework arch/ support
Hi Simon,
Quoted 95 lines · On Saturday 14 December 2013 11:19:01 Simon Horman wrote:
Quoted 85 lines · Simon Horman
Quoted 43 lines · Laurent Pinchart
Quoted 42 lines · On Saturday 14 December 2013 10:26:24 Simon Horman wrote:
[ CC Magnus ]
Quoted 19 lines · Laurent Pinchart
Hello,
This is a repost of the arch patches from the "[PATCH v3 0/8] Renesas R-Car Gen2 Common Clock Framework support" patch series. The first three patches in that series have been reposted separately in the "[PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers" series to get merged through Mike Turquette's tree, while this series will go through the ARM SoC tree.
I've asked Mike to provide a stable branch when merging the CCF driver patches.
Laurent Pinchart (5):
ARM: shmobile: r8a7790: Add clock index macros for DT sources
ARM: shmobile: r8a7791: Add clock index macros for DT sources
ARM: shmobile: r8a7790: Add clocks
ARM: shmobile: r8a7790: Reference clocks
ARM: shmobile: r8a7791: Add clocksQuoted 7 lines
arch/arm/boot/dts/r8a7790.dtsi | 328 +++++++++++++++++++ arch/arm/boot/dts/r8a7791.dtsi | 313 +++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 100 +++++++++ include/dt-bindings/clock/r8a7791-clock.h | 105 ++++++++++ 4 files changed, 846 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7790-clock.h create mode 100644 include/dt-bindings/clock/r8a7791-clock.hHi Laurent,
I would like to confirm the dependencies of this series with you. As I understand things the dependencies that were not present in renesas-devel-v3.13-rc2-20131211 are as follows.
If any of the patches below can be skipped without breaking this series or the followup series "[PATCH v4 00/16] Lager and Koelsch multiplatform support" then I am all for not treating them as dependencies at all.
Quoted 7 lines
Quoted 2 lines
* [PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers
Status: Waiting for response from Mike TurquetteThe dependency is correct, but the status has changed. Mike has merged the patches in his tree in the clk-next-shmobile branch
(https://git.linaro.org/people/mike.turquette/linux.git/shortlog/refs/he
ads/clk-next-shmobile).Great!
Quoted 6 lines
Quoted 3 lines
* mmc:
sh_mobile_sdhi: Convert to clk_prepare/unprepare
Status: Merged by Chris Ball. I believe we need a stable branch from him.You can drop this dependency as the koelsch reference boards lack SDHI support and the lager reference board has the SDHI devices disabled.
Thanks, got it.
Quoted 5 lines
Quoted 4 lines
* spi: sh-msiof: Convert to clk_prepare/unprepare
spi: sh-msiof: Use devm_* managed allocators
Status: Merged by Mark Brown. I believe we need a stable branch from him.Quoted 8 lines
You can drop this dependency as the lager and koelsch reference boards lack SPI support.
Quoted 2 lines
* usb: gadget: r8a66597-udc: Convert to clk_prepare/unprepare
Status: In Felipe Balbi's next branch. It is stable, right?Correct, but you can drop this dependency as the lager and koelsch reference boards lack USB support.
Understood.
Quoted 6 lines
Quoted 6 lines
* clocksource:
sh_tmu: Add clk_prepare/unprepare support
clocksource:sh_tmu: Release clock whensh_tmu_register()fails
clocksource:sh_mtu2: Add clk_prepare/unprepare support
clocksource:sh_mtu2: Release clock whensh_mtu2_register()fails
Status: Present in v3.13-rc3. No problem!Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
* clocksource:
sh_cmt: Add clk_prepare/unprepare support
Status: I think I have dropped the ball here.
Regardless, I think it it needs to be accepted by Daniel LezcanoThat's the only missing one. Do you plan to handle this with Daniel ?
Yes, I will ask him to pick it up ASAP. Sorry for the mess there.
Quoted 7 lines
Hi,
I think I may have found the reason that I dropped the ball, which is that I was waiting for v2 of the patch but never saw it.
In order to stop me making a further mess of this would you be able to re-post it to Daniel directly?
When I mentioned v2 for the clocksource patches ("Re: [PATCH 01/12]
clocksource: sh_cmt: Add clk_prepare/unprepare support", Date: 30/10/2013 01:13) I meant v2 of the whole series. The sh_tmu and sh_mtu2 patches required a v2, but the sh_tmu patch didn't. v1 is thus the correct one. Do I need to resend it, or can you take it from the list ?
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
* serial: sh-sci: Convert to clk_prepare/unprepare
serial: sh-sci: Don't enable/disable port from within break timer
Status: I have queued these up
Signature · 3 lines
Regards, Laurent Pinchart
v4 cover Renesas R-Car Gen2 Common Clock Framework arch/ support
Quoted 103 lines · Laurent Pinchart
Hi Simon,
Quoted 100 lines · On Saturday 14 December 2013 11:19:01 Simon Horman wrote:
Quoted 85 lines · Simon Horman
Quoted 43 lines · Laurent Pinchart
Quoted 42 lines · On Saturday 14 December 2013 10:26:24 Simon Horman wrote:
[ CC Magnus ]
Quoted 19 lines · Laurent Pinchart
Hello,
This is a repost of the arch patches from the "[PATCH v3 0/8] Renesas R-Car Gen2 Common Clock Framework support" patch series. The first three patches in that series have been reposted separately in the "[PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers" series to get merged through Mike Turquette's tree, while this series will go through the ARM SoC tree.
I've asked Mike to provide a stable branch when merging the CCF driver patches.
Laurent Pinchart (5):
ARM: shmobile: r8a7790: Add clock index macros for DT sources
ARM: shmobile: r8a7791: Add clock index macros for DT sources
ARM: shmobile: r8a7790: Add clocks
ARM: shmobile: r8a7790: Reference clocks
ARM: shmobile: r8a7791: Add clocksQuoted 7 lines
arch/arm/boot/dts/r8a7790.dtsi | 328 +++++++++++++++++++ arch/arm/boot/dts/r8a7791.dtsi | 313 +++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 100 +++++++++ include/dt-bindings/clock/r8a7791-clock.h | 105 ++++++++++ 4 files changed, 846 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7790-clock.h create mode 100644 include/dt-bindings/clock/r8a7791-clock.hHi Laurent,
I would like to confirm the dependencies of this series with you. As I understand things the dependencies that were not present in renesas-devel-v3.13-rc2-20131211 are as follows.
If any of the patches below can be skipped without breaking this series or the followup series "[PATCH v4 00/16] Lager and Koelsch multiplatform support" then I am all for not treating them as dependencies at all.
Quoted 7 lines
Quoted 2 lines
* [PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers
Status: Waiting for response from Mike TurquetteThe dependency is correct, but the status has changed. Mike has merged the patches in his tree in the clk-next-shmobile branch
(https://git.linaro.org/people/mike.turquette/linux.git/shortlog/refs/he
ads/clk-next-shmobile).Great!
Quoted 6 lines
Quoted 3 lines
* mmc:
sh_mobile_sdhi: Convert to clk_prepare/unprepare
Status: Merged by Chris Ball. I believe we need a stable branch from him.You can drop this dependency as the koelsch reference boards lack SDHI support and the lager reference board has the SDHI devices disabled.
Thanks, got it.
Quoted 5 lines
Quoted 4 lines
* spi: sh-msiof: Convert to clk_prepare/unprepare
spi: sh-msiof: Use devm_* managed allocators
Status: Merged by Mark Brown. I believe we need a stable branch from him.Quoted 8 lines
You can drop this dependency as the lager and koelsch reference boards lack SPI support.
Quoted 2 lines
* usb: gadget: r8a66597-udc: Convert to clk_prepare/unprepare
Status: In Felipe Balbi's next branch. It is stable, right?Correct, but you can drop this dependency as the lager and koelsch reference boards lack USB support.
Understood.
Quoted 6 lines
Quoted 6 lines
* clocksource:
sh_tmu: Add clk_prepare/unprepare support
clocksource:sh_tmu: Release clock whensh_tmu_register()fails
clocksource:sh_mtu2: Add clk_prepare/unprepare support
clocksource:sh_mtu2: Release clock whensh_mtu2_register()fails
Status: Present in v3.13-rc3. No problem!Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
* clocksource:
sh_cmt: Add clk_prepare/unprepare support
Status: I think I have dropped the ball here.
Regardless, I think it it needs to be accepted by Daniel LezcanoThat's the only missing one. Do you plan to handle this with Daniel ?
Yes, I will ask him to pick it up ASAP. Sorry for the mess there.
Hi,
I think I may have found the reason that I dropped the ball, which is that I was waiting for v2 of the patch but never saw it.
Quoted 8 lines
Quoted 2 lines
In order to stop me making a further mess of this would you be able to re-post it to Daniel directly?
When I mentioned v2 for the clocksource patches ("Re: [PATCH 01/12]
clocksource:sh_cmt: Add clk_prepare/unprepare support", Date: 30/10/2013 01:13) I meant v2 of the whole series. Thesh_tmuandsh_mtu2patches required a v2, but thesh_tmupatch didn't. v1 is thus the correct one. Do I need to resend it, or can you take it from the list ?
I can take it.
v4 cover Renesas R-Car Gen2 Common Clock Framework arch/ support
Quoted 107 lines · Simon Horman
Quoted 106 lines · Laurent Pinchart
Hi Simon,
Quoted 102 lines · On Saturday 14 December 2013 11:19:01 Simon Horman wrote:
Quoted 85 lines · Simon Horman
Quoted 43 lines · Laurent Pinchart
Quoted 42 lines · On Saturday 14 December 2013 10:26:24 Simon Horman wrote:
[ CC Magnus ]
Quoted 19 lines · Laurent Pinchart
Hello,
This is a repost of the arch patches from the "[PATCH v3 0/8] Renesas R-Car Gen2 Common Clock Framework support" patch series. The first three patches in that series have been reposted separately in the "[PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers" series to get merged through Mike Turquette's tree, while this series will go through the ARM SoC tree.
I've asked Mike to provide a stable branch when merging the CCF driver patches.
Laurent Pinchart (5):
ARM: shmobile: r8a7790: Add clock index macros for DT sources
ARM: shmobile: r8a7791: Add clock index macros for DT sources
ARM: shmobile: r8a7790: Add clocks
ARM: shmobile: r8a7790: Reference clocks
ARM: shmobile: r8a7791: Add clocksQuoted 7 lines
arch/arm/boot/dts/r8a7790.dtsi | 328 +++++++++++++++++++ arch/arm/boot/dts/r8a7791.dtsi | 313 +++++++++++++++++++ include/dt-bindings/clock/r8a7790-clock.h | 100 +++++++++ include/dt-bindings/clock/r8a7791-clock.h | 105 ++++++++++ 4 files changed, 846 insertions(+) create mode 100644 include/dt-bindings/clock/r8a7790-clock.h create mode 100644 include/dt-bindings/clock/r8a7791-clock.hHi Laurent,
I would like to confirm the dependencies of this series with you. As I understand things the dependencies that were not present in renesas-devel-v3.13-rc2-20131211 are as follows.
If any of the patches below can be skipped without breaking this series or the followup series "[PATCH v4 00/16] Lager and Koelsch multiplatform support" then I am all for not treating them as dependencies at all.
Quoted 7 lines
Quoted 2 lines
* [PATCH v4 0/3] Renesas R-Car Gen2 Common Clock Framework drivers
Status: Waiting for response from Mike TurquetteThe dependency is correct, but the status has changed. Mike has merged the patches in his tree in the clk-next-shmobile branch
(https://git.linaro.org/people/mike.turquette/linux.git/shortlog/refs/he
ads/clk-next-shmobile).Great!
Quoted 6 lines
Quoted 3 lines
* mmc:
sh_mobile_sdhi: Convert to clk_prepare/unprepare
Status: Merged by Chris Ball. I believe we need a stable branch from him.You can drop this dependency as the koelsch reference boards lack SDHI support and the lager reference board has the SDHI devices disabled.
Thanks, got it.
Quoted 5 lines
Quoted 4 lines
* spi: sh-msiof: Convert to clk_prepare/unprepare
spi: sh-msiof: Use devm_* managed allocators
Status: Merged by Mark Brown. I believe we need a stable branch from him.Quoted 8 lines
You can drop this dependency as the lager and koelsch reference boards lack SPI support.
Quoted 2 lines
* usb: gadget: r8a66597-udc: Convert to clk_prepare/unprepare
Status: In Felipe Balbi's next branch. It is stable, right?Correct, but you can drop this dependency as the lager and koelsch reference boards lack USB support.
Understood.
Quoted 6 lines
Quoted 6 lines
* clocksource:
sh_tmu: Add clk_prepare/unprepare support
clocksource:sh_tmu: Release clock whensh_tmu_register()fails
clocksource:sh_mtu2: Add clk_prepare/unprepare support
clocksource:sh_mtu2: Release clock whensh_mtu2_register()fails
Status: Present in v3.13-rc3. No problem!Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
* clocksource:
sh_cmt: Add clk_prepare/unprepare support
Status: I think I have dropped the ball here.
Regardless, I think it it needs to be accepted by Daniel LezcanoThat's the only missing one. Do you plan to handle this with Daniel ?
Yes, I will ask him to pick it up ASAP. Sorry for the mess there.
Hi,
I think I may have found the reason that I dropped the ball, which is that I was waiting for v2 of the patch but never saw it.
In order to stop me making a further mess of this would you be able to re-post it to Daniel directly?
Quoted 7 lines
Quoted 5 lines
When I mentioned v2 for the clocksource patches ("Re: [PATCH 01/12]
clocksource:sh_cmt: Add clk_prepare/unprepare support", Date: 30/10/2013 01:13) I meant v2 of the whole series. Thesh_tmuandsh_mtu2patches required a v2, but thesh_tmupatch didn't. v1 is thus the correct one. Do I need to resend it, or can you take it from the list ?I can take it.
Daniel has taken the patch and provided a branch.
I will queue up this series accordingly.