From patchwork Sat Dec 11 23:38:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Heidelberg X-Patchwork-Id: 12672101 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 50011C433EF for ; Sat, 11 Dec 2021 23:39:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=kSHFVOA69Np4rNcre8KJiSFZUlYdQX7UgdGAKihdbPg=; b=HvotWb45QVFQlq Ncv/P31ggQcPBLORmJM5pJisLkuRyqXbAjGvwMc3UgLhwC8BBcy1Qq1UcDSydikO5Yh43EdnhVnw8 JW0iMP5dB3YDRkxKvuw+CEFzFVi6ozeh91wCv5QYO6xs/Kwym3fj6ZWTZoiUg59hI5/G+Nl+8Rrlk 3S4lhhlAVc6DxmH+XXL3xZmoclNvCDPQAn2b+6iMfjbu7ug9LZmY+s6dcMOT8tk2Ecp/LBNjbsMc8 F3PBomKyLuNeEz3BPlWAo+ukDxy9mIjkpPAkW77ttxVttXTVjEQ+pulRt9Yicd0MM28dXQxKRnkHu vrG4icKySeulb1cVZZzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwBx8-005h9a-BS; Sat, 11 Dec 2021 23:38:54 +0000 Received: from ixit.cz ([94.230.151.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwBwu-005h5t-EE; Sat, 11 Dec 2021 23:38:42 +0000 Received: from localhost.localdomain (ip-89-176-96-70.net.upcbroadband.cz [89.176.96.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ixit.cz (Postfix) with ESMTPSA id 7EBA124AF0; Sun, 12 Dec 2021 00:38:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ixit.cz; s=dkim; t=1639265907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xWjajEwtY2wkVt9fXD7egUyXtBkTDdRKLHGRSaEMSwQ=; b=HUkfzoIoi9pc7KYnLff/yfNWfsFO+daPCyEYcqyHW5BPhricY6fUdPC5u7mkVoYOhyaCcY 5CAmphLik0onMuoIQzeRQjDtLeSwSjruKaAoHIES1ELhsuFYnb7Yw9DBKkIsVerTqgzUB/ W9i4Jc0pa1+4u6rWidbrrd6RfJFzoP8= From: David Heidelberg To: Rob Herring , Heiko Stuebner Cc: ~okias/devicetree@lists.sr.ht, David Heidelberg , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] arm64: dts: rockchip: Add missing secondary compatible for PX30 DSI Date: Sun, 12 Dec 2021 00:38:17 +0100 Message-Id: <20211211233818.88482-1-david@ixit.cz> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211211_153840_656007_AAFC0E24 X-CRM114-Status: GOOD ( 10.67 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Add second DSI compatible to comply with DT schema validation comming in the second patch. Signed-off-by: David Heidelberg --- arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi index 00f50b05d55a..f972704dfe7a 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi @@ -1072,7 +1072,7 @@ vpu_mmu: iommu@ff442800 { }; dsi: dsi@ff450000 { - compatible = "rockchip,px30-mipi-dsi"; + compatible = "rockchip,px30-mipi-dsi", "snps,dw-mipi-dsi"; reg = <0x0 0xff450000 0x0 0x10000>; interrupts = ; clocks = <&cru PCLK_MIPI_DSI>; From patchwork Sat Dec 11 23:38:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Heidelberg X-Patchwork-Id: 12672103 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DA8D7C433F5 for ; Sat, 11 Dec 2021 23:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dJbTX8TOvKNpS0qUI6YYbHGw4JRy/me6iuEq+YTA0W0=; b=IvWWO1Z5CwafyC 5HhlVB8mAhcqmuxaCaDnPjBLBrvBLRFDRg5KitEJHDG1APdqpzoEQMmI3Kza3FCDXpu8/cBOuqeS6 1rI3Gsbk1WZDx+p/zbfl4+vmCUDPPcNH6oprYAI0kUGKF8G2i5OY696CrMJ/S22XYFt6YXc+JT2eV p85xf+nOpgGy+YmQ21VYzU7JRnbaBrmAtbNgiXWPUmdc5Kdf/gU+Vam0eRZNiUIaac9Z1ac1Q9uDk RWDD4gd473xY0VMrpVBLylaEsP/7zdb2+GQpw61UaGRRZ4pg9aiSr2Q/WFb+0V7Aj/Yep2NFquOEh 7i0XP2BklrFDIUO4IN+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwBxI-005hBR-MQ; Sat, 11 Dec 2021 23:39:04 +0000 Received: from ixit.cz ([94.230.151.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwBwu-005h6E-Cv; Sat, 11 Dec 2021 23:38:43 +0000 Received: from localhost.localdomain (ip-89-176-96-70.net.upcbroadband.cz [89.176.96.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ixit.cz (Postfix) with ESMTPSA id 3FB7D24AF5; Sun, 12 Dec 2021 00:38:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ixit.cz; s=dkim; t=1639265914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dG9cEjITJ2Ie+kdqJbPAtJRjOIdju1WIOYnTVU9mmJ0=; b=elnD2pM6Z46CxOHmrTui0wZ7q1ovP2LA5b8mPJqk1obtJHss7s1Ef3N+QDOx7OKlmjy9DG sN+ZYBfquVNtzYcIIkuIgL4qG1WHdudvLhSzGpFV6WU0HFJ4US3Zx/rFZeVljq+NatHuOo o37/b0X1rrpf9hl5Kv6tI3zwlkNZYE0= From: David Heidelberg To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , David Airlie , Daniel Vetter , Rob Herring , - Cc: ~okias/devicetree@lists.sr.ht, David Heidelberg , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] dt-bindings: convert Rockchip DW MIPI DSI binding to YAML format Date: Sun, 12 Dec 2021 00:38:18 +0100 Message-Id: <20211211233818.88482-2-david@ixit.cz> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211211233818.88482-1-david@ixit.cz> References: <20211211233818.88482-1-david@ixit.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211211_153840_778852_07CBB2F5 X-CRM114-Status: GOOD ( 19.68 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Convert into YAML format into format, which can be validated. Changes: - drop panel from example Signed-off-by: David Heidelberg --- v2: - rename patch - drop possibility for only one compatible string - add patch for adding compatible to the PX30 dtsi .../display/rockchip/dw_mipi_dsi_rockchip.txt | 93 --------- .../rockchip/rockchip,dw-mipi-dsi.yaml | 194 ++++++++++++++++++ 2 files changed, 194 insertions(+), 93 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,dw-mipi-dsi.yaml diff --git a/Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt deleted file mode 100644 index 39792f051d2d..000000000000 --- a/Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt +++ /dev/null @@ -1,93 +0,0 @@ -Rockchip specific extensions to the Synopsys Designware MIPI DSI -================================ - -Required properties: -- #address-cells: Should be <1>. -- #size-cells: Should be <0>. -- compatible: one of - "rockchip,px30-mipi-dsi", "snps,dw-mipi-dsi" - "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi" - "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi" -- reg: Represent the physical address range of the controller. -- interrupts: Represent the controller's interrupt to the CPU(s). -- clocks, clock-names: Phandles to the controller's pll reference - clock(ref) when using an internal dphy and APB clock(pclk). - For RK3399, a phy config clock (phy_cfg) and a grf clock(grf) - are required. As described in [1]. -- rockchip,grf: this soc should set GRF regs to mux vopl/vopb. -- ports: contain a port node with endpoint definitions as defined in [2]. - For vopb,set the reg = <0> and set the reg = <1> for vopl. -- video port 0 for the VOP input, the remote endpoint maybe vopb or vopl -- video port 1 for either a panel or subsequent encoder - -Optional properties: -- phys: from general PHY binding: the phandle for the PHY device. -- phy-names: Should be "dphy" if phys references an external phy. -- #phy-cells: Defined when used as ISP phy, should be 0. -- power-domains: a phandle to mipi dsi power domain node. -- resets: list of phandle + reset specifier pairs, as described in [3]. -- reset-names: string reset name, must be "apb". - -[1] Documentation/devicetree/bindings/clock/clock-bindings.txt -[2] Documentation/devicetree/bindings/media/video-interfaces.txt -[3] Documentation/devicetree/bindings/reset/reset.txt - -Example: - mipi_dsi: mipi@ff960000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi"; - reg = <0xff960000 0x4000>; - interrupts = ; - clocks = <&cru SCLK_MIPI_24M>, <&cru PCLK_MIPI_DSI0>; - clock-names = "ref", "pclk"; - resets = <&cru SRST_MIPIDSI0>; - reset-names = "apb"; - rockchip,grf = <&grf>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - mipi_in: port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - - mipi_in_vopb: endpoint@0 { - reg = <0>; - remote-endpoint = <&vopb_out_mipi>; - }; - mipi_in_vopl: endpoint@1 { - reg = <1>; - remote-endpoint = <&vopl_out_mipi>; - }; - }; - - mipi_out: port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - mipi_out_panel: endpoint { - remote-endpoint = <&panel_in_mipi>; - }; - }; - }; - - panel { - compatible ="boe,tv080wum-nl0"; - reg = <0>; - - enable-gpios = <&gpio7 3 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_en>; - backlight = <&backlight>; - - port { - panel_in_mipi: endpoint { - remote-endpoint = <&mipi_out_panel>; - }; - }; - }; - }; diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-mipi-dsi.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-mipi-dsi.yaml new file mode 100644 index 000000000000..9165c578d721 --- /dev/null +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-mipi-dsi.yaml @@ -0,0 +1,194 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/rockchip/rockchip,dw-mipi-dsi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip specific extensions to the Synopsys Designware MIPI DSI + +maintainers: + - opensource@rock-chips.com + +allOf: + - if: + properties: + compatible: + contains: + const: rockchip,px30-mipi-dsi + then: + properties: + clocks: + maxItems: 1 + clock-names: + items: + - const: pclk + + - if: + properties: + compatible: + contains: + const: rockchip,rk3288-mipi-dsi + then: + properties: + clocks: + maxItems: 2 + clock-names: + items: + - const: ref + - const: pclk + + - if: + properties: + compatible: + contains: + const: rockchip,rk3399-mipi-dsi + then: + properties: + clocks: + minItems: 4 + maxItems: 4 + clock-names: + items: + - const: ref + - const: pclk + - const: phy_cfg + - const: grf + +properties: + compatible: + oneOf: + - items: + - enum: + - rockchip,px30-mipi-dsi + - rockchip,rk3288-mipi-dsi + - rockchip,rk3399-mipi-dsi + - const: snps,dw-mipi-dsi + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: true + + clock-names: true + + phys: + maxItems: 1 + description: Optional external PHY + + phy-names: + const: dphy + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false + description: > + Video port for the VOP input. + + properties: + endpoint@0: + $ref: /schemas/graph.yaml#/properties/endpoint + description: Connection to the VOPB + + endpoint@1: + $ref: /schemas/graph.yaml#/properties/endpoint + description: Connection to the VOPL + + required: + - endpoint@0 + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: > + Video port for panel or subsequent encoder + + required: + - port@0 + - port@1 + + resets: + maxItems: 1 + + reset-names: + items: + - const: apb + + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: + phandle to the GRF to mux vopl/vopb + + power-domains: true + + '#address-cells': + const: 1 + + '#phy-cells': + const: 0 + + '#size-cells': + const: 0 + +required: + - compatible + - reg + - clocks + - rockchip,grf + - ports + - '#address-cells' + - '#size-cells' + +additionalProperties: true + +examples: + - | + #include + + mipi_dsi: mipi@ff960000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi"; + reg = <0xff960000 0x4000>; + interrupts = <0 83 4>; + clocks = <&cru 148>, <&cru PCLK_MIPI_DSI0>; + clock-names = "ref", "pclk"; + resets = <&cru SRST_MIPIDSI0>; + reset-names = "apb"; + rockchip,grf = <&grf>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mipi_in: port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_in_vopb: endpoint@0 { + reg = <0>; + remote-endpoint = <&vopb_out_mipi>; + }; + mipi_in_vopl: endpoint@1 { + reg = <1>; + remote-endpoint = <&vopl_out_mipi>; + }; + }; + + mipi_out: port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_out_panel: endpoint { + remote-endpoint = <&panel_in_mipi>; + }; + }; + }; + };