From patchwork Mon Dec 4 17:39:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 750110 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hSA/3hnu" Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F4012E1; Mon, 4 Dec 2023 09:39:06 -0800 (PST) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a1b7b6bf098so189220166b.1; Mon, 04 Dec 2023 09:39:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701711545; x=1702316345; darn=vger.kernel.org; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=RDbV8KEqo360AWt22zz09PqUE/cssUErxHrowGLoINk=; b=hSA/3hnuwexjtdAnqzY9VgmYJ15X7WehPSXeJnGgERxDw29GpS2/TkaL8FFkQVJx/R TyZHHI8gj2Xzw2f/deynAThNP4WB3adfwcuodv0ChQOX60YNhWaDvaFbt9pdvdfvnsWs FOYH79uyAzQyFCfcjM4rXZBSC1CA3SYjnzcm8fSbl7y7xBCpaNPHRe50BPGMFc/tp3d3 kfTSBH733h8DLmZ7jLZNJ9jWYZHhUy6TD8/AnR7qbCT82sCtaWUW3gt3vvnSSDkwHi0N WegBaiKcfpJB5qM9Tlq27t0MBb+A/dvbRt70RkZkH/SwU9zLgw+fwIYXPZ+gdUMROT2P W0wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701711545; x=1702316345; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=RDbV8KEqo360AWt22zz09PqUE/cssUErxHrowGLoINk=; b=DX5bZZwKJH/MQYfdfQ2aQxz9GeGWUcWWA71nOStH/AwiGp7RPZKLxdSlyjX6/Tuwyd pk2+JdA8LIWIdScxm2OrQArlUn7MdQa8rl5DtOjQrZ+oR6gbSYWfQiPKSpraRxVG+JoC bYDjZEuKVtLTNOc59yPTUShuojWHGLMMbA+MHnPVmfHklnUHjAooFEf//oqH3MH1sNRM Jjh3WvERv1E5C/F+CVy4zrb7pAwDkM4YkgxBO8lCz5NC9qTQyqHYVUv5XrdBVC1NMer/ ll2z3iyqfnqlvbDVBl5ys8QFhsdVvUMXMB4gm+NWFVvJnZnPtSwm8dNn9bBqXohFNjBe e34g== X-Gm-Message-State: AOJu0YzNEPKZlBUCRe/6HDvR4jzCAr9HyicWDsZlVwOaufsyHTpFA6TR WbsxqXBrUZbJreE7xAM49srba0Gd+1E= X-Google-Smtp-Source: AGHT+IFY1TkeVeRGWBrgWf2i0O9q9pzjrUYsznblS+VoCoNd0mGuLFzQmCXoRFFl4jZvbkNMocSkjA== X-Received: by 2002:a17:906:1d4:b0:a1b:774f:df5c with SMTP id 20-20020a17090601d400b00a1b774fdf5cmr1686472ejj.14.1701711545198; Mon, 04 Dec 2023 09:39:05 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id mj9-20020a170906af8900b00a1907e36244sm5128328ejb.118.2023.12.04.09.39.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Dec 2023 09:39:04 -0800 (PST) Message-ID: <49c6afec-022f-02de-99a0-d409b64da198@gmail.com> Date: Mon, 4 Dec 2023 18:39:03 +0100 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 From: Johan Jonker Subject: [PATCH v1 1/3] dt-bindings: drm: rockchip: convert inno_hdmi-rockchip.txt to yaml To: heiko@sntech.de, hjc@rock-chips.com Cc: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, 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 Content-Language: en-US Convert inno_hdmi-rockchip.txt to yaml. Signed-off-by: Johan Jonker --- Note for rob+dt: Used enum to "soon" be able to add "rockchip,rk3128-inno-hdmi" Changed V1: Rename file to more common layout Add/fix hdmi_out port example --- .../display/rockchip/inno_hdmi-rockchip.txt | 49 --------- .../display/rockchip/rockchip,inno-hdmi.yaml | 103 ++++++++++++++++++ 2 files changed, 103 insertions(+), 49 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml -- 2.39.2 diff --git a/Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt deleted file mode 100644 index cec21714f0e0..000000000000 --- a/Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt +++ /dev/null @@ -1,49 +0,0 @@ -Rockchip specific extensions to the Innosilicon HDMI -================================ - -Required properties: -- compatible: - "rockchip,rk3036-inno-hdmi"; -- reg: - Physical base address and length of the controller's registers. -- clocks, clock-names: - Phandle to hdmi controller clock, name should be "pclk" -- interrupts: - HDMI interrupt number -- ports: - Contain one port node with endpoint definitions as defined in - Documentation/devicetree/bindings/graph.txt. -- pinctrl-0, pinctrl-name: - Switch the iomux of HPD/CEC pins to HDMI function. - -Example: -hdmi: hdmi@20034000 { - compatible = "rockchip,rk3036-inno-hdmi"; - reg = <0x20034000 0x4000>; - interrupts = ; - clocks = <&cru PCLK_HDMI>; - clock-names = "pclk"; - pinctrl-names = "default"; - pinctrl-0 = <&hdmi_ctl>; - - hdmi_in: port { - #address-cells = <1>; - #size-cells = <0>; - hdmi_in_lcdc: endpoint@0 { - reg = <0>; - remote-endpoint = <&lcdc_out_hdmi>; - }; - }; -}; - -&pinctrl { - 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>; - }; - }; - -}; diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml new file mode 100644 index 000000000000..96889c86849a --- /dev/null +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml @@ -0,0 +1,103 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/rockchip/rockchip,inno-hdmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip Innosilicon HDMI controller + +maintainers: + - Sandy Huang + - Heiko Stuebner + +properties: + compatible: + enum: + - rockchip,rk3036-inno-hdmi + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + const: pclk + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: + Port node with one endpoint connected to a vop node. + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: + Port node with one endpoint connected to a hdmi-connector node. + + required: + - port@0 + - port@1 + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - pinctrl-0 + - pinctrl-names + - ports + +additionalProperties: false + +examples: + - | + #include + #include + #include + hdmi: hdmi@20034000 { + compatible = "rockchip,rk3036-inno-hdmi"; + reg = <0x20034000 0x4000>; + interrupts = ; + clocks = <&cru PCLK_HDMI>; + clock-names = "pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_ctl>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + hdmi_in: port@0 { + reg = <0>; + hdmi_in_vop: endpoint { + remote-endpoint = <&vop_out_hdmi>; + }; + }; + + hdmi_out: port@1 { + reg = <1>; + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; + }; + }; + }; + + pinctrl { + hdmi { + hdmi_ctl: hdmi-ctl { + rockchip,pins = <1 RK_PB0 1 &pcfg_pull_none>, + <1 RK_PB1 1 &pcfg_pull_none>, + <1 RK_PB2 1 &pcfg_pull_none>, + <1 RK_PB3 1 &pcfg_pull_none>; + }; + }; + }; From patchwork Mon Dec 4 17:40:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 750109 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hTl5hK1+" Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1F84D3; Mon, 4 Dec 2023 09:41:01 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-9fa2714e828so635942766b.1; Mon, 04 Dec 2023 09:41:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701711660; x=1702316460; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=0YoXgk1fmeGz9Ml7hlpE/8h2Sivb7FXL2iIYJZqnuHo=; b=hTl5hK1+vHB1cPY6Ul5dmkCGNh/9C/+rWqGSJ0GznYo9XYzJ7eKcjYPoe0je0Tl60O //K4fJTjPX0avVotZfOfmbWyVSHHXGSij4h31b2lmAWpYOZPeUOAHXChacMnDeD3HbQQ oEdwDhmb4OJXkYGGE7dZc+IKW2lEjTVUoGADxcWJaLxAT4y2mV64jRXyk97OagPPYyBL CNfOoP1Rf+y8qJvvwWJyHymVygi1pI960QHjI8kcT4vO7o2rjzUkmwLn+/U1DT5QStKu sLb88Shzfr1oRAaNZQfSwk5oxhnxUH8q0LTLYzEoxeJrpKhVGFFbRvMr44OxCcjZov4N //oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701711660; x=1702316460; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0YoXgk1fmeGz9Ml7hlpE/8h2Sivb7FXL2iIYJZqnuHo=; b=rIPjChrLiarf9hnPHgg+WT+RdCDwdwYNXMOmjtsgkF0nLhK01spHuRzgZ3wsLZrws8 ET8VDsIvJH8WY8IrAKZdyD76FCM0ExEE51lRfVUpIxyGZqrVxGyiuHYZUOeYLWSmYagF Qn2SMVCKri49cfpwy2dL9DJsaVAxbSunelzGJA54TW/p1PCO0M4F5NSbh7JnFbirt/zG puZoWX/jNmlA7F4/A8nhjqNYCnN4DFAZX+SeQjFegpza45ZDLam2BYCvD7zopSa/chYH lbe/B1rmJJyx1nQq1O58tSB33CyQ//XkPTdR23/oESLTpXTFMyN/RDAgOtxPxa84M0kb Pheg== X-Gm-Message-State: AOJu0YwM6f119oqB9tABSMObNTT8RsKBDqAN4CYGMQGhH9c81JdNon4+ yF95RYvQJM8wNJItnjpN3H8= X-Google-Smtp-Source: AGHT+IH5CahfTiqAKyTJCwE1ddGA7CrKLTxjhTR6LznurnRE9jPGXs+oBd55rb4exBi9MUScKfvJ5w== X-Received: by 2002:a17:906:6d52:b0:a19:a19b:55ce with SMTP id a18-20020a1709066d5200b00a19a19b55cemr3477124ejt.94.1701711659945; Mon, 04 Dec 2023 09:40:59 -0800 (PST) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id ub12-20020a170907c80c00b009d268e3b801sm4350577ejc.37.2023.12.04.09.40.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Dec 2023 09:40:59 -0800 (PST) Message-ID: Date: Mon, 4 Dec 2023 18:40:58 +0100 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 From: Johan Jonker Subject: [PATCH v1 3/3] ARM: dts: rockchip: rk3036-kylin: add hdmi-connector node To: heiko@sntech.de, hjc@rock-chips.com Cc: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, 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 References: <49c6afec-022f-02de-99a0-d409b64da198@gmail.com> Content-Language: en-US In-Reply-To: <49c6afec-022f-02de-99a0-d409b64da198@gmail.com> Add hdmi-connector node to comply with the inno_hdmi binding. Signed-off-by: Johan Jonker --- arch/arm/boot/dts/rockchip/rk3036-kylin.dts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -- 2.39.2 diff --git a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts index 67e1e04139e7..a213333be011 100644 --- a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts @@ -13,6 +13,17 @@ memory@60000000 { reg = <0x60000000 0x20000000>; }; + hdmi_con: hdmi-con { + compatible = "hdmi-connector"; + type = "c"; + + port { + hdmi_con_in: endpoint { + remote-endpoint = <&hdmi_out_con>; + }; + }; + }; + leds: gpio-leds { compatible = "gpio-leds"; @@ -110,6 +121,12 @@ &hdmi { status = "okay"; }; +&hdmi_out { + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; +}; + &i2c1 { clock-frequency = <400000>;