From: Caesar Wang <wxt@rock-chips.com> To: heiko@sntech.de Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, leozwang@google.com, keescook@google.com, Caesar Wang <wxt@rock-chips.com> Subject: [PATCH v1 2/6] ARM: dts: add the lcdc and hdmi node for rk3036 Date: Thu, 17 Dec 2015 22:21:48 +0800 [thread overview] Message-ID: <1450362112-8075-3-git-send-email-wxt@rock-chips.com> (raw) In-Reply-To: <1450362112-8075-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> --- 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 620e6e0..11a8078 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -145,6 +145,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; @@ -248,6 +279,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>; @@ -484,6 +536,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
WARNING: multiple messages have this Message-ID (diff)
From: wxt@rock-chips.com (Caesar Wang) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 2/6] ARM: dts: add the lcdc and hdmi node for rk3036 Date: Thu, 17 Dec 2015 22:21:48 +0800 [thread overview] Message-ID: <1450362112-8075-3-git-send-email-wxt@rock-chips.com> (raw) In-Reply-To: <1450362112-8075-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> --- 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 620e6e0..11a8078 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -145,6 +145,37 @@ }; }; + lcdc_mmu: iommu at 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 at 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 at 0 { + reg = <1>; + remote-endpoint = <&hdmi_in_lcdc>; + }; + }; + }; + gic: interrupt-controller at 10139000 { compatible = "arm,gic-400"; interrupt-controller; @@ -248,6 +279,27 @@ status = "disabled"; }; + hdmi: hdmi at 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 at 0 { + reg = <0>; + remote-endpoint = <&lcdc_out_hdmi>; + }; + }; + }; + timer: timer at 20044000 { compatible = "rockchip,rk3036-timer", "rockchip,rk3288-timer"; reg = <0x20044000 0x20>; @@ -484,6 +536,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:[~2015-12-17 14:22 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-17 14:21 [PATCH v1 0/6] Support the rk3036 Kylin board Caesar Wang 2015-12-17 14:21 ` Caesar Wang 2015-12-17 14:21 ` [PATCH v1 1/6] ARM: dts: fix the correct pinctrl control for rk3036 Caesar Wang 2015-12-17 14:21 ` Caesar Wang 2015-12-17 23:28 ` Heiko Stübner 2015-12-17 23:28 ` Heiko Stübner 2015-12-17 23:28 ` Heiko Stübner 2015-12-18 1:29 ` Caesar Wang 2015-12-18 1:29 ` Caesar Wang 2015-12-18 1:29 ` Caesar Wang 2015-12-17 14:21 ` Caesar Wang [this message] 2015-12-17 14:21 ` [PATCH v1 2/6] ARM: dts: add the lcdc and hdmi node " Caesar Wang 2015-12-17 14:21 ` [PATCH v1 3/6] ARM: dts: add the sdio/sdmmc " Caesar Wang 2015-12-17 14:21 ` Caesar Wang 2015-12-17 14:21 ` [PATCH v1 4/6] ARM: dts: rockchip: add the kylin board " Caesar Wang 2015-12-17 14:21 ` Caesar Wang 2015-12-19 4:17 ` Rob Herring 2015-12-19 4:17 ` Rob Herring 2015-12-17 14:21 ` [PATCH v1 5/6] ARM: dts: add the sound codec for kylin board Caesar Wang 2015-12-17 14:21 ` Caesar Wang 2015-12-17 23:33 ` Heiko Stübner 2015-12-17 23:33 ` Heiko Stübner 2015-12-17 14:21 ` [PATCH v1 6/6] ARM: dts: add the sdio node " Caesar Wang 2015-12-17 14:21 ` Caesar Wang [not found] ` <CAGXu5jKEykL1+F=m2kk8E4qOKeUmc-jHnZ-fYpz1OS8oQ1Pgxg@mail.gmail.com> 2015-12-17 23:48 ` [PATCH v1 0/6] Support the rk3036 Kylin board Heiko Stübner 2015-12-17 23:48 ` Heiko Stübner 2015-12-17 23:48 ` Heiko Stübner 2015-12-19 17:16 ` Heiko Stübner 2015-12-19 17:16 ` Heiko Stübner 2015-12-19 17:16 ` Heiko Stübner 2015-12-20 12:49 ` Caesar Wang 2015-12-20 12:49 ` Caesar Wang 2015-12-20 14:44 ` Heiko Stübner 2015-12-20 14:44 ` Heiko Stübner 2015-12-20 14:44 ` Heiko Stübner
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=1450362112-8075-3-git-send-email-wxt@rock-chips.com \ --to=wxt@rock-chips.com \ --cc=devicetree@vger.kernel.org \ --cc=heiko@sntech.de \ --cc=keescook@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 \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.