From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3ABFFC2D0E0 for ; Wed, 9 Sep 2020 09:29:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C283821973 for ; Wed, 9 Sep 2020 09:29:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iJchZfpF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729455AbgIIJ3k (ORCPT ); Wed, 9 Sep 2020 05:29:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725864AbgIIJ3k (ORCPT ); Wed, 9 Sep 2020 05:29:40 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4C57C061573 for ; Wed, 9 Sep 2020 02:29:39 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id c18so2134951wrm.9 for ; Wed, 09 Sep 2020 02:29:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=hXqUYlv6FQXC0NWO3WzPdE9cu2eajOHbbEEHxWTWdr0=; b=iJchZfpFQeGOp4xe5euU+/KAv43EtHc+f3JjQy9OjclyGT1NNZMqQtQjVt3vPOtVk9 CdJDf0fFRlO60XhovLO4Z9taFYuKOsN8WxBVenNMO1axiCpk1MXDiwpMJeX2Xd/Ll1/Y JJCYy/vm3h5W3ILW3rLA6ugcfPrw2fC8wKWHsaPUtg+So/SpygKapcg3WSKvS2FXWzjP se0WAkeCf8Hd9zwCUJ4N7H5r6KFIjtpQsFLxNreOd0Ab6vcHOvyG/eDGBe07hgDAQnl2 vWXqpWV231QJlfhnp9OmKElLU8+pareBW9/wn54mYdzV2jgDJeB1McLRk9qlzYomAArB prhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=hXqUYlv6FQXC0NWO3WzPdE9cu2eajOHbbEEHxWTWdr0=; b=GRX7OC6EuqHwSwSVy3PyFu31PiYvgLJocIn8EDeZCwY8HkHGEAXgnImYY97Bhtc6yC WeogfS7s8T/12FS5RzRKFk6gucPtWjgSa1kj/8pmwaJlM7X0gGmGMvswQtFmRhJOchcj ZvORXghGhWXIltQ8ew6x96J5hBJVOPvT/xbDQ54hOY2hNUwYm1++6b62nKPkxWJvtv9w mwUa9wud7t3Ons2xLwgVc0Yekay07eIgNDktzNAJJbWGFpiij1/kt9G74vAyKsBTX070 wnagqd9NzG71PBcaI/mQj8yQ914MucjKFAnj0QZNLa3Gs6WLmhAOl9IxghvWeudZJXlZ pLZA== X-Gm-Message-State: AOAM531iA0XXBhdxf3XpKuV3fb/HhWMp7V05OZucEE0zpm+URrCJjoSG bXoUBDXcWeXBcENngHMCaTA= X-Google-Smtp-Source: ABdhPJyDTwb2K2ZKpKUpD0LZXGyNPMp/PutjdsuYzbERZTuNTHiwl/D/cGiKStvqJ5MPsY8+VhGozQ== X-Received: by 2002:adf:b602:: with SMTP id f2mr2920298wre.186.1599643778250; Wed, 09 Sep 2020 02:29:38 -0700 (PDT) Received: from ziggy.stardust ([213.195.113.201]) by smtp.gmail.com with ESMTPSA id h184sm3126522wmh.41.2020.09.09.02.29.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Sep 2020 02:29:37 -0700 (PDT) Subject: Re: [PATCH v5 7/7] arm: dts: mt7623: add display subsystem related device nodes To: Frank Wunderlich , linux-mediatek@lists.infradead.org Cc: Frank Wunderlich , Chun-Kuang Hu , Philipp Zabel , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , linux-arm-kernel@lists.infradead.org, Ryder Lee , chunhui dai , Bibby Hsieh References: <20200819081752.4805-1-linux@fw-web.de> <20200819081752.4805-8-linux@fw-web.de> From: Matthias Brugger Message-ID: <2bbeff85-d1c6-5cc1-1f23-5e77eaa364c3@gmail.com> Date: Wed, 9 Sep 2020 11:29:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200819081752.4805-8-linux@fw-web.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 19/08/2020 10:17, Frank Wunderlich wrote: > From: Ryder Lee > > Add display subsystem related device nodes for MT7623. > > Cc: Chun-Kuang Hu > Signed-off-by: chunhui dai > Signed-off-by: Bibby Hsieh > Signed-off-by: Ryder Lee > Signed-off-by: Frank Wunderlich > Tested-by: Frank Wunderlich Applied to v5.9-next/dts32 Thanks! > --- > changed > v4->v5: > add nodes to new mt7623n.dtsi to avoid conflict with mt7623a > v3->v4: > drop display_components which is duplicate of existing mmsys > v2->v3: > drop bls to dpi routing > --- > arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 72 ++++++++ > arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 72 ++++++++ > arch/arm/boot/dts/mt7623n.dtsi | 171 ++++++++++++++++++ > 3 files changed, 315 insertions(+) > > diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > index 344f8c65c4aa..f41f221e56ca 100644 > --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > @@ -21,6 +21,19 @@ chosen { > stdout-path = "serial2:115200n8"; > }; > > + connector { > + compatible = "hdmi-connector"; > + label = "hdmi"; > + type = "d"; > + ddc-i2c-bus = <&hdmiddc0>; > + > + port { > + hdmi_connector_in: endpoint { > + remote-endpoint = <&hdmi0_out>; > + }; > + }; > + }; > + > cpus { > cpu@0 { > proc-supply = <&mt6323_vproc_reg>; > @@ -114,10 +127,18 @@ memory@80000000 { > }; > }; > > +&bls { > + status = "okay"; > +}; > + > &btif { > status = "okay"; > }; > > +&cec { > + status = "okay"; > +}; > + > &cir { > pinctrl-names = "default"; > pinctrl-0 = <&cir_pins_a>; > @@ -128,6 +149,21 @@ &crypto { > status = "okay"; > }; > > +&dpi0 { > + status = "okay"; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + port@0 { > + reg = <0>; > + dpi0_out: endpoint { > + remote-endpoint = <&hdmi0_in>; > + }; > + }; > + }; > +}; > + > ð { > status = "okay"; > > @@ -199,6 +235,42 @@ fixed-link { > }; > }; > > +&hdmi0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&hdmi_pins_a>; > + status = "okay"; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + port@0 { > + reg = <0>; > + hdmi0_in: endpoint { > + remote-endpoint = <&dpi0_out>; > + }; > + }; > + > + port@1 { > + reg = <1>; > + hdmi0_out: endpoint { > + remote-endpoint = <&hdmi_connector_in>; > + }; > + }; > + }; > +}; > + > +&hdmiddc0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&hdmi_ddc_pins_a>; > + status = "okay"; > +}; > + > +&hdmi_phy { > + mediatek,ibias = <0xa>; > + mediatek,ibias_up = <0x1c>; > + status = "okay"; > +}; > + > &i2c0 { > pinctrl-names = "default"; > pinctrl-0 = <&i2c0_pins_a>; > diff --git a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts > index f8efcc364bc3..1b9b9a8145a7 100644 > --- a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts > +++ b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts > @@ -24,6 +24,19 @@ chosen { > stdout-path = "serial2:115200n8"; > }; > > + connector { > + compatible = "hdmi-connector"; > + label = "hdmi"; > + type = "d"; > + ddc-i2c-bus = <&hdmiddc0>; > + > + port { > + hdmi_connector_in: endpoint { > + remote-endpoint = <&hdmi0_out>; > + }; > + }; > + }; > + > cpus { > cpu@0 { > proc-supply = <&mt6323_vproc_reg>; > @@ -106,10 +119,18 @@ sound { > }; > }; > > +&bls { > + status = "okay"; > +}; > + > &btif { > status = "okay"; > }; > > +&cec { > + status = "okay"; > +}; > + > &cir { > pinctrl-names = "default"; > pinctrl-0 = <&cir_pins_a>; > @@ -120,6 +141,21 @@ &crypto { > status = "okay"; > }; > > +&dpi0 { > + status = "okay"; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + port@0 { > + reg = <0>; > + dpi0_out: endpoint { > + remote-endpoint = <&hdmi0_in>; > + }; > + }; > + }; > +}; > + > ð { > status = "okay"; > > @@ -203,6 +239,42 @@ fixed-link { > }; > }; > > +&hdmi0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&hdmi_pins_a>; > + status = "okay"; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + port@0 { > + reg = <0>; > + hdmi0_in: endpoint { > + remote-endpoint = <&dpi0_out>; > + }; > + }; > + > + port@1 { > + reg = <1>; > + hdmi0_out: endpoint { > + remote-endpoint = <&hdmi_connector_in>; > + }; > + }; > + }; > +}; > + > +&hdmiddc0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&hdmi_ddc_pins_a>; > + status = "okay"; > +}; > + > +&hdmi_phy { > + mediatek,ibias = <0xa>; > + mediatek,ibias_up = <0x1c>; > + status = "okay"; > +}; > + > &i2c0 { > pinctrl-names = "default"; > pinctrl-0 = <&i2c0_pins_a>; > diff --git a/arch/arm/boot/dts/mt7623n.dtsi b/arch/arm/boot/dts/mt7623n.dtsi > index a47e82468895..61545fc541c4 100644 > --- a/arch/arm/boot/dts/mt7623n.dtsi > +++ b/arch/arm/boot/dts/mt7623n.dtsi > @@ -10,6 +10,10 @@ > #include > > / { > + aliases { > + rdma0 = &rdma0; > + rdma1 = &rdma1; > + }; > g3dsys: syscon@13000000 { > compatible = "mediatek,mt7623-g3dsys", > "mediatek,mt2701-g3dsys", > @@ -131,4 +135,171 @@ smi_common: smi@1000c000 { > clock-names = "apb", "smi", "async"; > power-domains = <&scpsys MT2701_POWER_DOMAIN_DISP>; > }; > + > + ovl: ovl@14007000 { > + compatible = "mediatek,mt7623-disp-ovl", > + "mediatek,mt2701-disp-ovl"; > + reg = <0 0x14007000 0 0x1000>; > + interrupts = ; > + clocks = <&mmsys CLK_MM_DISP_OVL>; > + iommus = <&iommu MT2701_M4U_PORT_DISP_OVL_0>; > + mediatek,larb = <&larb0>; > + }; > + > + rdma0: rdma@14008000 { > + compatible = "mediatek,mt7623-disp-rdma", > + "mediatek,mt2701-disp-rdma"; > + reg = <0 0x14008000 0 0x1000>; > + interrupts = ; > + clocks = <&mmsys CLK_MM_DISP_RDMA>; > + iommus = <&iommu MT2701_M4U_PORT_DISP_RDMA>; > + mediatek,larb = <&larb0>; > + }; > + > + wdma@14009000 { > + compatible = "mediatek,mt7623-disp-wdma", > + "mediatek,mt2701-disp-wdma"; > + reg = <0 0x14009000 0 0x1000>; > + interrupts = ; > + clocks = <&mmsys CLK_MM_DISP_WDMA>; > + iommus = <&iommu MT2701_M4U_PORT_DISP_WDMA>; > + mediatek,larb = <&larb0>; > + }; > + > + bls: pwm@1400a000 { > + compatible = "mediatek,mt7623-disp-pwm", > + "mediatek,mt2701-disp-pwm"; > + reg = <0 0x1400a000 0 0x1000>; > + #pwm-cells = <2>; > + clocks = <&mmsys CLK_MM_MDP_BLS_26M>, > + <&mmsys CLK_MM_DISP_BLS>; > + clock-names = "main", "mm"; > + status = "disabled"; > + }; > + > + color: color@1400b000 { > + compatible = "mediatek,mt7623-disp-color", > + "mediatek,mt2701-disp-color"; > + reg = <0 0x1400b000 0 0x1000>; > + interrupts = ; > + clocks = <&mmsys CLK_MM_DISP_COLOR>; > + }; > + > + dsi: dsi@1400c000 { > + compatible = "mediatek,mt7623-dsi", > + "mediatek,mt2701-dsi"; > + reg = <0 0x1400c000 0 0x1000>; > + interrupts = ; > + clocks = <&mmsys CLK_MM_DSI_ENGINE>, > + <&mmsys CLK_MM_DSI_DIG>, > + <&mipi_tx0>; > + clock-names = "engine", "digital", "hs"; > + phys = <&mipi_tx0>; > + phy-names = "dphy"; > + status = "disabled"; > + }; > + > + mutex: mutex@1400e000 { > + compatible = "mediatek,mt7623-disp-mutex", > + "mediatek,mt2701-disp-mutex"; > + reg = <0 0x1400e000 0 0x1000>; > + interrupts = ; > + clocks = <&mmsys CLK_MM_MUTEX_32K>; > + }; > + > + rdma1: rdma@14012000 { > + compatible = "mediatek,mt7623-disp-rdma", > + "mediatek,mt2701-disp-rdma"; > + reg = <0 0x14012000 0 0x1000>; > + interrupts = ; > + clocks = <&mmsys CLK_MM_DISP_RDMA1>; > + iommus = <&iommu MT2701_M4U_PORT_DISP_RDMA1>; > + mediatek,larb = <&larb0>; > + }; > + > + dpi0: dpi@14014000 { > + compatible = "mediatek,mt7623-dpi", > + "mediatek,mt2701-dpi"; > + reg = <0 0x14014000 0 0x1000>; > + interrupts = ; > + clocks = <&mmsys CLK_MM_DPI1_DIGL>, > + <&mmsys CLK_MM_DPI1_ENGINE>, > + <&apmixedsys CLK_APMIXED_TVDPLL>; > + clock-names = "pixel", "engine", "pll"; > + status = "disabled"; > + }; > + > + hdmi0: hdmi@14015000 { > + compatible = "mediatek,mt7623-hdmi", > + "mediatek,mt8173-hdmi"; > + reg = <0 0x14015000 0 0x400>; > + clocks = <&mmsys CLK_MM_HDMI_PIXEL>, > + <&mmsys CLK_MM_HDMI_PLL>, > + <&mmsys CLK_MM_HDMI_AUDIO>, > + <&mmsys CLK_MM_HDMI_SPDIF>; > + clock-names = "pixel", "pll", "bclk", "spdif"; > + phys = <&hdmi_phy>; > + phy-names = "hdmi"; > + mediatek,syscon-hdmi = <&mmsys 0x900>; > + cec = <&cec>; > + status = "disabled"; > + }; > + > + mipi_tx0: mipi-dphy@10010000 { > + compatible = "mediatek,mt7623-mipi-tx", > + "mediatek,mt2701-mipi-tx"; > + reg = <0 0x10010000 0 0x90>; > + clocks = <&clk26m>; > + clock-output-names = "mipi_tx0_pll"; > + #clock-cells = <0>; > + #phy-cells = <0>; > + }; > + > + cec: cec@10012000 { > + compatible = "mediatek,mt7623-cec", > + "mediatek,mt8173-cec"; > + reg = <0 0x10012000 0 0xbc>; > + interrupts = ; > + clocks = <&infracfg CLK_INFRA_CEC>; > + status = "disabled"; > + }; > + > + hdmi_phy: phy@10209100 { > + compatible = "mediatek,mt7623-hdmi-phy", > + "mediatek,mt2701-hdmi-phy"; > + reg = <0 0x10209100 0 0x24>; > + clocks = <&apmixedsys CLK_APMIXED_HDMI_REF>; > + clock-names = "pll_ref"; > + clock-output-names = "hdmitx_dig_cts"; > + #clock-cells = <0>; > + #phy-cells = <0>; > + status = "disabled"; > + }; > + > + hdmiddc0: i2c@11013000 { > + compatible = "mediatek,mt7623-hdmi-ddc", > + "mediatek,mt8173-hdmi-ddc"; > + interrupts = ; > + reg = <0 0x11013000 0 0x1C>; > + clocks = <&pericfg CLK_PERI_I2C3>; > + clock-names = "ddc-i2c"; > + status = "disabled"; > + }; > +}; > + > +&pio { > + hdmi_pins_a: hdmi-default { > + pins-hdmi { > + pinmux = ; > + input-enable; > + bias-pull-down; > + }; > + }; > + > + hdmi_ddc_pins_a: hdmi_ddc-default { > + pins-hdmi-ddc { > + pinmux = , > + ; > + }; > + }; > }; >