mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Mike Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@codeaurora.org>,
	David Airlie <airlied@linux.ie>, Chen-Yu Tsai <wens@csie.org>,
	Rob Herring <robh+dt@kernel.org>, Daniel Vetter <daniel@ffwll.ch>
Cc: Hans de Goede <hdegoede@redhat.com>,
	devicetree@vger.kernel.org, linux-clk@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
	dri-devel@lists.freedesktop.org,
	Boris Brezillon <boris.brezillon@free-electrons.com>,
	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
	Alexander Kaplan <alex@nextthing.co>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH v4 02/11] ARM: sun5i: a13: Add display and TCON clocks
Date: Mon, 25 Apr 2016 15:22:43 +0200	[thread overview]
Message-ID: <1461590572-4027-3-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1461590572-4027-1-git-send-email-maxime.ripard@free-electrons.com>

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.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/boot/dts/sun5i-a13.dtsi | 39 +++++++++++++++++++++++++++++++++++++--
 arch/arm/boot/dts/sun5i-r8.dtsi  |  5 +++--
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index 39f23b1ebc8f..263d46dbc7e6 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -61,8 +61,8 @@
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
 			allwinner,pipeline = "de_be0-lcd0";
-			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>,
-				 <&dram_gates 26>;
+			clocks = <&ahb_gates 36>, <&ahb_gates 44>, <&de_be_clk>,
+				 <&tcon_ch0_clk>, <&dram_gates 26>;
 			status = "disabled";
 		};
 	};
@@ -170,6 +170,41 @@
 					     "dram_ace",
 					     "dram_iep";
 		};
+
+		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>;
+			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";
+		};
 	};
 
 	soc@01c00000 {
diff --git a/arch/arm/boot/dts/sun5i-r8.dtsi b/arch/arm/boot/dts/sun5i-r8.dtsi
index e346ba76db5d..691d3de75b35 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>, <&dram_gates 26>;
+			clocks = <&ahb_gates 34>, <&ahb_gates 36>,
+				 <&ahb_gates 44>, <&de_be_clk>,
+				 <&tcon_ch1_clk>, <&dram_gates 26>;
 			status = "disabled";
 		};
 	};
-- 
2.8.1

  parent reply	other threads:[~2016-04-25 13:23 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-25 13:22 [PATCH v4 00/11] drm: Add Allwinner A10 display engine support Maxime Ripard
2016-04-25 13:22 ` [PATCH v4 01/11] clk: sunxi: Add display and TCON0 clocks driver Maxime Ripard
2016-05-06 22:30   ` Stephen Boyd
2016-05-08 20:03     ` Maxime Ripard
2016-05-09 22:32       ` Stephen Boyd
2016-05-09 22:39         ` Stephen Boyd
2016-05-10  6:36           ` Maxime Ripard
2016-05-11 22:13             ` Stephen Boyd
2016-05-10 19:10           ` [linux-sunxi] " Priit Laes
2016-05-11 22:15             ` Stephen Boyd
2016-05-12  3:39               ` Priit Laes
2016-05-12  6:59                 ` Maxime Ripard
2016-05-12  8:30                   ` Maxime Ripard
2016-05-12 21:47                     ` Stephen Boyd
2016-04-25 13:22 ` Maxime Ripard [this message]
2016-04-25 13:22 ` [PATCH v4 03/11] drm: fb: Add seq_file definition Maxime Ripard
2016-04-25 13:22 ` [PATCH v4 04/11] drm: sun4i: Add DT bindings documentation Maxime Ripard
2016-04-28  2:37   ` Rob Herring
2016-04-25 13:22 ` [PATCH v4 05/11] drm: Add Allwinner A10 Display Engine support Maxime Ripard
2016-04-26  9:14   ` Boris Brezillon
2016-04-28  7:40     ` Maxime Ripard
2016-04-25 13:22 ` [PATCH v4 06/11] drm: sun4i: Add RGB output Maxime Ripard
2016-04-26  9:56   ` Boris Brezillon
2016-04-25 13:22 ` [PATCH v4 07/11] drm: sun4i: Add composite output Maxime Ripard
2016-04-26  9:59   ` Boris Brezillon
2016-04-25 13:22 ` [PATCH v4 08/11] drm: sun4i: tv: Add PAL output standard Maxime Ripard
2016-04-26  9:59   ` Boris Brezillon
2016-04-25 13:22 ` [PATCH v4 09/11] drm: sun4i: tv: Add NTSC " Maxime Ripard
2016-04-26  9:59   ` Boris Brezillon
2016-04-25 13:22 ` [PATCH v4 10/11] ARM: sun5i: r8: Add display blocks to the DTSI Maxime Ripard
2016-04-25 13:22 ` [PATCH v4 11/11] ARM: sun5i: chip: Enable the TV Encoder Maxime Ripard
2016-04-25 15:56 ` [PATCH v4 00/11] drm: Add Allwinner A10 display engine support Emil Velikov
2016-05-04 18:01 ` Maxime Ripard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1461590572-4027-3-git-send-email-maxime.ripard@free-electrons.com \
    --to=maxime.ripard@free-electrons.com \
    --cc=airlied@linux.ie \
    --cc=alex@nextthing.co \
    --cc=boris.brezillon@free-electrons.com \
    --cc=daniel@ffwll.ch \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hdegoede@redhat.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=mturquette@baylibre.com \
    --cc=robh+dt@kernel.org \
    --cc=sboyd@codeaurora.org \
    --cc=thomas.petazzoni@free-electrons.com \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®