From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752474AbcAPRGe (ORCPT ); Sat, 16 Jan 2016 12:06:34 -0500 Received: from smtp.csie.ntu.edu.tw ([140.112.30.61]:46992 "EHLO smtp.csie.ntu.edu.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752317AbcAPRGc (ORCPT ); Sat, 16 Jan 2016 12:06:32 -0500 MIME-Version: 1.0 In-Reply-To: <1452785109-6172-11-git-send-email-maxime.ripard@free-electrons.com> References: <1452785109-6172-1-git-send-email-maxime.ripard@free-electrons.com> <1452785109-6172-11-git-send-email-maxime.ripard@free-electrons.com> From: Chen-Yu Tsai Date: Sun, 17 Jan 2016 01:06:07 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 10/26] ARM: sun5i: a13: Add display and TCON clocks To: Maxime Ripard Cc: Mike Turquette , Stephen Boyd , David Airlie , Thierry Reding , Philipp Zabel , devicetree , linux-arm-kernel , linux-kernel , linux-clk , dri-devel , linux-sunxi , Laurent Pinchart , Chen-Yu Tsai , Hans de Goede , Alexander Kaplan , Boris Brezillon , Wynter Woods , Thomas Petazzoni , Rob Clark , Daniel Vetter Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Thu, Jan 14, 2016 at 11:24 PM, Maxime Ripard wrote: > Enable the display and TCON (channel 0 and channel 1) clocks that are going > to be needed to drive the display engine, tcon and TV encoders. > > Signed-off-by: Maxime Ripard > --- > arch/arm/boot/dts/sun5i-a13.dtsi | 38 +++++++++++++++++++++++++++++++++++++- > arch/arm/boot/dts/sun5i-r8.dtsi | 5 +++-- > 2 files changed, 40 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi > index d910d3a6c41c..9669b03f20f3 100644 > --- a/arch/arm/boot/dts/sun5i-a13.dtsi > +++ b/arch/arm/boot/dts/sun5i-a13.dtsi > @@ -61,7 +61,8 @@ > compatible = "allwinner,simple-framebuffer", > "simple-framebuffer"; > allwinner,pipeline = "de_be0-lcd0"; > - clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>; > + clocks = <&ahb_gates 36>, <&ahb_gates 44>, <&de_be_clk>, > + <&tcon_ch0_clk>; > status = "disabled"; > }; > }; > @@ -149,6 +150,41 @@ > "apb1_i2c2", "apb1_uart1", > "apb1_uart3"; > }; > + > + de_be_clk: clk@01c20104 { > + #clock-cells = <0>; > + #reset-cells = <0>; > + compatible = "allwinner,sun4i-a10-display-clk"; > + reg = <0x01c20104 0x4>; > + clocks = <&pll3>, <&pll7>, <&pll5 1>; > + clock-output-names = "de-be"; > + }; > + > + de_fe_clk: clk@01c2010c { > + #clock-cells = <0>; > + #reset-cells = <0>; > + compatible = "allwinner,sun4i-a10-display-clk"; > + reg = <0x01c2010c 0x4>; > + clocks = <&pll3>, <&pll7>, <&pll5 1>; > + clock-output-names = "de-fe"; > + }; > + > + tcon_ch0_clk: clk@01c20118 { > + #clock-cells = <0>; > + #reset-cells = <1>; You got it right here... > + compatible = "allwinner,sun4i-a10-tcon-ch0-clk"; > + reg = <0x01c20118 0x4>; > + clocks = <&pll3>, <&pll7>, <&pll3x2>, <&pll7x2>; > + clock-output-names = "tcon-ch0-sclk"; > + }; > + > + tcon_ch1_clk: clk@01c2012c { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-tcon-ch1-clk"; > + reg = <0x01c2012c 0x4>; > + clocks = <&pll3>, <&pll7>, <&pll3x2>, <&pll7x2>; > + clock-output-names = "tcon-ch1-sclk"; > + }; I suggest moving these to sun5i.dtsi, as they are shared amongst them. ChenYu > }; > > soc@01c00000 { > diff --git a/arch/arm/boot/dts/sun5i-r8.dtsi b/arch/arm/boot/dts/sun5i-r8.dtsi > index 0ef865601ac9..b1e4e0170d51 100644 > --- a/arch/arm/boot/dts/sun5i-r8.dtsi > +++ b/arch/arm/boot/dts/sun5i-r8.dtsi > @@ -51,8 +51,9 @@ > compatible = "allwinner,simple-framebuffer", > "simple-framebuffer"; > allwinner,pipeline = "de_be0-lcd0-tve0"; > - clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>, > - <&ahb_gates 44>; > + clocks = <&ahb_gates 34>, <&ahb_gates 36>, > + <&ahb_gates 44>, <&de_be_clk>, > + <&tcon_ch1_clk>; > status = "disabled"; > }; > }; > -- > 2.6.4 >