| From 3f8647c4d9036e7c01c7ed719c227b343db15893 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Tue, 28 Mar 2017 12:45:30 +0200 |
| Subject: [PATCH 268/286] ARM: dts: r8a7794: Add DU1 clock to device tree |
| |
| Add the missing module clock for the second channel of the display unit. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 1764f8081f1524bf629e0744b277db751281ff56) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7794.dtsi | 8 +++++--- |
| include/dt-bindings/clock/r8a7794-clock.h | 1 + |
| 2 files changed, 6 insertions(+), 3 deletions(-) |
| |
| --- a/arch/arm/boot/dts/r8a7794.dtsi |
| +++ b/arch/arm/boot/dts/r8a7794.dtsi |
| @@ -1270,19 +1270,21 @@ |
| clocks = <&mp_clk>, <&hp_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>; |
| clock-indices = < |
| R8A7794_CLK_EHCI R8A7794_CLK_HSUSB |
| R8A7794_CLK_HSCIF2 R8A7794_CLK_SCIF5 |
| R8A7794_CLK_SCIF4 R8A7794_CLK_HSCIF1 R8A7794_CLK_HSCIF0 |
| R8A7794_CLK_SCIF3 R8A7794_CLK_SCIF2 R8A7794_CLK_SCIF1 |
| - R8A7794_CLK_SCIF0 R8A7794_CLK_DU0 |
| + R8A7794_CLK_SCIF0 |
| + R8A7794_CLK_DU1 R8A7794_CLK_DU0 |
| >; |
| clock-output-names = |
| "ehci", "hsusb", |
| "hscif2", "scif5", "scif4", "hscif1", "hscif0", |
| - "scif3", "scif2", "scif1", "scif0", "du0"; |
| + "scif3", "scif2", "scif1", "scif0", |
| + "du1", "du0"; |
| }; |
| mstp8_clks: mstp8_clks@e6150990 { |
| compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; |
| --- a/include/dt-bindings/clock/r8a7794-clock.h |
| +++ b/include/dt-bindings/clock/r8a7794-clock.h |
| @@ -82,6 +82,7 @@ |
| #define R8A7794_CLK_SCIF2 19 |
| #define R8A7794_CLK_SCIF1 20 |
| #define R8A7794_CLK_SCIF0 21 |
| +#define R8A7794_CLK_DU1 23 |
| #define R8A7794_CLK_DU0 24 |
| |
| /* MSTP8 */ |