From patchwork Wed Jan 31 21:14:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 768626 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63FE838F8F; Wed, 31 Jan 2024 21:14:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706735675; cv=none; b=ojQV2YMT1nwHHyX+6Um7yuHF8UB6L+xzEE1fA+8acPJq9xaIkggBeua2B47gl1Z0mI/sipZqIS+ejaLJ3ns1fir6GiOWVeVTxP1lsLNDIOrTPT+zSvKCqRMUlUeQKumFobC+k0ZK16KAUvUeg87CoD51G5J/EkAfdKs3sZ298y4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706735675; c=relaxed/simple; bh=ecE9+lRhGVzRojRakumr7hmCpaQlrKborDJ+lsFEI2w=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:Content-Type; b=dwPKWHXZ1JWZPNtI98oeXVYY93lgGWB5yY4OPaqUzfDwXzI8FT34rbU0TwIVi9oKQlfJbmFYJKNRBdjKzk4i3YVsdAQ0K5CzVMpy1wecPQriUrAIdI95cVQyA3a4vBdI1TKZFm+1M56k14bLJ98igWtLmNYFKU/x/JDpCFKoz8Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TGl2BJmL; arc=none smtp.client-ip=209.85.208.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TGl2BJmL" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-55f15762840so219127a12.0; Wed, 31 Jan 2024 13:14:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706735671; x=1707340471; 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=BzKBpTO+yAsO6AKq5s8rWuJxCgwGnyxQPNp5dZtPA/4=; b=TGl2BJmLfeYxzd97d7W/QZPjmyj/Is+IAt/ZkFi7S02Mi9LMySwW/XuKTIATHi69Uq bexcPbQun28dvMCe6e30/XKj0lIhYdTYVIj1o3niUE0XcCzhdbwXNcedJiF8o624/GY+ xOYACdTR2ZUFa8FNk8kKbJAYQU+Boi7kLUMqFrCwhntpkxLeVUI67IHtEXmtSpt7fNQA IuLPWYjqMMS00kVmgwBQbq/ZQkQw8Dj0iwP+5eygw2S8vqqhucVFqR1ElVzaYsC+NCBa m2M2SRlSw7HDSniCfTXwxUoeZBiEw10lQ/OlAowlNTXL8mdUGaw3AAYyyG+F9HBDlv8i EH6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706735671; x=1707340471; 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=BzKBpTO+yAsO6AKq5s8rWuJxCgwGnyxQPNp5dZtPA/4=; b=eCsyCzrto5xc/XimeBrxtwubigFvOKKR8f1ivh2QW6WO7umMJdBkAHpcdhTEAeNaQS 8RbPFP25qL606jMp17NyG5j1Xk8zxIHuu/9z414VD6jV8GcrV4vjlzrI3+masHzM5c/d Hb4ZTigDqLzCBxlrqbjC6GQBJc9Bqcv1rNWSBOQzZNXDn4aAvimHaItwIssLKYK11vOk bX62wq1ZlkpSGbPBC+Lu76Uo4b+TGBfAl4kTExpsLFA7CQoBZfB6jU0/RmdQdEcWecoD IhQXiHhhLEx2pBornTeZQc/mAuFPzXgyIhuSbh5aP5NpdA8IycB8MzOlE38BmmCzkJpU gQSQ== X-Gm-Message-State: AOJu0Yw4xEK1/pFI+9V9/YFWci/RY4LPA7sAwLLPHCfl1TYBUFPKGFtS a/u4feOo2YTQ6MtKMFPUxA8C5SCSwDu4lYtsTHUn91+p77ut0UErVvgDUml7 X-Google-Smtp-Source: AGHT+IGKSAQ0iom5aOWp/ud0qd1AnStLBR0ipcNAgWjoyolxlKbW/Qay9WlmcGjARF23PCDI5a71JQ== X-Received: by 2002:a50:ed91:0:b0:55f:4ce3:5988 with SMTP id h17-20020a50ed91000000b0055f4ce35988mr1738459edr.8.1706735671176; Wed, 31 Jan 2024 13:14:31 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCULQ33QhABS4n6ZmrFSYOAyDgetml7TCChj/sOPv0oioq5VepLJymPA1kx2NkWnR/s/br7OHudwGBzZQ5lJljEVZ0T8ec2Qp1S80hCa2QJ/ToAZa1YotVwMLjl1ixwuX3c7Cu+05OhCGKZkQey/yuZ2Bw6v0NVp2+VtTGbXGVknaBG1caPpDodXH8w2Gv/zN7o5cVAOiQHi9MBkRsVot/HEcvmJEiKtCss4rKm7VvdBqeNBwZBwqxTaQPORu/gHnP6qcawXXJpcVGjzH6VAlZvH3ErYrVqCokAc/Rww/1Xp80adSwmW4MDgtNtHYQQyyLLEZIyow/Bpq6vIbRaYa5ynGN86YgBNPs9PsrXMZrXxxonkYDbgwwceyhD1DlNa1QtF0buPDCKbvEXuDI4YJZ5Hdx4UPHCsKxRufcd+/SKhB9BYYyvLq2uV94mWiDf7SiE8EzadWm2IkK3USljlB47pSTIfHntNiE46d3ZtXcpwD8jpvymiIPIFkfazQVGZ1ljIe8QguTVnuWOzaum/Qon6g7VEJ826bImqyFkegmo5KHphHZieTr3zht96D9DCWQSFQ43PUzoKevPHSvk= Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id h28-20020a50cddc000000b0055f384e7530sm2241381edj.32.2024.01.31.13.14.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 31 Jan 2024 13:14:30 -0800 (PST) Message-ID: Date: Wed, 31 Jan 2024 22:14:29 +0100 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Johan Jonker Subject: [PATCH v2 1/6] dt-bindings: display: rockchip: rockchip,dw-hdmi: remove port property To: robh+dt@kernel.org Cc: hjc@rock-chips.com, heiko@sntech.de, andy.yan@rock-chips.com, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, airlied@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, tzimmermann@suse.de, mripard@kernel.org, markyao0591@gmail.com, 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 The hdmi-connector nodes are now functional and the new way to model hdmi ports nodes with both in and output port subnodes. Unfortunately with the conversion to YAML the old method with only an input port node was used. Later the new method was also added to the binding. A binding must be unambiguously, so remove the old port property entirely and make port@0 and port@1 a requirement as all upstream dts files are updated as well and because checking deprecated stuff is a bit pointless. Update the example to avoid use of the removed property. Signed-off-by: Johan Jonker Acked-by: Conor Dooley Reviewed-by: Rob Herring --- Changed V2: rename title from deprecate to remove reword --- .../display/rockchip/rockchip,dw-hdmi.yaml | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) -- 2.39.2 diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml index 7e59dee15a5f..391c2a7e79de 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml @@ -97,8 +97,8 @@ properties: ports: $ref: /schemas/graph.yaml#/properties/ports - patternProperties: - "^port(@0)?$": + properties: + port@0: $ref: /schemas/graph.yaml#/properties/port description: Input of the DWC HDMI TX properties: @@ -108,11 +108,14 @@ properties: description: Connection to the VOPB endpoint@1: description: Connection to the VOPL - properties: port@1: $ref: /schemas/graph.yaml#/properties/port description: Output of the DWC HDMI TX + required: + - port@0 + - port@1 + rockchip,grf: $ref: /schemas/types.yaml#/definitions/phandle description: @@ -147,7 +150,11 @@ examples: clock-names = "iahb", "isfr"; ports { - port { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; #address-cells = <1>; #size-cells = <0>; @@ -155,11 +162,20 @@ examples: reg = <0>; remote-endpoint = <&vopb_out_hdmi>; }; + hdmi_in_vopl: endpoint@1 { reg = <1>; remote-endpoint = <&vopl_out_hdmi>; }; }; + + port@1 { + reg = <1>; + + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; + }; }; }; From patchwork Wed Jan 31 21:16:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 768625 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E384639ADD; Wed, 31 Jan 2024 21:16:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706735820; cv=none; b=Yrp2n6ocdRuOr31iVSxSK17LmXWRolVRBD6kNkxJl7+3YN5O3XdNSHw9NCYy2ulJRoa/9zrVuqHOVwrkLeAcfOY6b2XlAYokEJPf0GT4tkFDXsW+oog6h+HRcgzEhBYLCcvthnb8roHeoUCUXEzj8Q6hdJY3aNNuAfRx8ETjMbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706735820; c=relaxed/simple; bh=Br7cvUmV1n/kCg8DCyT+jp1U0pFs6MzAm6mRSIHrVlI=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=tqERfycNSOewciNBUHwXMpV2qdSr933GejGOMdvKcD24202WczMYupG776/HuS3f/rwPJZfBaYdui5426lzxQ4Nn947iQJauplaVG4/Rd4drDzqN490JtaL2r1PjTNyWZvXvPcReAZSa4gtLACtiyVJy/ScKU+quv69vguTjorw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CHXU6wzP; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CHXU6wzP" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a3566c0309fso21412966b.1; Wed, 31 Jan 2024 13:16:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706735817; x=1707340617; 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=aIvaypLdP0+JFHDzqqa1D+EbFHtABYPWV2c8Aa5Q328=; b=CHXU6wzPcCB60XEW6rt757fVWhbGqbvzgNy5Ps1rzHPKno0ii2CXTCo0reJ8abwD+L 5hyKIuFdy/OQp852n9dXBlyqMD1jb/xzPz5O1EvdT9YHhaHx6AjR1j9E/fnh0jTDRwuI M7ows883UP1uPnFYKWDtwrWG8GYXplecYzJYscnw0Q9IOhZ7d1yQPSMsYlmJRRrZhUfI zkOHgXaTRQzpPZnuDfVNOHPBaObT2XTtoJfblsEO6gLUUQdou2RD0I5dZGRS6FVygz5y 87RtFV2dXw2l3ayAIP0p9jm8Xn6nNY+naPE3BbLaWTGaz2g0DiHAWW2N1MKmRGaLA8f/ x+Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706735817; x=1707340617; 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=aIvaypLdP0+JFHDzqqa1D+EbFHtABYPWV2c8Aa5Q328=; b=Hy8ElflHUkdo0CIgigrYgkP/E3PQ0WvFzy+QQrmu/GtdmxoVOcEH0Etntrt++WE7nc GvmZet+mN1pltDa/xQoGM4sBkOTxt8YakQOFflVXlqz3NzwEWLd98MtHQBDsaYYpXK/G l1mNsDv0tFsnJVsXUyUvsVybvvKFJl7nEX5x7ATUy6ypt49KRbXuROp0ckcqAFpohjoC NQs2gM2jbAZq2M4mMfPIGLHWpDvI7VTIOxY2T8bp24ihDJHsPIdl07FoagqpaR7mWDBk 96wvoWcA+to22jmnr5o/CD7mAzZHkyzTLdTrpPIxE3Wn5PWcpPaLAPoX+fgRmounDELU lmNg== X-Gm-Message-State: AOJu0YzKoeay901kbkT+pmO3v0KSo1PBUMxBUBZ3hiWaUDysg+NxC24W 03Gy87iE9pjCtxxVAIWqHnEU/wwgNddP6PRoEJvPaEdR0BL1xBy+ X-Google-Smtp-Source: AGHT+IHnO3WBh/+ajC4q+i/16gR61Amb9UqtxVbpXreKVzkmjEyKKcJdnZqL0gzfWAOgay1EoAzL9g== X-Received: by 2002:a17:906:2495:b0:a35:854f:6c9e with SMTP id e21-20020a170906249500b00a35854f6c9emr2058734ejb.51.1706735816769; Wed, 31 Jan 2024 13:16:56 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCX6h2Y8J63c7oNmYUJeFHimF+GcNPtlF6WODVlXW+KZ6iCTqVqg0D51fEnFrd9PaRhjVZMpNJaOy2701csFyW8y0S+7/CgZBrNgtpfQ5QMjH5TCCL+CxYGKm0eb62yd17kMdsgnrikdnrrQ7RN0yHC054sAoinbOGzJF/OcbhhEuazViV8Ch9fuHX2KPrdDMQdFmjZfAmcSflVDCUlvyrRV3twI0NTdA6G1uWr/5leHTYx9r3g1pPt8BFAebYLJa9y7YjM4/xqD0AAYwvNpx6x8M6n/re4liSV00Nlsi0Zp8LD1igj6fwWiQubUZ8Bg9Y36dxHYP7Xhp5tHJ2r/3QiJhvIk0g8X73VF2vo/P4MXc74X9IFsLXUf8l0kZINM9D7h07ERqXfY6XQ2Aam1FLixptd7AWHwy0L1F7EC2RrZHxP9Lim31uAmBKQVfqqGbOwZXAxBXqfyQgm9wDKqTALAY2aoWzm3oDK3Y8hw+kPSawpNA8hlxVrMCOcp7FIoj1ZP3t1Y/b2jVCANP7gkha8y76qXMxX4XBnH5El/McGwAP3l8LDmvzdXLRqSpntlGyJUQvnlYt5i+Ht340o= Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id ty5-20020a170907c70500b00a35a8571419sm4040634ejc.135.2024.01.31.13.16.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 31 Jan 2024 13:16:56 -0800 (PST) Message-ID: <9b84adf0-9312-47fd-becc-cadd06941f70@gmail.com> Date: Wed, 31 Jan 2024 22:16:55 +0100 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Johan Jonker Subject: [PATCH v2 4/6] ARM: dts: rockchip: fix rk322x hdmi ports node To: robh+dt@kernel.org Cc: hjc@rock-chips.com, heiko@sntech.de, andy.yan@rock-chips.com, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, airlied@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, tzimmermann@suse.de, mripard@kernel.org, markyao0591@gmail.com, 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: Content-Language: en-US In-Reply-To: Fix rk322x hdmi ports node so that it matches the rockchip,dw-hdmi.yaml binding. Signed-off-by: Johan Jonker --- Changed V2: keep reg-io-width together with reg --- arch/arm/boot/dts/rockchip/rk322x.dtsi | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) -- 2.39.2 diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi index 831561fc1814..96421355c274 100644 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi @@ -736,14 +736,20 @@ hdmi: hdmi@200a0000 { status = "disabled"; ports { - hdmi_in: port { - #address-cells = <1>; - #size-cells = <0>; - hdmi_in_vop: endpoint@0 { - reg = <0>; + #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>; + }; }; }; From patchwork Wed Jan 31 21:17:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 768624 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A3CA39ADD; Wed, 31 Jan 2024 21:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706735855; cv=none; b=Rnzke8Zf//+QKQbGOt6arYlRg73LCd3kfnpvXWH06wxXvYjflihyIiGhbIbxGyIsuoZAdIQlqZs57z6hezfwbIvVZFOSP0v0qIrMWxeHNvUNXbSPzo95ty8hJlc8+4zbQByjzoW7Vue+wpWHtyimqTtSVqeENhnhra7Cf5pID1M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706735855; c=relaxed/simple; bh=qq0UGnQx6TCiR50GTWZeefaDBebAKa46z6aXuXmVi9s=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=UnytDTO+FWv0/9tQbDXMc9+jyttfGGYtGeh4z6v8DJBq6Sn7WtKO8Vrt396HP5MVuuDTVpT+EHO7+QN4Mm+Qk6ph0geji6SanDRNqkjrkeuFPo6ks02394L6qpTHuU5EDH4r2alz3fuzYJgfW2n4N95uq43HG7wMHJqfv0HQRIM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Kf20KyL0; arc=none smtp.client-ip=209.85.167.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kf20KyL0" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5110fae7af5so256144e87.0; Wed, 31 Jan 2024 13:17:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706735852; x=1707340652; 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=R4aZnJ0HXPSCrrZnvvv03peCc+aJLdST+sQtI6Yh7ug=; b=Kf20KyL0TsT+7fVfunqFXYdYGpQcqOT+SFkAtfsvd863KicFTfLekVlc1J11ajD+a0 +Bfprx4rpLAfHNIJrkgt1LCZXrmpWtXvhnoHFTQni3k0TJEzD4TUaiZLLo7/yEljg3EC 59/DA9FebVO/ta3a5O4XOJZTWO7KSocNBrfkuEsPwaJqrTj0ArvcaOP/ufwPzTd3djdL e32/UUEaTLWq7N3qMhm6e3Hu4OUka56miYl2zkJ7mk7jkv0JSrS6Qmcj4ghpY/Zr258+ XrGOuhCIBj2xo0V8m271F2RGki4xcy9e86HuVqenxO9BUus4QWfPGGyXSdeUfxu8Qqrq gsmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706735852; x=1707340652; 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=R4aZnJ0HXPSCrrZnvvv03peCc+aJLdST+sQtI6Yh7ug=; b=mYfc7C6MpPqKuZAJLt9AX2nNRkCbZm7yhNeztUkeUtRgK5rHMpctIatQsQoWg/u9au UsM9gH1/dCEG2gMby8bAcdBynePI3bWX36cxAMltb22zVuWq2W+AHk1kyotsFsNRrlUt bTybCK9cbv/v1X1zyKKoRPfLBW1I4qvSK364M2whm4ebV5yocuXH6/e7Bix/K00TCTo2 wBGTTo9tALvuS44s/RrPKLQuDTZguBfEATmimA4TfkUQhukYfZgWCigjMJxUgWCU3Aqb dAB4AJ5iUDLIvR6QKwXNR2EcoJ5U1HGzXSv6OUVTEEzVr6z/tP03zWe74ZTMf/8xdMWl HCeA== X-Gm-Message-State: AOJu0YwcWmQv6ZDFxcXe9djhGyzSfITuNogDH4srSP5y1x4JQuk+u/4v gwBThgU+EnqLGNkXzmhIfI0ljDduX0d06xdyuLq9n4IQmeRycgpS X-Google-Smtp-Source: AGHT+IE+0isqNh4+ujtT55m3CO8TfbUQsPsn/Em5gcobBL4NzwWM+JzTycjuSMlXff5ckL/9eHFKzg== X-Received: by 2002:ac2:559a:0:b0:50e:d514:77bd with SMTP id v26-20020ac2559a000000b0050ed51477bdmr437572lfg.18.1706735852064; Wed, 31 Jan 2024 13:17:32 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCW+Y6j2zZMzBfnbk/bhkKrrJOnx2LOrJUHkBhyYcPiBX7GMnrzVU7PF8xepNbZlA/Tzl24kBAFvDkoBY/knhdfC/aVwufd/Onk1b7PatvAlaB9BCwDzlkeQJceUguUkRk8AKe9xsdhFH2JnSGzFSGdECPaNYaLKV/6Kexnb7hyeS1T3vgRJmk9BcOHG8h6Z+TDGC3Y+CT6CjIm/loZSAxPgoE5isYhAEru5DRsM5phL5c6vbzdCo5E3OB4DO8WZzJpJUhQl0vaOLlKfWamY2StJi7vrCvn6PTNsIvX7q20SkFlqqGrW0QVEoKUr4bx/kz2mWl0T2IFEQbmwCT8Gqe22XguZVouuNOG+tGyWhreC/XP2lc6TIn2oYtCUaWAmnyAoY3G9bec+5Q7pK015MK4JEor5WAH/W5Mrix00dlx7XJsmP3Pow5jUDpv2kJ5Y75pw1yEMn1Gx5z/4X78vLgEgEwyCmHCEfSqtrr/5cFJTzBYu/ZZj9cc1WoR3GvcgevMXd6cyPIFXFPO7LT2LwTYwgVKxhDHv2S5WLCekbGhEKzLsItaXOIgThqVcJzKg8cIgXVw4klvFxTMFx9E= Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id ty5-20020a170907c70500b00a35a8571419sm4040634ejc.135.2024.01.31.13.17.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 31 Jan 2024 13:17:31 -0800 (PST) Message-ID: Date: Wed, 31 Jan 2024 22:17:31 +0100 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Johan Jonker Subject: [PATCH v2 6/6] arm64: dts: rockchip: fix rk3399 hdmi ports node To: robh+dt@kernel.org Cc: hjc@rock-chips.com, heiko@sntech.de, andy.yan@rock-chips.com, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, airlied@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, tzimmermann@suse.de, mripard@kernel.org, markyao0591@gmail.com, 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: Content-Language: en-US In-Reply-To: Fix rk3399 hdmi ports node so that it matches the rockchip,dw-hdmi.yaml binding. Signed-off-by: Johan Jonker --- Changed V2: keep reg-io-width together with reg --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- 2.39.2 diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 0caa842bba0e..9d5f5b083e3c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -2022,6 +2022,7 @@ simple-audio-card,codec { hdmi: hdmi@ff940000 { compatible = "rockchip,rk3399-dw-hdmi"; reg = <0x0 0xff940000 0x0 0x20000>; + reg-io-width = <4>; interrupts = ; clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_SFR>, @@ -2030,13 +2031,16 @@ hdmi: hdmi@ff940000 { <&cru PLL_VPLL>; clock-names = "iahb", "isfr", "cec", "grf", "ref"; power-domains = <&power RK3399_PD_HDCP>; - reg-io-width = <4>; rockchip,grf = <&grf>; #sound-dai-cells = <0>; status = "disabled"; ports { - hdmi_in: port { + #address-cells = <1>; + #size-cells = <0>; + + hdmi_in: port@0 { + reg = <0>; #address-cells = <1>; #size-cells = <0>; @@ -2049,6 +2053,10 @@ hdmi_in_vopl: endpoint@1 { remote-endpoint = <&vopl_out_hdmi>; }; }; + + hdmi_out: port@1 { + reg = <1>; + }; }; };