Received: by 2002:a05:7412:251c:b0:e2:908c:2ebd with SMTP id w28csp2570069rda; Wed, 25 Oct 2023 06:38:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwyEFMp5zqkqwSgOHyFPOAuBSJ1PTZdNi5+RqMEzdQhx9UpQJoiAUvGqcKhQSE1DaZULOe X-Received: by 2002:a05:6870:1199:b0:1e9:bbdf:4a23 with SMTP id 25-20020a056870119900b001e9bbdf4a23mr14808659oau.56.1698241130926; Wed, 25 Oct 2023 06:38:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698241130; cv=none; d=google.com; s=arc-20160816; b=BvgljgeDXL+iMtZDLOZwEDREznq1oqC+mZMQvn+G77WwNoQdKDh8CmF1acxkVvZa8X 1X1PwNLfgovk4FSz9QsdPfTTbTl/1LRMPT/TfUAKKTb++qVYteShQWBDSNGZkh+TNyoE ssvxkyrpr66cm3E61YWn/h4SitI+DuZMBB3jWB6x3HMBBW19iyH6Lz4bL4NERPcJrm6C qG7oX/+yRtPkXtohjLlrwqnoIm6gFwptcPA8ldgJ5+apIpEBxb3weUeYiVONFHn9eLdI ICdOFbGeRnXedJm89E2wbaipgYyVjjFYq+3FIrhEAibyAi//Dq1XdG7OOshMuPblaG6K VKVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:mime-version :references:in-reply-to:from:dkim-signature; bh=4kZetE1rdZ7P5Qi3G+jzZsycI0EzhJ2peFQaOTjHG8s=; fh=T/tCIyinXF04+aGOaSMTa885BQqA6CjdJck+vU1Kg6w=; b=EOcrNWEWMe6ReBhE5QQrrrVc6ONcOiotZ5pbYhBggDIZNS+2R62au7Vcenc/xWtmPH tr6SqRnMcoYYS68sAaTzTSrRNMlHT2wC8XdrDYsfL0KdJDMWBqzchHsoFhLn4zQCrg2f bSkrOzk8TgjT1z9+CkF/g98yjxkPcPMaTYwMu8FOmuJokBU/zAWsjBP8AxsL77JSKiUq 02fVG1OiNgYiXB+KliFBwu8XiDwYaqG8oAKEhfG2BPpMsA2C4BSvO8obg9FhVovi3mbK Xe+ng8r6UI3yB0uQJZyN6dEWiJN1g/XuM2LGmY/rEca+F2z3X+HlWxj/eAOQS87b6t1P vhHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=iSQMAyYZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id r84-20020a815d57000000b0059f4f2b6d72si10230477ywb.251.2023.10.25.06.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 06:38:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=iSQMAyYZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 7822580F5F10; Wed, 25 Oct 2023 06:38:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233459AbjJYNik (ORCPT + 99 others); Wed, 25 Oct 2023 09:38:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232864AbjJYNii (ORCPT ); Wed, 25 Oct 2023 09:38:38 -0400 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10CD6132 for ; Wed, 25 Oct 2023 06:38:36 -0700 (PDT) Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 93E82420B2 for ; Wed, 25 Oct 2023 13:38:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1698241113; bh=4kZetE1rdZ7P5Qi3G+jzZsycI0EzhJ2peFQaOTjHG8s=; h=From:In-Reply-To:References:Mime-Version:Date:Message-ID:Subject: To:Cc:Content-Type; b=iSQMAyYZnMyLp1VgKQKvTQoS/26q980nZkF+gJtE1voTEVXcFaTFaejRkex0nd4U2 fZOVOzFpwb7wLO8smMVOIdNSlWq4QUu5TQ8vJLuPLNHKCqOikgGs+9Zh9ExJcWDPix B5EoXs2hfDu9c0P748KUcG6TQIOOESyen1trcaEx9Dn6luPrCnQJs36rqXwbvgcNOg pz+f06a4Rnt1SrA1z4FYbCm0OoKGfIRk4RMvyF98f1ShsP51XkxorVKje3lFRdKwA+ mE3SRuCsauPX3zRmHLiOnlMhppFJj6DhLsh4TnbKe+gotbuUOtNjhhHtea4agKzWo1 XFZhodSXgrwAw== Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-1c9c83b656fso48953905ad.1 for ; Wed, 25 Oct 2023 06:38:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698241111; x=1698845911; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4kZetE1rdZ7P5Qi3G+jzZsycI0EzhJ2peFQaOTjHG8s=; b=Dq+ITjOrlaK+i2eE2OwxVFHCiFQ/U8993Jn3PDr9b6wrDwnsI/85QFpGiKpbFeoGKp Mh2qHSvkxV5rDyzuoOs/p5/5Xogwe5BoLpAiFbK8P144Wx8KSZHWliIjTaepAnGXKV3F SFpbhTXS45va+y1lpFMEA8AsGMYz4pF8sdw3KUhNKV8KLkVmmhUvAhzPEQpgXhgOV4Ko CJOd4wDe5R6WnUCBS7SpulYOgvxgV46YMKjQU/6qDek4J6RX2YA0sUjQ0w9NI/c5s69h zAuVxeFkRO7QRLAebB2lcnXAZmTafUwnA9c2PwOoUnZeyHvasCj++howU71vNdN2h8YX ipHA== X-Gm-Message-State: AOJu0YxV6TcpxOXDe9rZKkjfMAVCz6yiQ3rRUa1K/bIQqNFiBRkWN+Xa MZ+qfwegRiU3xPQAAcsyibAvXzctVrjHds/UQ788I2x/RF1hNpZ+IOj87ohxVh6gBkXqtH5my0k AmWK04lne0G2wYzKenjPbiSsFSaIO+DxLVzNC6FtUPIq1m8dsLRCiO6Pf0Q== X-Received: by 2002:a05:622a:1b9f:b0:417:bd2c:2683 with SMTP id bp31-20020a05622a1b9f00b00417bd2c2683mr16970910qtb.19.1698241090311; Wed, 25 Oct 2023 06:38:10 -0700 (PDT) X-Received: by 2002:a05:622a:1b9f:b0:417:bd2c:2683 with SMTP id bp31-20020a05622a1b9f00b00417bd2c2683mr16970883qtb.19.1698241090030; Wed, 25 Oct 2023 06:38:10 -0700 (PDT) Received: from 348282803490 named unknown by gmailapi.google.com with HTTPREST; Wed, 25 Oct 2023 06:38:09 -0700 From: Emil Renner Berthing In-Reply-To: <20231025103957.3776-3-keith.zhao@starfivetech.com> References: <20231025103957.3776-1-keith.zhao@starfivetech.com> <20231025103957.3776-3-keith.zhao@starfivetech.com> Mime-Version: 1.0 Date: Wed, 25 Oct 2023 06:38:09 -0700 Message-ID: Subject: Re: [PATCH v2 2/6] riscv: dts: starfive: jh7110: add dc controller and hdmi node To: Keith Zhao , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Cc: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Emil Renner Berthing , Paul Walmsley , Palmer Dabbelt , Albert Ou , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Philipp Zabel , Sumit Semwal , christian.koenig@amd.com, Bjorn Andersson , Heiko Stuebner , Shawn Guo , Jagan Teki , Chris Morgan , Jack Zhu , Shengyang Chen , Changhuang Liang Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=0.6 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SORBS_WEB,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 25 Oct 2023 06:38:47 -0700 (PDT) Keith Zhao wrote: > Add the dc controller and hdmi node for the Starfive JH7110 SoC. > > Signed-off-by: Keith Zhao > --- > .../jh7110-starfive-visionfive-2.dtsi | 91 +++++++++++++++++++ > arch/riscv/boot/dts/starfive/jh7110.dtsi | 41 +++++++++ > 2 files changed, 132 insertions(+) > > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > index de0f40a8b..97909b6d2 100644 > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > @@ -31,6 +31,25 @@ memory@40000000 { > reg = <0x0 0x40000000 0x1 0x0>; > }; > > + reserved-memory { > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + > + /* vout applies for space from this CMA > + * Without this CMA reservation, > + * vout may not work properly. > + */ > + linux,cma { > + compatible = "shared-dma-pool"; > + reusable; > + size = <0x0 0x20000000>; > + alignment = <0x0 0x1000>; > + alloc-ranges = <0x0 0x70000000 0x0 0x20000000>; > + linux,cma-default; > + }; > + }; > + > gpio-restart { > compatible = "gpio-restart"; > gpios = <&sysgpio 35 GPIO_ACTIVE_HIGH>; > @@ -231,6 +250,41 @@ GPOEN_DISABLE, > slew-rate = <0>; > }; > }; > + > + hdmi_pins: hdmi-0 { > + hdmi-scl-pins { > + pinmux = + GPOEN_SYS_HDMI_DDC_SCL, > + GPI_SYS_HDMI_DDC_SCL)>; > + input-enable; > + bias-pull-up; > + }; > + > + hdmi-sda-pins { > + pinmux = + GPOEN_SYS_HDMI_DDC_SDA, > + GPI_SYS_HDMI_DDC_SDA)>; > + input-enable; > + bias-pull-up; > + }; > + > + hdmi-cec-pins { > + pinmux = + GPOEN_SYS_HDMI_CEC_SDA, > + GPI_SYS_HDMI_CEC_SDA)>; > + input-enable; > + bias-pull-up; > + }; > + > + hdmi-hpd-pins { > + pinmux = + GPOEN_ENABLE, > + GPI_SYS_HDMI_HPD)>; > + input-enable; > + bias-disable; /* external pull-up */ > + }; > + }; > + Please don't break the alphabetical ordering of these nodes. > }; > > &uart0 { > @@ -254,3 +308,40 @@ &U74_3 { > &U74_4 { > cpu-supply = <&vdd_cpu>; > }; > + > +&voutcrg { > + status = "okay"; > +}; > + > +&display { > + status = "okay"; > +}; > + > +&hdmi { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&hdmi_pins>; > + > + hdmi_in: port { > + #address-cells = <1>; > + #size-cells = <0>; > + hdmi_in_dc: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&dc_out_hdmi>; > + }; > + }; > +}; > + > +&dc8200 { > + status = "okay"; > + > + dc_out: port { > + #address-cells = <1>; > + #size-cells = <0>; > + dc_out_hdmi: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&hdmi_in_dc>; > + }; > + > + }; > +}; Some goes for these node references. The order is /-node, clocks, node refences sorted alphabetically. > diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi > index 0005fa163..1670452fb 100644 > --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi > +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi > @@ -282,6 +282,11 @@ tdm_ext: tdm-ext-clock { > #clock-cells = <0>; > }; > > + display: display-subsystem { > + compatible = "starfive,display-subsystem"; > + ports = <&dc_out>; > + }; > + > soc { > compatible = "simple-bus"; > interrupt-parent = <&plic>; > @@ -613,5 +618,41 @@ voutcrg: clock-controller@295c0000 { > #reset-cells = <1>; > power-domains = <&pwrc JH7110_PD_VOUT>; > }; > + > + dc8200: lcd-controller@29400000 { > + compatible = "starfive,jh7110-dc8200"; > + reg = <0x0 0x29400000 0x0 0x100>, > + <0x0 0x29400800 0x0 0x2000>; > + interrupts = <95>; > + clocks = <&syscrg JH7110_SYSCLK_NOC_BUS_DISP_AXI>, > + <&voutcrg JH7110_VOUTCLK_DC8200_PIX0>, > + <&voutcrg JH7110_VOUTCLK_DC8200_PIX1>, > + <&voutcrg JH7110_VOUTCLK_DC8200_CORE>, > + <&voutcrg JH7110_VOUTCLK_DC8200_AXI>, > + <&voutcrg JH7110_VOUTCLK_DC8200_AHB>, > + <&hdmitx0_pixelclk>, > + <&voutcrg JH7110_VOUTCLK_DC8200_PIX>; > + clock-names = "noc_bus", "channel0", "channel1", > + "dc_core", "axi_core", "ahb", > + "hdmi_tx", "dc_parent"; > + resets = <&voutcrg JH7110_VOUTRST_DC8200_AXI>, > + <&voutcrg JH7110_VOUTRST_DC8200_AHB>, > + <&voutcrg JH7110_VOUTRST_DC8200_CORE>; > + reset-names = "axi","ahb", "core"; > + }; > + > + hdmi: hdmi@29590000 { > + compatible = "starfive,jh7110-inno-hdmi"; > + reg = <0x0 0x29590000 0x0 0x4000>; > + interrupts = <99>; > + > + clocks = <&voutcrg JH7110_VOUTCLK_HDMI_TX_SYS>, > + <&voutcrg JH7110_VOUTCLK_HDMI_TX_MCLK>, > + <&voutcrg JH7110_VOUTCLK_HDMI_TX_BCLK>, > + <&hdmitx0_pixelclk>; > + clock-names = "sysclk", "mclk", "bclk", "pclk"; > + resets = <&voutcrg JH7110_VOUTRST_HDMI_TX_HDMI>; > + #sound-dai-cells = <0>; > + }; These nodes, however, are sorted by their address which you alse break in this patch :( > }; > }; > -- > 2.34.1 >