From: Jernej Skrabec <jernej.skrabec@siol.net> To: maxime.ripard@free-electrons.com, wens@csie.org, airlied@linux.ie, robh+dt@kernel.org, mark.rutland@arm.com, mturquette@baylibre.com, sboyd@kernel.org, architt@codeaurora.org, a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com, narmstrong@baylibre.com, Jose.Abreu@synopsys.com Cc: jernej.skrabec@siol.net, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-sunxi@googlegroups.com Subject: [PATCH v5 11/12] ARM: dts: sun8i: a83t: Add HDMI display pipeline Date: Wed, 14 Feb 2018 21:09:05 +0100 [thread overview] Message-ID: <20180214200906.31509-12-jernej.skrabec@siol.net> (raw) In-Reply-To: <20180214200906.31509-1-jernej.skrabec@siol.net> This commit adds all bits necessary for HDMI on A83T - mixer1, tcon1, hdmi, hdmi phy and hdmi pinctrl entries. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> --- arch/arm/boot/dts/sun8i-a83t.dtsi | 108 +++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi index 7f4955a5fab7..46ae4faa5894 100644 --- a/arch/arm/boot/dts/sun8i-a83t.dtsi +++ b/arch/arm/boot/dts/sun8i-a83t.dtsi @@ -155,7 +155,7 @@ de: display-engine { compatible = "allwinner,sun8i-a83t-display-engine"; - allwinner,pipelines = <&mixer0>; + allwinner,pipelines = <&mixer0>, <&mixer1>; status = "disabled"; }; @@ -208,6 +208,29 @@ }; }; + mixer1: mixer@1200000 { + compatible = "allwinner,sun8i-a83t-de2-mixer-1"; + reg = <0x01200000 0x100000>; + clocks = <&display_clocks CLK_BUS_MIXER1>, + <&display_clocks CLK_MIXER1>; + clock-names = "bus", + "mod"; + resets = <&display_clocks RST_WB>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mixer1_out: port@1 { + reg = <1>; + + mixer1_out_tcon1: endpoint { + remote-endpoint = <&tcon1_in_mixer1>; + }; + }; + }; + }; + syscon: syscon@1c00000 { compatible = "allwinner,sun8i-a83t-system-controller", "syscon"; @@ -256,6 +279,40 @@ }; }; + tcon1: lcd-controller@1c0d000 { + compatible = "allwinner,sun8i-a83t-tcon-tv"; + reg = <0x01c0d000 0x1000>; + interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_TCON1>, <&ccu CLK_TCON1>; + clock-names = "ahb", "tcon-ch1"; + resets = <&ccu RST_BUS_TCON1>; + reset-names = "lcd"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + tcon1_in: port@0 { + reg = <0>; + + tcon1_in_mixer1: endpoint { + remote-endpoint = <&mixer1_out_tcon1>; + }; + }; + + tcon1_out: port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + tcon1_out_hdmi: endpoint@1 { + reg = <1>; + remote-endpoint = <&hdmi_in_tcon1>; + }; + }; + }; + }; + mmc0: mmc@1c0f000 { compatible = "allwinner,sun8i-a83t-mmc", "allwinner,sun7i-a20-mmc"; @@ -427,6 +484,11 @@ drive-strength = <40>; }; + hdmi_pins: hdmi-pins { + pins = "PH6", "PH7", "PH8"; + function = "hdmi"; + }; + i2c0_pins: i2c0-pins { pins = "PH0", "PH1"; function = "i2c0"; @@ -685,6 +747,50 @@ interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)>; }; + hdmi: hdmi@1ee0000 { + compatible = "allwinner,sun8i-a83t-dw-hdmi"; + reg = <0x01ee0000 0x10000>; + reg-io-width = <1>; + interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_SLOW>, + <&ccu CLK_HDMI>; + clock-names = "iahb", "isfr", "tmds"; + resets = <&ccu RST_BUS_HDMI1>; + reset-names = "ctrl"; + phys = <&hdmi_phy>; + phy-names = "hdmi-phy"; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_pins>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + hdmi_in: port@0 { + reg = <0>; + + hdmi_in_tcon1: endpoint { + remote-endpoint = <&tcon1_out_hdmi>; + }; + }; + + hdmi_out: port@1 { + reg = <1>; + }; + }; + }; + + hdmi_phy: hdmi-phy@1ef0000 { + compatible = "allwinner,sun8i-a83t-hdmi-phy"; + reg = <0x01ef0000 0x10000>; + clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_SLOW>; + clock-names = "bus", "mod"; + resets = <&ccu RST_BUS_HDMI0>; + reset-names = "phy"; + #phy-cells = <0>; + }; + r_intc: interrupt-controller@1f00c00 { compatible = "allwinner,sun8i-a83t-r-intc", "allwinner,sun6i-a31-r-intc"; -- 2.16.1
WARNING: multiple messages have this Message-ID (diff)
From: jernej.skrabec@siol.net (Jernej Skrabec) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 11/12] ARM: dts: sun8i: a83t: Add HDMI display pipeline Date: Wed, 14 Feb 2018 21:09:05 +0100 [thread overview] Message-ID: <20180214200906.31509-12-jernej.skrabec@siol.net> (raw) In-Reply-To: <20180214200906.31509-1-jernej.skrabec@siol.net> This commit adds all bits necessary for HDMI on A83T - mixer1, tcon1, hdmi, hdmi phy and hdmi pinctrl entries. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> --- arch/arm/boot/dts/sun8i-a83t.dtsi | 108 +++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi index 7f4955a5fab7..46ae4faa5894 100644 --- a/arch/arm/boot/dts/sun8i-a83t.dtsi +++ b/arch/arm/boot/dts/sun8i-a83t.dtsi @@ -155,7 +155,7 @@ de: display-engine { compatible = "allwinner,sun8i-a83t-display-engine"; - allwinner,pipelines = <&mixer0>; + allwinner,pipelines = <&mixer0>, <&mixer1>; status = "disabled"; }; @@ -208,6 +208,29 @@ }; }; + mixer1: mixer at 1200000 { + compatible = "allwinner,sun8i-a83t-de2-mixer-1"; + reg = <0x01200000 0x100000>; + clocks = <&display_clocks CLK_BUS_MIXER1>, + <&display_clocks CLK_MIXER1>; + clock-names = "bus", + "mod"; + resets = <&display_clocks RST_WB>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mixer1_out: port at 1 { + reg = <1>; + + mixer1_out_tcon1: endpoint { + remote-endpoint = <&tcon1_in_mixer1>; + }; + }; + }; + }; + syscon: syscon at 1c00000 { compatible = "allwinner,sun8i-a83t-system-controller", "syscon"; @@ -256,6 +279,40 @@ }; }; + tcon1: lcd-controller at 1c0d000 { + compatible = "allwinner,sun8i-a83t-tcon-tv"; + reg = <0x01c0d000 0x1000>; + interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_TCON1>, <&ccu CLK_TCON1>; + clock-names = "ahb", "tcon-ch1"; + resets = <&ccu RST_BUS_TCON1>; + reset-names = "lcd"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + tcon1_in: port at 0 { + reg = <0>; + + tcon1_in_mixer1: endpoint { + remote-endpoint = <&mixer1_out_tcon1>; + }; + }; + + tcon1_out: port at 1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + tcon1_out_hdmi: endpoint at 1 { + reg = <1>; + remote-endpoint = <&hdmi_in_tcon1>; + }; + }; + }; + }; + mmc0: mmc at 1c0f000 { compatible = "allwinner,sun8i-a83t-mmc", "allwinner,sun7i-a20-mmc"; @@ -427,6 +484,11 @@ drive-strength = <40>; }; + hdmi_pins: hdmi-pins { + pins = "PH6", "PH7", "PH8"; + function = "hdmi"; + }; + i2c0_pins: i2c0-pins { pins = "PH0", "PH1"; function = "i2c0"; @@ -685,6 +747,50 @@ interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)>; }; + hdmi: hdmi at 1ee0000 { + compatible = "allwinner,sun8i-a83t-dw-hdmi"; + reg = <0x01ee0000 0x10000>; + reg-io-width = <1>; + interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_SLOW>, + <&ccu CLK_HDMI>; + clock-names = "iahb", "isfr", "tmds"; + resets = <&ccu RST_BUS_HDMI1>; + reset-names = "ctrl"; + phys = <&hdmi_phy>; + phy-names = "hdmi-phy"; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_pins>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + hdmi_in: port at 0 { + reg = <0>; + + hdmi_in_tcon1: endpoint { + remote-endpoint = <&tcon1_out_hdmi>; + }; + }; + + hdmi_out: port at 1 { + reg = <1>; + }; + }; + }; + + hdmi_phy: hdmi-phy at 1ef0000 { + compatible = "allwinner,sun8i-a83t-hdmi-phy"; + reg = <0x01ef0000 0x10000>; + clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_SLOW>; + clock-names = "bus", "mod"; + resets = <&ccu RST_BUS_HDMI0>; + reset-names = "phy"; + #phy-cells = <0>; + }; + r_intc: interrupt-controller at 1f00c00 { compatible = "allwinner,sun8i-a83t-r-intc", "allwinner,sun6i-a31-r-intc"; -- 2.16.1
next prev parent reply other threads:[~2018-02-14 20:10 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-14 20:08 [PATCH v5 00/12] drm/sun4i: Add A83T HDMI support Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-14 20:08 ` [PATCH v5 01/12] clk: sunxi-ng: Mask nkmp factors when setting register Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-14 20:08 ` [PATCH v5 02/12] clk: sunxi-ng: Use u64 for calculation of nkmp rate Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-14 20:08 ` [PATCH v5 03/12] drm/bridge/synopsys: dw-hdmi: Enable workaround for v1.32a Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-16 5:01 ` Archit Taneja 2018-02-16 5:01 ` Archit Taneja 2018-02-14 20:08 ` [PATCH v5 04/12] drm/bridge/synopsys: dw-hdmi: Export some PHY related functions Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-16 5:01 ` Archit Taneja 2018-02-16 5:01 ` Archit Taneja 2018-02-14 20:08 ` [PATCH v5 05/12] drm/bridge/synopsys: dw-hdmi: don't clobber drvdata Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-14 20:08 ` Jernej Skrabec 2018-02-16 5:01 ` Archit Taneja 2018-02-16 5:01 ` Archit Taneja 2018-02-16 5:01 ` Archit Taneja 2018-02-16 7:03 ` Heiko Stuebner 2018-02-16 7:03 ` Heiko Stuebner 2018-02-16 7:03 ` Heiko Stuebner 2018-02-19 13:49 ` Philipp Zabel 2018-02-19 13:49 ` Philipp Zabel 2018-02-19 13:49 ` Philipp Zabel 2018-02-19 13:49 ` Philipp Zabel 2018-02-14 20:09 ` [PATCH v5 06/12] dt-bindings: display: sun4i-drm: Add A83T HDMI pipeline Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-14 20:09 ` [PATCH v5 07/12] drm/sun4i: Add has_channel_0 TCON quirk Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-14 20:09 ` [PATCH v5 08/12] drm/sun4i: Add support for A83T second TCON Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-14 20:09 ` [PATCH v5 09/12] drm/sun4i: Add support for A83T second DE2 mixer Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-14 20:09 ` [PATCH v5 10/12] drm/sun4i: Implement A83T HDMI driver Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-14 21:42 ` Philippe Ombredanne 2018-02-14 21:42 ` Philippe Ombredanne 2018-02-14 21:42 ` Philippe Ombredanne 2018-02-14 20:09 ` Jernej Skrabec [this message] 2018-02-14 20:09 ` [PATCH v5 11/12] ARM: dts: sun8i: a83t: Add HDMI display pipeline Jernej Skrabec 2018-02-14 20:09 ` [PATCH v5 12/12] ARM: dts: sun8i: a83t: Enable HDMI on BananaPi M3 Jernej Skrabec 2018-02-14 20:09 ` Jernej Skrabec 2018-02-15 13:52 ` [PATCH v5 00/12] drm/sun4i: Add A83T HDMI support Maxime Ripard 2018-02-15 13:52 ` Maxime Ripard 2018-02-16 9:09 ` Maxime Ripard 2018-02-16 9:09 ` 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=20180214200906.31509-12-jernej.skrabec@siol.net \ --to=jernej.skrabec@siol.net \ --cc=Jose.Abreu@synopsys.com \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=a.hajda@samsung.com \ --cc=airlied@linux.ie \ --cc=architt@codeaurora.org \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --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=mark.rutland@arm.com \ --cc=maxime.ripard@free-electrons.com \ --cc=mturquette@baylibre.com \ --cc=narmstrong@baylibre.com \ --cc=robh+dt@kernel.org \ --cc=sboyd@kernel.org \ --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: 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.