From: Caesar Wang <wxt@rock-chips.com>
To: Heiko Stuebner <heiko@sntech.de>, Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-rockchip@lists.infradead.org, leecam@google.com,
leozwang@google.com, keescook@google.com,
Caesar Wang <wxt@rock-chips.com>,
Russell King <linux@arm.linux.org.uk>,
devicetree@vger.kernel.org, Kumar Gala <galak@codeaurora.org>,
linux-kernel@vger.kernel.org,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 11/12] ARM: dts: rockchip: add the lcdc and hdmi node for rk3036
Date: Thu, 7 Jan 2016 16:25:54 +0800 [thread overview]
Message-ID: <1452155155-16232-12-git-send-email-wxt@rock-chips.com> (raw)
In-Reply-To: <1452155155-16232-1-git-send-email-wxt@rock-chips.com>
The rk3036 support two overlay plane and one hwc plane,
it support IOMMU, and its IOMMU same as rk3288's.
Meanwhile, add the inno hdmi for HDMI display.
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
---
Changes in v2: None
arch/arm/boot/dts/rk3036.dtsi | 61 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 8f1bb0f..6ff03e3 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -147,6 +147,37 @@
};
};
+ lcdc_mmu: iommu@10118300 {
+ compatible = "rockchip,iommu";
+ reg = <0x10118300 0x100>;
+ interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "lcdc_mmu";
+ #iommu-cells = <0>;
+ status = "disabled";
+ };
+
+ lcdc: lcdc@10118000 {
+ compatible = "rockchip,rk3036-lcdc";
+ reg = <0x10118000 0x19c>;
+ interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru ACLK_LCDC>, <&cru SCLK_LCDC>, <&cru HCLK_LCDC>;
+ clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
+ resets = <&cru SRST_LCDC1_A>, <&cru SRST_LCDC1_H>, <&cru SRST_LCDC1_D>;
+ reset-names = "axi", "ahb", "dclk";
+ iommus = <&lcdc_mmu>;
+
+ status = "disabled";
+
+ lcdc_out: port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ lcdc_out_hdmi: endpoint@0 {
+ reg = <1>;
+ remote-endpoint = <&hdmi_in_lcdc>;
+ };
+ };
+ };
+
gic: interrupt-controller@10139000 {
compatible = "arm,gic-400";
interrupt-controller;
@@ -274,6 +305,27 @@
status = "disabled";
};
+ hdmi: hdmi@20034000 {
+ compatible = "rockchip,rk3036-inno-hdmi";
+ reg = <0x20034000 0x4000>;
+ interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru PCLK_HDMI>;
+ clock-names = "pclk";
+ rockchip,grf = <&grf>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_ctl>;
+ status = "disabled";
+
+ hdmi_in: port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ hdmi_in_lcdc: endpoint@0 {
+ reg = <0>;
+ remote-endpoint = <&lcdc_out_hdmi>;
+ };
+ };
+ };
+
timer: timer@20044000 {
compatible = "rockchip,rk3036-timer", "rockchip,rk3288-timer";
reg = <0x20044000 0x20>;
@@ -556,6 +608,15 @@
};
};
+ hdmi {
+ hdmi_ctl: hdmi-ctl {
+ rockchip,pins = <1 8 RK_FUNC_1 &pcfg_pull_none>,
+ <1 9 RK_FUNC_1 &pcfg_pull_none>,
+ <1 10 RK_FUNC_1 &pcfg_pull_none>,
+ <1 11 RK_FUNC_1 &pcfg_pull_none>;
+ };
+ };
+
i2c0 {
i2c0_xfer: i2c0-xfer {
rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>,
--
1.9.1
next prev parent reply other threads:[~2016-01-07 8:27 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 8:25 [PATCH v2 00/12] Add the family patches to support for kylin board Caesar Wang
2016-01-07 8:25 ` [PATCH v2 01/12] ARM: dts: rockchip: set the pinctrl default setting for rk3036 i2s Caesar Wang
2016-01-09 2:17 ` Heiko Stuebner
2016-01-07 8:25 ` [PATCH v2 02/12] ARM: dts: rockchip: add the sound codec for kylin board Caesar Wang
2016-01-09 2:39 ` Heiko Stuebner
2016-01-07 8:25 ` [PATCH v2 03/12] ARM: dts: rockchip: override the clocks in i2s " Caesar Wang
2016-01-09 2:31 ` Heiko Stuebner
2016-01-11 13:38 ` Caesar Wang
2016-01-07 8:25 ` [PATCH v2 04/12] clk: rockchip: rk3036: enable the CLK_IGNORE_UNUSED flag for sclk_i2s_out Caesar Wang
2016-01-07 10:05 ` Heiko Stuebner
2016-01-08 9:26 ` Caesar Wang
2016-01-08 9:46 ` Heiko Stuebner
2016-01-13 8:10 ` Caesar Wang
2016-01-07 8:25 ` [PATCH v2 05/12] mmc: pwrseq: Document optional exteral vcc for the simple power sequence Caesar Wang
2016-01-08 12:13 ` Javier Martinez Canillas
2016-01-07 8:25 ` [PATCH v2 06/12] mmc: pwrseq: add support for power-on sequencing through DT Caesar Wang
2016-01-08 12:22 ` Javier Martinez Canillas
2016-01-09 2:42 ` Heiko Stuebner
2016-01-11 16:02 ` Javier Martinez Canillas
2016-01-15 9:15 ` Caesar Wang
2016-01-07 8:25 ` [PATCH v2 07/12] ARM: dts: rockchip: enable the high speed on sdio for kylin board Caesar Wang
2016-01-07 8:25 ` [PATCH v2 08/12] ARM: dts: rockchip: add the wifi/bt regulator " Caesar Wang
2016-01-07 8:25 ` [PATCH v2 09/12] ARM: dts: rockchip: enable the uart0 " Caesar Wang
2016-01-07 8:25 ` [PATCH v2 10/12] ARM: dts: rockchip: add the sdmmc " Caesar Wang
2016-01-07 8:25 ` Caesar Wang [this message]
2016-01-07 8:25 ` [PATCH v2 12/12] ARM: dts: Add pl330-broken-no-flushp quirk for rk3036 SoCs Caesar Wang
2016-01-07 10:44 ` [PATCH v2 00/12] Add the family patches to support for kylin board Heiko Stuebner
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=1452155155-16232-12-git-send-email-wxt@rock-chips.com \
--to=wxt@rock-chips.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=heiko@sntech.de \
--cc=ijc+devicetree@hellion.org.uk \
--cc=keescook@google.com \
--cc=leecam@google.com \
--cc=leozwang@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.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;
as well as URLs for NNTP newsgroup(s).