From patchwork Thu Jan 7 08:25:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 7974481 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 177E3BEEE5 for ; Thu, 7 Jan 2016 08:31:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3424420103 for ; Thu, 7 Jan 2016 08:31:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E12C200FE for ; Thu, 7 Jan 2016 08:31:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aH5xa-0003jx-61; Thu, 07 Jan 2016 08:30:18 +0000 Received: from mail-pa0-f46.google.com ([209.85.220.46]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aH5vY-0000qx-Fz; Thu, 07 Jan 2016 08:28:17 +0000 Received: by mail-pa0-f46.google.com with SMTP id yy13so160587476pab.3; Thu, 07 Jan 2016 00:27:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QolTP4W+VQdwKXfRY1Vg6NfP8StBTuJ1vrv4dSKIiV0=; b=P7Z4yK26AXNKDKK8ahi5FjacQcZxZRcfjGuQGiy42X3E7td05JIScpobGCB8/Wrwmj +/A59Py78ppOiSblsDAki9yphXzYVv70dGE3apaOhcalFdtltm1cLTwFTcXS9K/sJPrC 0f1MCjJQhE+8LBM/DLTPrD/YVMWwafZoy06zjcONWNJrJiNYYI2Jh/OVKepRdZm+oe0T BIfOB5uDHgGVmxNY5PjTKWm3JNF5VC0ERwR0dwA3wpKbattsyjSGeKbYxSnHi/wfXb2B CVNwRM9yXJ61v6bt+okiik/Sxl8Bmic3dUKcQb4wDs/Fei3HyvL8mdeZTs7FaXmESx7c o04Q== X-Received: by 10.66.236.162 with SMTP id uv2mr148997257pac.101.1452155272339; Thu, 07 Jan 2016 00:27:52 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id qj8sm9945010pac.40.2016.01.07.00.27.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 00:27:51 -0800 (PST) From: Caesar Wang To: Heiko Stuebner , Ulf Hansson 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 Message-Id: <1452155155-16232-12-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452155155-16232-1-git-send-email-wxt@rock-chips.com> References: <1452155155-16232-1-git-send-email-wxt@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160107_002813_102057_5FAE0A3C X-CRM114-Status: UNSURE ( 9.64 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.4 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Ian Campbell , Kumar Gala , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Rob Herring , leecam@google.com, linux-arm-kernel@lists.infradead.org, keescook@google.com, leozwang@google.com, Caesar Wang MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 = ; + interrupt-names = "lcdc_mmu"; + #iommu-cells = <0>; + status = "disabled"; + }; + + lcdc: lcdc@10118000 { + compatible = "rockchip,rk3036-lcdc"; + reg = <0x10118000 0x19c>; + interrupts = ; + 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 = ; + 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>,