On Fri, Sep 12, 2014 at 03:15:20PM +0200, Geert Uytterhoeven wrote:
> This clock drives the INTCA irqpin controller modules.
> Before, it was assumed enabled by the bootloader or reset state.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> Cc: devicetree@xxxxxxxxxxxxxxx
Thanks, I have queued this up.
> ---
> arch/arm/boot/dts/r8a7740.dtsi | 14 ++++++++++----
> include/dt-bindings/clock/r8a7740-clock.h | 1 +
> 2 files changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
> index d46c213a17ad..502483f4dccb 100644
> --- a/arch/arm/boot/dts/r8a7740.dtsi
> +++ b/arch/arm/boot/dts/r8a7740.dtsi
> @@ -71,6 +71,7 @@
> 0 149 IRQ_TYPE_LEVEL_HIGH
> 0 149 IRQ_TYPE_LEVEL_HIGH
> 0 149 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp2_clks R8A7740_CLK_INTCA>;
> };
>
> /* irqpin1: IRQ8 - IRQ15 */
> @@ -91,6 +92,7 @@
> 0 149 IRQ_TYPE_LEVEL_HIGH
> 0 149 IRQ_TYPE_LEVEL_HIGH
> 0 149 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp2_clks R8A7740_CLK_INTCA>;
> };
>
> /* irqpin2: IRQ16 - IRQ23 */
> @@ -111,6 +113,7 @@
> 0 149 IRQ_TYPE_LEVEL_HIGH
> 0 149 IRQ_TYPE_LEVEL_HIGH
> 0 149 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp2_clks R8A7740_CLK_INTCA>;
> };
>
> /* irqpin3: IRQ24 - IRQ31 */
> @@ -131,6 +134,7 @@
> 0 149 IRQ_TYPE_LEVEL_HIGH
> 0 149 IRQ_TYPE_LEVEL_HIGH
> 0 149 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp2_clks R8A7740_CLK_INTCA>;
> };
>
> ether: ethernet@e9a00000 {
> @@ -448,8 +452,8 @@
> mstp2_clks: mstp2_clks@e6150138 {
> compatible = "renesas,r8a7740-mstp-clocks", "renesas,cpg-mstp-clocks";
> reg = <0xe6150138 4>, <0xe6150040 4>;
> - clocks = <&sub_clk>, <&sub_clk>,
> - <&cpg_clocks R8A7740_CLK_HP>,
> + clocks = <&sub_clk>, <&cpg_clocks R8A7740_CLK_HP>,
> + <&sub_clk>, <&cpg_clocks R8A7740_CLK_HP>,
> <&cpg_clocks R8A7740_CLK_HP>,
> <&cpg_clocks R8A7740_CLK_HP>,
> <&cpg_clocks R8A7740_CLK_HP>,
> @@ -458,7 +462,8 @@
> <&sub_clk>;
> #clock-cells = <1>;
> renesas,clock-indices = <
> - R8A7740_CLK_SCIFA6 R8A7740_CLK_SCIFA7
> + R8A7740_CLK_SCIFA6 R8A7740_CLK_INTCA
> + R8A7740_CLK_SCIFA7
> R8A7740_CLK_DMAC1 R8A7740_CLK_DMAC2
> R8A7740_CLK_DMAC3 R8A7740_CLK_USBDMAC
> R8A7740_CLK_SCIFA5 R8A7740_CLK_SCIFB
> @@ -467,7 +472,8 @@
> R8A7740_CLK_SCIFA4
> >;
> clock-output-names =
> - "scifa6", "scifa7", "dmac1", "dmac2", "dmac3",
> + "scifa6", "intca",
> + "scifa7", "dmac1", "dmac2", "dmac3",
> "usbdmac", "scifa5", "scifb", "scifa0", "scifa1",
> "scifa2", "scifa3", "scifa4";
> };
> diff --git a/include/dt-bindings/clock/r8a7740-clock.h b/include/dt-bindings/clock/r8a7740-clock.h
> index f6b4b0fe7a43..476135da0f23 100644
> --- a/include/dt-bindings/clock/r8a7740-clock.h
> +++ b/include/dt-bindings/clock/r8a7740-clock.h
> @@ -40,6 +40,7 @@
>
> /* MSTP2 */
> #define R8A7740_CLK_SCIFA6 30
> +#define R8A7740_CLK_INTCA 29
> #define R8A7740_CLK_SCIFA7 22
> #define R8A7740_CLK_DMAC1 18
> #define R8A7740_CLK_DMAC2 17
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
