From nobody Mon Apr 13 01:05:16 2026 Received: from mail-ot1-f100.google.com (mail-ot1-f100.google.com [209.85.210.100]) (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 C579C1D7E5C for ; Sat, 11 Apr 2026 02:47:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775875671; cv=none; b=p7QUO8u9sp5nN0KxX3V5mL0wLmFyQAtyI7Heg4ejjB801TgCSe+VIyMLCH+V4t0yzaJVwo9nXKVhrQZRQdLA6XQEZtXOoMLMvGdn6dG7vifrzr4g9v3xalUTq7AZ+pkGBEJ2ALQg2wLzZsQ6yysEKpvkYj+OCJRWGRQlOaAT8Eo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775875671; c=relaxed/simple; bh=YOfFbIpwiNDmQQ6SnW9JqzlFwsdx7DsINX0gVz2lQkI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D7a1u9u2fL09VQyjHxnc9yxSiiuC7eSzkNKmh0T33hfdkiVqUdyzmrdwNdTVBgzNImn5JOKGCbmDqn4Z0zdnvERXW4veP9EEiryn2TvxZfX9JFKNfdhjRjLAnkX/MYTH4sBguvjhqXbpVC3nLMduvNpbDHIaPvOKLw1/uR9oIUY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ausil.us; spf=pass smtp.mailfrom=ausil.us; dkim=pass (2048-bit key) header.d=ausil.us header.i=@ausil.us header.b=QDogs1ms; arc=none smtp.client-ip=209.85.210.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ausil.us Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ausil.us Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ausil.us header.i=@ausil.us header.b="QDogs1ms" Received: by mail-ot1-f100.google.com with SMTP id 46e09a7af769-7d9e22176a7so1413980a34.1 for ; Fri, 10 Apr 2026 19:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ausil.us; s=google; t=1775875669; x=1776480469; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C8HDblj7fRKJtovg4Bo+ljGQF5b9QTgQki2w/2Xqdco=; b=QDogs1msm18Yh0L8JmBh7IMvjs7f1589Wq98sMzg1sl7iEfLclZI1Msg458nE3mD0T mhN7Ctz5XIiSY2HIbh1zHAVEN0xGdz3Uxie6yD3vSvOwL+sal1OhiHF21s8S+z2r8WM0 aC+e2KObFTxEx898PrMigjbgdPzJlRhx81gOR9o4i+SIY0V5OrmnEkCHdRRa0IP/CmLg Agg7tisW8GB+n7Let8S+I3A2dxzPwdk/LAbS4rkqCIFLtSV6SaV3PsnnMYpN7WZlDKf2 rq30QJfgAjlNFJHSVFXYvmPCzBK64/PpycqxCBOEUzerDHmdSCdx2u/4/aGN0GKHj8rI Fhkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775875669; x=1776480469; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C8HDblj7fRKJtovg4Bo+ljGQF5b9QTgQki2w/2Xqdco=; b=rKqrW+tATmJC1mrUouxD7qQCe6WoOgk1MKhRk+kfubm5Sgn/x4RoCr0ojNvECAtgmh 5uG3HM9OGzKytC+b7cQf9o+321XNycsJlu+lvz0CwfiuPIGoKf7AsC9nZPW7TdSUyyn9 l3o6yft+yHEroAP8rsqqFY+4o+hfKLG8CfHT0ohaEp6LN5XI7XahmnQXXCntizIm1+7i 6ie+8rODIfmyZBjcezava3J0l/258uE1Il8hr3xtAz/KG14atdSSSCaiZOiEE/Q93rZY tWoWTmBmgUQGRY2kkmoQGlliALFHdtCwz3bNfoUVaUPHjwcnpNhkHA00BM5RX5r8k+50 r/Lg== X-Forwarded-Encrypted: i=1; AJvYcCXRzkhMdNX1CgvPC1PkP8qUm4LAYPN3QuzM+5jDDfWyd2wN5NjUFmAYkv6TxbvNjdm9oleIs9wMZErj3dE=@vger.kernel.org X-Gm-Message-State: AOJu0YzfGH48uoJ0ENjB0XY13lnYPk4KC5gYi4jAojqth3mT04h8pbRa 6J+67te9D+FcdKgP2/bMpu2z6vX+O14ZzkNhu/ZnC0dG8Wj3A83SuMBBTRHkM4u2JjcyLz2FOkM xa4g0Q+3mRHArXlp5xlFzZPRRVvWnAbWr39od X-Gm-Gg: AeBDievaL9AS93NRziPrnCXWUSq4HwD3u7/crWEBklsE3QLky4AN8/2FGDdaPiQy6y2 rGM3kD23VgeerqDFADLH66QaPlqzJzlH7CU9KZlLVGiPVYv5e/+VijnSOGEvG8XlCsAIRAUjPgz x3bWJTfUr0UZtsBBXEsZIHAseJfIMZ6QBPLtBkcXrbKLNnCP+3O4vWhDyRlgDvpFzL+ALn/Jwr6 zsVpVy4d9Z8ErWx4oTG7PS00lCT58Or72FJE5ChNsGOibM87FMCepZzD+QVAfvUnu0v62ppgNwL E+45O9zi2b4oH5Ss2rxWKKUo4jnfurXvYf9UTTxPnwT+XRDnLJ7sCUCHP2YjO4EY5bJGE7zYRyQ bAcFyWkzjv82mJGqkp0VGlIM2dPw2GOBTO35Nwrv5YSaM X-Received: by 2002:a05:6870:75c5:b0:41c:4423:5f0 with SMTP id 586e51a60fabf-423e0e8bd76mr3635022fac.14.1775875668802; Fri, 10 Apr 2026 19:47:48 -0700 (PDT) Received: from ryac.ausil.us (207-179-239-100.mtco.net. [207.179.239.100]) by smtp-relay.gmail.com with ESMTPS id 586e51a60fabf-423ddd32ab3sm599086fac.16.2026.04.10.19.47.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 19:47:48 -0700 (PDT) X-Relaying-Domain: ausil.us From: dennis@ausil.us To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: FUKAUMI Naoki , Hsun Lai , Jonas Karlman , Chaoyi Chen , John Clark , Michael Opdenacker , Quentin Schulz , Andrew Lunn , Chukun Pan , Alexey Charkov , Peter Robinson , Dennis Gilmore , Michael Riesch , Mykola Kvach , Jimmy Hon , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski Subject: [PATCH v6 1/3] dt-bindings: arm: rockchip: Add Orange Pi 5 Pro Date: Fri, 10 Apr 2026 21:47:41 -0500 Message-ID: <20260411024743.195385-2-dennis@ausil.us> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260411024743.195385-1-dennis@ausil.us> References: <20260411024743.195385-1-dennis@ausil.us> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dennis Gilmore Add compatible string for the Orange Pi 5 Pro. Acked-by: Krzysztof Kozlowski Signed-off-by: Dennis Gilmore --- Documentation/devicetree/bindings/arm/rockchip.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Document= ation/devicetree/bindings/arm/rockchip.yaml index ae77ded9fe47..3c6b83a84463 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -1320,6 +1320,7 @@ properties: items: - enum: - xunlong,orangepi-5 + - xunlong,orangepi-5-pro - xunlong,orangepi-5b - const: rockchip,rk3588s =20 --=20 2.53.0 From nobody Mon Apr 13 01:05:16 2026 Received: from mail-oo1-f98.google.com (mail-oo1-f98.google.com [209.85.161.98]) (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 174BD1CEADB for ; Sat, 11 Apr 2026 02:47:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775875672; cv=none; b=q7NSUW/YU0MkSCmsQBtaXM21bDOeVXH2a5va48fv3diHtbZFIdKdNpfh21ykVs4LAuPN1Gzl5b71NHmPVvAo13DrtqQMVs4UgnKZfL28vSp/fW+fXi7jO6T/e540pR7qhwEpJlY2OK2UAuFmRHhZeHh4vkjgFa0eaV0RT7MBDRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775875672; c=relaxed/simple; bh=vQUxmko/Jd/65zUwvghbSPz6GGysPc//QGxB+93y4RM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gpXHTzen4hf2R01zKFWK+wH3mhNmH5CjbaF6/O6lj9e2WVnMjSMQQGCI+Zn+PubW6/GGCjsIrk9C6sHHzxOXx1nJR7JC6hRY3e6MWRR7N/kwnkcY3cn14p8rMpwOg1jpbdo23myJffjsr/YNCkMBJyxfjlb16HClasOcSRKYhNM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ausil.us; spf=pass smtp.mailfrom=ausil.us; dkim=pass (2048-bit key) header.d=ausil.us header.i=@ausil.us header.b=jt1U4aiu; arc=none smtp.client-ip=209.85.161.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ausil.us Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ausil.us Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ausil.us header.i=@ausil.us header.b="jt1U4aiu" Received: by mail-oo1-f98.google.com with SMTP id 006d021491bc7-662efd1bdd4so1436610eaf.0 for ; Fri, 10 Apr 2026 19:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ausil.us; s=google; t=1775875670; x=1776480470; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KWb3wq+tLz2SXSLe84zxMiTa2uE6dgIP0LkrcchIYxY=; b=jt1U4aiuZ4e7Cup7dg3m6Dzfowyw4Zu/JnxWk8PmMujYzhHbDRMJx5wkTRoQuN5lcI EtM4+tjYEbf0p+rCPeyWDFPLGyFWXW5lo28MzarjfsUObz/NtbG9eWw6ESK61R9Ytl4D 64cb3biaLF/lIW72okMMTD2vvkrkvnKEHoewRd1QB32n/CepE0QhGWxcQ4y/vIFgYz7c fSmw0V+Oo0HlDQdYOeGdC38XGgmFIzagWfSlHrvemmMQh5Yg4q6Ptcyppbs9q3xT1bfc SlxAQTYOW9R4fP2ni/nfauqDyJrR8hosIa9Aa4p0XcAVDdMeUYiiCG7KNcs7+gycdJQs 5qSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775875670; x=1776480470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KWb3wq+tLz2SXSLe84zxMiTa2uE6dgIP0LkrcchIYxY=; b=PBTQRieQtw/dkx3n9nYmAAkpNIF2EUiPp5C8Yc0BrBxWJ5dYihRt91jyOkmoGLEshC 84hHevTvyT7Y3pC0r8Wb3KYTqZJXpDe0WheBTB1QOb4Xv5Y1J5wxm7y1LR9ePLSKYViZ 9nnR8wzisM6ScN+2GPhZ+xATwWYh/a8OD3kedkv4DAgrv+bZ0t5hmH2ucVmquvZ/oNmo dcZ+Kj8oKZGwKhh8reee9K1VDVeEYSlU2wUMPC6Y8KrT0CyH+s2IM0UmuQ6Dfu4WaoP/ DwWyMpSaa4hxNdXNgVeTcxe+MfIALNzk1KPkjViu6Dobh1NTVHhzOIfWvaVXxrJzD1E/ 4eFg== X-Forwarded-Encrypted: i=1; AJvYcCV8mohWUeG535hZgzIrcvhQBJXFbmmPEtCrDjQ3hdpRk8qGQxJsIeVqL7yDFLoHf9jFsOm3BLTHi1WjtBU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywkrh0ur1I/5WCLcjJIa4P3DV1UGxV0CQFvZHxwLXTXSKD4zun4 0bs4mdENBjBK0FiqqrsoOulYurz16wUIKNhK2M5k0jNLK0BGgaT5kDQ5C9UCtRbXk/lq/1NOIJh D+gk7cGwXdL8RaWaniZvQlPfVoqc+jmGGRdDj X-Gm-Gg: AeBDies41FaEe8mvxQXA3uacZ92I1ZyALm7NNMQ2km6AuMYl4sk3pdwSn0OoXU+OXOv 7lUsEZ3ehAcbZdCFmuoNmSR8sqdplg3onloqyVo0vCN42+EO/20H5fPvID74/B66ZRES+lpe6sa 1wiOfqelAUjGVNRpqkP2Vskf9v+WxM1AmHKA8PrPWMDECdWNPMt/nOPjJazjZ6p8EduDtieBVFb iT+V6a+lwfA8IDAVzBKEiHjPv45z8IP/4Q/ZW14/iahTNb9mbg/syWgeQtBjbbUEr5qeKEOqqKK H4+WpPanpkn5NAIdV15cjXymHt7PWXiNt4DHrl6CVZQJoZLKEUSNaZKvY0gV+m2T1OrCjLN4i74 1+WVKAubXNnAsErV11cjmvR0qEBsMCQcT4m+Xi8GOphJw X-Received: by 2002:a05:6820:7513:b0:682:47e0:5d4e with SMTP id 006d021491bc7-68a68d5f842mr3068714eaf.14.1775875670052; Fri, 10 Apr 2026 19:47:50 -0700 (PDT) Received: from ryac.ausil.us (207-179-239-100.mtco.net. [207.179.239.100]) by smtp-relay.gmail.com with ESMTPS id 586e51a60fabf-423ddd32ab3sm599086fac.16.2026.04.10.19.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 19:47:50 -0700 (PDT) X-Relaying-Domain: ausil.us From: dennis@ausil.us To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: FUKAUMI Naoki , Hsun Lai , Jonas Karlman , Chaoyi Chen , John Clark , Michael Opdenacker , Quentin Schulz , Andrew Lunn , Chukun Pan , Alexey Charkov , Peter Robinson , Dennis Gilmore , Michael Riesch , Mykola Kvach , Jimmy Hon , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/3] arm64: dts: rockchip: refactor items from Orange Pi 5/b to prep for Pro Date: Fri, 10 Apr 2026 21:47:42 -0500 Message-ID: <20260411024743.195385-3-dennis@ausil.us> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260411024743.195385-1-dennis@ausil.us> References: <20260411024743.195385-1-dennis@ausil.us> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dennis Gilmore The Orange Pi 5 Pro uses the same SoC and base as the Orange Pi 5 and Orange Pi 5B but has had sound, USB, and leds wired up differently. The boards also use gmac for ethernet where the Pro has a PCIe attached NIC. I have not changed the definitions from what was in rk3588s-orangepi-5.dtsi Signed-off-by: Dennis Gilmore Reviewed-By: Jimmy Hon Tested-By: Jimmy Hon --- .../dts/rockchip/rk3588s-orangepi-5-5b.dtsi | 192 +++++++++++++++++ .../boot/dts/rockchip/rk3588s-orangepi-5.dts | 6 +- .../boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 198 +----------------- .../boot/dts/rockchip/rk3588s-orangepi-5b.dts | 2 +- 4 files changed, 209 insertions(+), 189 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi b/arch= /arm64/boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi new file mode 100644 index 000000000000..b04dd667605d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi @@ -0,0 +1,192 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device tree definitions shared by the Orange Pi 5 and Orange Pi 5B + * but not the Orange Pi 5 Pro. + */ + +#include +#include "rk3588s-orangepi-5.dtsi" + +/ { + aliases { + ethernet0 =3D &gmac1; + }; + + analog-sound { + compatible =3D "simple-audio-card"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&hp_detect>; + simple-audio-card,name =3D "rockchip,es8388"; + simple-audio-card,bitclock-master =3D <&masterdai>; + simple-audio-card,format =3D "i2s"; + simple-audio-card,frame-master =3D <&masterdai>; + simple-audio-card,hp-det-gpios =3D <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; + simple-audio-card,mclk-fs =3D <256>; + simple-audio-card,routing =3D + "Headphones", "LOUT1", + "Headphones", "ROUT1", + "LINPUT1", "Microphone Jack", + "RINPUT1", "Microphone Jack", + "LINPUT2", "Onboard Microphone", + "RINPUT2", "Onboard Microphone"; + simple-audio-card,widgets =3D + "Microphone", "Microphone Jack", + "Microphone", "Onboard Microphone", + "Headphone", "Headphones"; + + simple-audio-card,cpu { + sound-dai =3D <&i2s1_8ch>; + }; + + masterdai: simple-audio-card,codec { + sound-dai =3D <&es8388>; + system-clock-frequency =3D <12288000>; + }; + }; + + pwm-leds { + compatible =3D "pwm-leds"; + + led { + color =3D ; + function =3D LED_FUNCTION_STATUS; + linux,default-trigger =3D "heartbeat"; + max-brightness =3D <255>; + pwms =3D <&pwm0 0 25000 0>; + }; + }; +}; + +&gmac1 { + clock_in_out =3D "output"; + phy-handle =3D <&rgmii_phy1>; + phy-mode =3D "rgmii-rxid"; + pinctrl-0 =3D <&gmac1_miim + &gmac1_tx_bus2 + &gmac1_rx_bus2 + &gmac1_rgmii_clk + &gmac1_rgmii_bus>; + pinctrl-names =3D "default"; + tx_delay =3D <0x42>; + status =3D "okay"; +}; + +&i2c6 { + es8388: audio-codec@10 { + compatible =3D "everest,es8388", "everest,es8328"; + reg =3D <0x10>; + clocks =3D <&cru I2S1_8CH_MCLKOUT>; + AVDD-supply =3D <&vcc_3v3_s0>; + DVDD-supply =3D <&vcc_1v8_s0>; + HPVDD-supply =3D <&vcc_3v3_s0>; + PVDD-supply =3D <&vcc_3v3_s0>; + assigned-clocks =3D <&cru I2S1_8CH_MCLKOUT>; + assigned-clock-rates =3D <12288000>; + #sound-dai-cells =3D <0>; + }; + + usbc0: usb-typec@22 { + compatible =3D "fcs,fusb302"; + reg =3D <0x22>; + interrupt-parent =3D <&gpio0>; + interrupts =3D ; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&usbc0_int>; + vbus-supply =3D <&vbus_typec>; + status =3D "okay"; + + usb_con: connector { + compatible =3D "usb-c-connector"; + label =3D "USB-C"; + data-role =3D "dual"; + op-sink-microwatt =3D <1000000>; + power-role =3D "dual"; + sink-pdos =3D + ; + source-pdos =3D + ; + try-power-role =3D "source"; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + reg =3D <0>; + usbc0_hs: endpoint { + remote-endpoint =3D <&usb_host0_xhci_drd_sw>; + }; + }; + + port@1 { + reg =3D <1>; + usbc0_ss: endpoint { + remote-endpoint =3D <&usbdp_phy0_typec_ss>; + }; + }; + + port@2 { + reg =3D <2>; + usbc0_sbu: endpoint { + remote-endpoint =3D <&usbdp_phy0_typec_sbu>; + }; + }; + }; + }; + }; +}; + +&i2s1_8ch { + rockchip,i2s-tx-route =3D <3 2 1 0>; + rockchip,i2s-rx-route =3D <1 3 2 0>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2s1m0_sclk + &i2s1m0_mclk + &i2s1m0_lrck + &i2s1m0_sdi1 + &i2s1m0_sdo3>; + status =3D "okay"; +}; + +&pwm0 { + pinctrl-0 =3D <&pwm0m2_pins>; + pinctrl-names =3D "default"; + status =3D "okay"; +}; + +&usb_host0_xhci { + dr_mode =3D "otg"; + usb-role-switch; + + port { + usb_host0_xhci_drd_sw: endpoint { + remote-endpoint =3D <&usbc0_hs>; + }; + }; +}; + +&usb_host2_xhci { + status =3D "okay"; +}; + +&usbdp_phy0 { + mode-switch; + orientation-switch; + sbu1-dc-gpios =3D <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; + sbu2-dc-gpios =3D <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; + + port { + #address-cells =3D <1>; + #size-cells =3D <0>; + + usbdp_phy0_typec_ss: endpoint@0 { + reg =3D <0>; + remote-endpoint =3D <&usbc0_ss>; + }; + + usbdp_phy0_typec_sbu: endpoint@1 { + reg =3D <1>; + remote-endpoint =3D <&usbc0_sbu>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm= 64/boot/dts/rockchip/rk3588s-orangepi-5.dts index 83b9b6645a1e..d76bdf1b5e90 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts @@ -2,12 +2,16 @@ =20 /dts-v1/; =20 -#include "rk3588s-orangepi-5.dtsi" +#include "rk3588s-orangepi-5-5b.dtsi" =20 / { model =3D "Xunlong Orange Pi 5"; compatible =3D "xunlong,orangepi-5", "rockchip,rk3588s"; =20 + aliases { + mmc0 =3D &sdmmc; + }; + vcc3v3_pcie20: regulator-vcc3v3-pcie20 { compatible =3D "regulator-fixed"; enable-active-high; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi b/arch/ar= m64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi index dafad29f9854..5c154cc6c62a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi @@ -3,19 +3,13 @@ /dts-v1/; =20 #include -#include #include +#include #include #include -#include #include "rk3588s.dtsi" =20 / { - aliases { - ethernet0 =3D &gmac1; - mmc0 =3D &sdmmc; - }; - chosen { stdout-path =3D "serial2:1500000n8"; }; @@ -34,38 +28,6 @@ button-recovery { }; }; =20 - analog-sound { - compatible =3D "simple-audio-card"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&hp_detect>; - simple-audio-card,name =3D "rockchip,es8388"; - simple-audio-card,bitclock-master =3D <&masterdai>; - simple-audio-card,format =3D "i2s"; - simple-audio-card,frame-master =3D <&masterdai>; - simple-audio-card,hp-det-gpios =3D <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; - simple-audio-card,mclk-fs =3D <256>; - simple-audio-card,routing =3D - "Headphones", "LOUT1", - "Headphones", "ROUT1", - "LINPUT1", "Microphone Jack", - "RINPUT1", "Microphone Jack", - "LINPUT2", "Onboard Microphone", - "RINPUT2", "Onboard Microphone"; - simple-audio-card,widgets =3D - "Microphone", "Microphone Jack", - "Microphone", "Onboard Microphone", - "Headphone", "Headphones"; - - simple-audio-card,cpu { - sound-dai =3D <&i2s1_8ch>; - }; - - masterdai: simple-audio-card,codec { - sound-dai =3D <&es8388>; - system-clock-frequency =3D <12288000>; - }; - }; - hdmi0-con { compatible =3D "hdmi-connector"; type =3D "a"; @@ -77,18 +39,6 @@ hdmi0_con_in: endpoint { }; }; =20 - pwm-leds { - compatible =3D "pwm-leds"; - - led { - color =3D ; - function =3D LED_FUNCTION_STATUS; - linux,default-trigger =3D "heartbeat"; - max-brightness =3D <255>; - pwms =3D <&pwm0 0 25000 0>; - }; - }; - vbus_typec: regulator-vbus-typec { compatible =3D "regulator-fixed"; enable-active-high; @@ -101,15 +51,6 @@ vbus_typec: regulator-vbus-typec { vin-supply =3D <&vcc5v0_sys>; }; =20 - vcc5v0_sys: regulator-vcc5v0-sys { - compatible =3D "regulator-fixed"; - regulator-name =3D "vcc5v0_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt =3D <5000000>; - regulator-max-microvolt =3D <5000000>; - }; - vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 { compatible =3D "regulator-fixed"; gpios =3D <&gpio4 RK_PB5 GPIO_ACTIVE_LOW>; @@ -119,6 +60,15 @@ vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 { regulator-max-microvolt =3D <3300000>; vin-supply =3D <&vcc_3v3_s3>; }; + + vcc5v0_sys: regulator-vcc5v0-sys { + compatible =3D "regulator-fixed"; + regulator-name =3D "vcc5v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt =3D <5000000>; + regulator-max-microvolt =3D <5000000>; + }; }; =20 &combphy0_ps { @@ -161,20 +111,6 @@ &cpu_l3 { cpu-supply =3D <&vdd_cpu_lit_s0>; }; =20 -&gmac1 { - clock_in_out =3D "output"; - phy-handle =3D <&rgmii_phy1>; - phy-mode =3D "rgmii-rxid"; - pinctrl-0 =3D <&gmac1_miim - &gmac1_tx_bus2 - &gmac1_rx_bus2 - &gmac1_rgmii_clk - &gmac1_rgmii_bus>; - pinctrl-names =3D "default"; - tx_delay =3D <0x42>; - status =3D "okay"; -}; - &gpu { mali-supply =3D <&vdd_gpu_s0>; status =3D "okay"; @@ -270,69 +206,6 @@ &i2c6 { pinctrl-0 =3D <&i2c6m3_xfer>; status =3D "okay"; =20 - es8388: audio-codec@10 { - compatible =3D "everest,es8388", "everest,es8328"; - reg =3D <0x10>; - clocks =3D <&cru I2S1_8CH_MCLKOUT>; - AVDD-supply =3D <&vcc_3v3_s0>; - DVDD-supply =3D <&vcc_1v8_s0>; - HPVDD-supply =3D <&vcc_3v3_s0>; - PVDD-supply =3D <&vcc_3v3_s0>; - assigned-clocks =3D <&cru I2S1_8CH_MCLKOUT>; - assigned-clock-rates =3D <12288000>; - #sound-dai-cells =3D <0>; - }; - - usbc0: usb-typec@22 { - compatible =3D "fcs,fusb302"; - reg =3D <0x22>; - interrupt-parent =3D <&gpio0>; - interrupts =3D ; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&usbc0_int>; - vbus-supply =3D <&vbus_typec>; - status =3D "okay"; - - usb_con: connector { - compatible =3D "usb-c-connector"; - label =3D "USB-C"; - data-role =3D "dual"; - op-sink-microwatt =3D <1000000>; - power-role =3D "dual"; - sink-pdos =3D - ; - source-pdos =3D - ; - try-power-role =3D "source"; - - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; - - port@0 { - reg =3D <0>; - usbc0_hs: endpoint { - remote-endpoint =3D <&usb_host0_xhci_drd_sw>; - }; - }; - - port@1 { - reg =3D <1>; - usbc0_ss: endpoint { - remote-endpoint =3D <&usbdp_phy0_typec_ss>; - }; - }; - - port@2 { - reg =3D <2>; - usbc0_sbu: endpoint { - remote-endpoint =3D <&usbdp_phy0_typec_sbu>; - }; - }; - }; - }; - }; - hym8563: rtc@51 { compatible =3D "haoyu,hym8563"; reg =3D <0x51>; @@ -346,18 +219,6 @@ hym8563: rtc@51 { }; }; =20 -&i2s1_8ch { - rockchip,i2s-tx-route =3D <3 2 1 0>; - rockchip,i2s-rx-route =3D <1 3 2 0>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2s1m0_sclk - &i2s1m0_mclk - &i2s1m0_lrck - &i2s1m0_sdi1 - &i2s1m0_sdo3>; - status =3D "okay"; -}; - &i2s5_8ch { status =3D "okay"; }; @@ -404,12 +265,6 @@ typec5v_pwren: typec5v-pwren { }; }; =20 -&pwm0 { - pinctrl-0 =3D <&pwm0m2_pins>; - pinctrl-names =3D "default"; - status =3D "okay"; -}; - &rknn_core_0 { npu-supply =3D <&vdd_npu_s0>; sram-supply =3D <&vdd_npu_s0>; @@ -841,26 +696,7 @@ &uart2 { }; =20 &usbdp_phy0 { - mode-switch; - orientation-switch; - sbu1-dc-gpios =3D <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; - sbu2-dc-gpios =3D <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; status =3D "okay"; - - port { - #address-cells =3D <1>; - #size-cells =3D <0>; - - usbdp_phy0_typec_ss: endpoint@0 { - reg =3D <0>; - remote-endpoint =3D <&usbc0_ss>; - }; - - usbdp_phy0_typec_sbu: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&usbc0_sbu>; - }; - }; }; =20 &usb_host0_ehci { @@ -872,15 +708,7 @@ &usb_host0_ohci { }; =20 &usb_host0_xhci { - dr_mode =3D "otg"; - usb-role-switch; status =3D "okay"; - - port { - usb_host0_xhci_drd_sw: endpoint { - remote-endpoint =3D <&usbc0_hs>; - }; - }; }; =20 &usb_host1_ehci { @@ -891,7 +719,7 @@ &usb_host1_ohci { status =3D "okay"; }; =20 -&usb_host2_xhci { +&vop { status =3D "okay"; }; =20 @@ -899,10 +727,6 @@ &vop_mmu { status =3D "okay"; }; =20 -&vop { - status =3D "okay"; -}; - &vp0 { vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { reg =3D ; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts b/arch/ar= m64/boot/dts/rockchip/rk3588s-orangepi-5b.dts index d21ec320d295..8af174777809 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts @@ -2,7 +2,7 @@ =20 /dts-v1/; =20 -#include "rk3588s-orangepi-5.dtsi" +#include "rk3588s-orangepi-5-5b.dtsi" =20 / { model =3D "Xunlong Orange Pi 5B"; --=20 2.53.0 From nobody Mon Apr 13 01:05:16 2026 Received: from mail-oa1-f98.google.com (mail-oa1-f98.google.com [209.85.160.98]) (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 5E2382BE63F for ; Sat, 11 Apr 2026 02:47:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775875674; cv=none; b=im48z7AMqrG1lRlvPqOpBlYCh5EdqjRidXLBHGA/LGBheJ2ENdEh/ldHZHNYZoCvfSx9HxdcQUw1VFnL3eSvsz2k6zIpUs67QNLCJ1BmhzMYDWB6cZWuFqs1JoNsEMJTj06Kn/sYDDoeZPQXody0Cc8CaMArogjSWHAEr/fgv6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775875674; c=relaxed/simple; bh=ZcCQ6W2IMvj63jshKw/rlzeW+QEB/Bn3TOaLS02KdgY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dNeylJC5gmSpVXaISlYpHpNB9B0Bh4ng+HsO5JxQm1znqf6yxf4SFjRnWzmqIbVWD1F8WhZtwy7wqkaCngH2EQ1699xfGrsXOPCkR/wFVm7ZyRop7IEjjwSCnetekEGNv55ukcZsg3BBczegGW0odm2qiZYmg18mQak7UFYl/BU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ausil.us; spf=pass smtp.mailfrom=ausil.us; dkim=pass (2048-bit key) header.d=ausil.us header.i=@ausil.us header.b=NXMUGKCZ; arc=none smtp.client-ip=209.85.160.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ausil.us Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ausil.us Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ausil.us header.i=@ausil.us header.b="NXMUGKCZ" Received: by mail-oa1-f98.google.com with SMTP id 586e51a60fabf-4043b27ddeaso1436622fac.1 for ; Fri, 10 Apr 2026 19:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ausil.us; s=google; t=1775875671; x=1776480471; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jAyEa4z1gWAsFEu6m/B+ItGIiM/KxnkrlG9tVm7TFrE=; b=NXMUGKCZH0c5aCpb5EFXgssQ7aWMqpxpYSlbGDXOhC+Xi/vawjwwu8pvHBbZpcdKY1 8C296Z1aKluPn8UwAq6JrZNeVYmXnb+cILIT5d8uk4fDJHjx+jybl6mXOuWkmHYgF5W0 wAEjnqH3RmO8SrAz6Hjk06UJQvLCv5jLTvCZmO0uAeQ9FU3TTOFJvq6XZZvd4oakyJTs 3rulHlrerxBUzexbTX30nv3vugS2mQcqrDJpUXCm/a36tQPkPsndvNlVmLFEF3yEIMKP eaefFVCrRwHvqmwqZ9s+zJ1FzsrXKYQhQcn7iNh6NbIM4Entbc6/YPzfPSp41zqa4UQH PZgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775875671; x=1776480471; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jAyEa4z1gWAsFEu6m/B+ItGIiM/KxnkrlG9tVm7TFrE=; b=snC3zurOdgRVSvduJWxYR5s2oJ5qQks3Ya0BwYXz/ofGRjPkmTEKTEvnXByBfFzHTQ liYqTXU7j5+qzUUzTjiRW7SMg2kyhE9mC+Zw/vwzcWLr1/11UqWrY0bMBrGSr362JXcc bMhjcTwOzwWD/kZkDyp0F9Gx6Mig2r3zWH4QmD2UDbjwsTgcLtozQ2gzk1OJLbsYIste zOmAf1h0VhRVcX3lfkVYjZaSQOqJw5OGXNHK0jSYo4LC1W6Tob/p5PM6SU0dfl25D23c MVgY0lpIfb8tl3b8XhOm6ma33qj7JZSGof2Uk4TMlSKPCyZIblEiL0SrTP4xr7G/mTMU ksxA== X-Forwarded-Encrypted: i=1; AJvYcCXiuCM4/dP2a23AVVkcLw0QFLMLcEDOd8/q3O7Gmhel3ZSlcRTRcf+ktXu8p+l72Vz80BkJ/JrU035ZI9Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yyj4+vCwokq3F97X4m+mOvNaptEV5hCj5lnayPhU2K53+0jvVUf ereFemG1/rdh5GBdrnquB71OnTqlE15MMddmSaT5N+kaPpKnFTc86MdzOXwuGpsvJxHOgjrLEf+ uSQi2FW9vmLC/ZTe2cIyyu40XtZ8sPHkeVy4z X-Gm-Gg: AeBDiev314igrWKXzk/Wy/+Si7p+FE+KJ4ahCiYmnTstJWTkBye8KpoqcEm55P/8Q/c EpVFutHBtC4mMs7KykNrSGTO47x9bjdn+Taw3vVDcMO99WePYRanxjUiaOR4HMrTPNZScfZCThK sK+If2LtMlkGpGi0Ic77qHhIBIJIS7P3yOv5Nm03o8X015xBTgcKcz9cGBwG/tnz+5SVzIMCVtO Yav2ZJ5dKTKyNObJOBq40pCvE0WvAsIDQVBgrA8K+oW04+VsT8DOG9v4wN78Y5La3bvcUxE6wj9 XJ25uSu+fHzhcuiT0CGp2YwZO5mebpkPKCVfrst1xUvq23Rmh+vYkSP+08aseuZT9jCxUaScSgn d0ZIJFA9AAa8DnXneYb7hb6SmxRW1MzHBb8/cJOxTf4+q X-Received: by 2002:a05:6870:3e07:b0:417:6bc7:1e21 with SMTP id 586e51a60fabf-423e11e605cmr3050812fac.38.1775875671430; Fri, 10 Apr 2026 19:47:51 -0700 (PDT) Received: from ryac.ausil.us (207-179-239-100.mtco.net. [207.179.239.100]) by smtp-relay.gmail.com with ESMTPS id 586e51a60fabf-423ddd32ab3sm599086fac.16.2026.04.10.19.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 19:47:51 -0700 (PDT) X-Relaying-Domain: ausil.us From: dennis@ausil.us To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: FUKAUMI Naoki , Hsun Lai , Jonas Karlman , Chaoyi Chen , John Clark , Michael Opdenacker , Quentin Schulz , Andrew Lunn , Chukun Pan , Alexey Charkov , Peter Robinson , Dennis Gilmore , Michael Riesch , Mykola Kvach , Jimmy Hon , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 3/3] arm64: dts: rockchip: Add Orange Pi 5 Pro board support Date: Fri, 10 Apr 2026 21:47:43 -0500 Message-ID: <20260411024743.195385-4-dennis@ausil.us> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260411024743.195385-1-dennis@ausil.us> References: <20260411024743.195385-1-dennis@ausil.us> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dennis Gilmore Add device tree for the Xunlong Orange Pi 5 Pro (RK3588S). - eMMC module, you can optionally solder a SPI NOR in place and turn off the eMMC - PCIe-attached NIC (pcie2x1l1) - PCIe NVMe slot (pcie2x1l2) - AP6256 WiFi (BCM43456) via SDIO with mmc-pwrseq - BCM4345C5 Bluetooth - es8388 audio - USB 2.0 and USB 3.0 - Two HDMI ports, the second is connected to the SoC's DP controller driven by a transparent LT8711UXD bridge that has firmware onboard and needs no node defined. Vendors description and links to schematics available: http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/O= range-Pi-5-Pro.html Signed-off-by: Dennis Gilmore --- .../display/rockchip/rockchip,dw-dp.yaml | 7 + arch/arm64/boot/dts/rockchip/Makefile | 1 + .../dts/rockchip/rk3588s-orangepi-5-pro.dts | 352 ++++++++++++++++++ drivers/gpu/drm/bridge/synopsys/dw-dp.c | 12 + 4 files changed, 372 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw= -dp.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-d= p.yaml index 6345f0132d43..079a912d97f1 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-dp.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-dp.yaml @@ -57,6 +57,13 @@ properties: - const: i2s - const: spdif =20 + hpd-gpios: + maxItems: 1 + description: + GPIO used for hot plug detection when the controller's native HPD + input is not connected. If not specified, the controller uses its + internal HPD detection mechanism. + phys: maxItems: 1 =20 diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/ro= ckchip/Makefile index 4d384f153c13..c99dca2ae9e7 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -214,6 +214,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) +=3D rk3588s-nanopi-r6c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) +=3D rk3588s-odroid-m2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) +=3D rk3588s-orangepi-5.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) +=3D rk3588s-orangepi-5b.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) +=3D rk3588s-orangepi-5-pro.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) +=3D rk3588s-orangepi-cm5-base.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) +=3D rk3588s-radxa-cm5-io.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) +=3D rk3588s-roc-pc.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts b/arch= /arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts new file mode 100644 index 000000000000..84c83aa69f63 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts @@ -0,0 +1,352 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "rk3588s-orangepi-5.dtsi" + +/ { + model =3D "Xunlong Orange Pi 5 Pro"; + compatible =3D "xunlong,orangepi-5-pro", "rockchip,rk3588s"; + + aliases { + mmc0 =3D &sdhci; + mmc1 =3D &sdmmc; + mmc2 =3D &sdio; + }; + + dp-con { + compatible =3D "dp-connector"; + + port { + dp_con_in: endpoint { + remote-endpoint =3D <&dp0_out_con>; + }; + }; + }; + + analog-sound { + compatible =3D "simple-audio-card"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&hp_detect>; + simple-audio-card,bitclock-master =3D <&masterdai>; + simple-audio-card,format =3D "i2s"; + simple-audio-card,frame-master =3D <&masterdai>; + simple-audio-card,hp-det-gpios =3D <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; + simple-audio-card,mclk-fs =3D <256>; + simple-audio-card,name =3D "rockchip,es8388"; + simple-audio-card,routing =3D + "Headphones", "LOUT1", + "Headphones", "ROUT1", + "LINPUT1", "Microphone Jack", + "RINPUT1", "Microphone Jack", + "LINPUT2", "Onboard Microphone", + "RINPUT2", "Onboard Microphone"; + simple-audio-card,widgets =3D + "Microphone", "Microphone Jack", + "Microphone", "Onboard Microphone", + "Headphone", "Headphones"; + + simple-audio-card,cpu { + sound-dai =3D <&i2s2_2ch>; + }; + + masterdai: simple-audio-card,codec { + sound-dai =3D <&es8388>; + system-clock-frequency =3D <12288000>; + }; + }; + + pwm-leds { + compatible =3D "pwm-leds"; + + led-0 { + color =3D ; + function =3D LED_FUNCTION_STATUS; + linux,default-trigger =3D "heartbeat"; + max-brightness =3D <255>; + pwms =3D <&pwm15 0 1000000 0>; + }; + + led-1 { + color =3D ; + function =3D LED_FUNCTION_ACTIVITY; + linux,default-trigger =3D "heartbeat"; + max-brightness =3D <255>; + pwms =3D <&pwm3 0 1000000 0>; + }; + }; + + fan: pwm-fan { + compatible =3D "pwm-fan"; + #cooling-cells =3D <2>; + cooling-levels =3D <0 50 100 150 200 255>; + fan-supply =3D <&vcc5v0_sys>; + pwms =3D <&pwm2 0 20000000 0>; + }; + + vcc3v3_dp: regulator-vcc3v3-dp { + compatible =3D "regulator-fixed"; + enable-active-high; + gpios =3D <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>; + regulator-always-on; + regulator-boot-on; + regulator-max-microvolt =3D <3300000>; + regulator-min-microvolt =3D <3300000>; + regulator-name =3D "vcc3v3_dp"; + vin-supply =3D <&vcc_3v3_s3>; + }; + + vcc3v3_phy1: regulator-vcc3v3-phy1 { + compatible =3D "regulator-fixed"; + enable-active-high; + gpios =3D <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; + regulator-boot-on; + regulator-max-microvolt =3D <3300000>; + regulator-min-microvolt =3D <3300000>; + regulator-name =3D "vcc3v3_phy1"; + startup-delay-us =3D <50000>; + vin-supply =3D <&vcc_3v3_s3>; + }; + + vcc5v0_otg: regulator-vcc5v0-otg { + compatible =3D "regulator-fixed"; + enable-active-high; + gpios =3D <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&vcc5v0_otg_en>; + regulator-max-microvolt =3D <5000000>; + regulator-min-microvolt =3D <5000000>; + regulator-name =3D "vcc5v0_otg"; + vin-supply =3D <&vcc5v0_sys>; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible =3D "mmc-pwrseq-simple"; + clocks =3D <&hym8563>; + clock-names =3D "ext_clock"; + post-power-on-delay-ms =3D <200>; + reset-gpios =3D <&gpio0 RK_PD0 GPIO_ACTIVE_LOW>; + }; + + typea_con: usb-a-connector { + compatible =3D "usb-a-connector"; + data-role =3D "host"; + label =3D "USB3 Type-A"; + power-role =3D "source"; + vbus-supply =3D <&vcc5v0_otg>; + }; +}; + +&dp0 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&dp0m0_pins>; + status =3D "okay"; +}; + +&dp0_in { + dp0_in_vp1: endpoint { + remote-endpoint =3D <&vp1_out_dp0>; + }; +}; + +&dp0_out { + dp0_out_con: endpoint { + remote-endpoint =3D <&dp_con_in>; + }; +}; + +&i2c1 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c1m4_xfer>; + status =3D "okay"; +}; + +&i2c3 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c3m0_xfer>; + status =3D "okay"; + + es8388: audio-codec@11 { + compatible =3D "everest,es8388", "everest,es8328"; + reg =3D <0x11>; + #sound-dai-cells =3D <0>; + AVDD-supply =3D <&vcc_3v3_s0>; + DVDD-supply =3D <&vcc_1v8_s0>; + HPVDD-supply =3D <&vcc_3v3_s0>; + PVDD-supply =3D <&vcc_3v3_s0>; + assigned-clock-rates =3D <12288000>; + assigned-clocks =3D <&cru I2S2_2CH_MCLKOUT>; + clocks =3D <&cru I2S2_2CH_MCLKOUT>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2s2m1_mclk>; + }; +}; + +&i2c4 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c4m3_xfer>; + status =3D "okay"; +}; + +&i2s2_2ch { + pinctrl-0 =3D <&i2s2m1_lrck &i2s2m1_sclk + &i2s2m1_sdi &i2s2m1_sdo>; + status =3D "okay"; +}; + +&package_thermal { + polling-delay =3D <1000>; + + cooling-maps { + map0 { + trip =3D <&package_fan0>; + cooling-device =3D <&fan THERMAL_NO_LIMIT 1>; + }; + + map1 { + trip =3D <&package_fan1>; + cooling-device =3D <&fan 2 THERMAL_NO_LIMIT>; + }; + }; + + trips { + package_fan0: package-fan0 { + hysteresis =3D <2000>; + temperature =3D <55000>; + type =3D "active"; + }; + + package_fan1: package-fan1 { + hysteresis =3D <2000>; + temperature =3D <65000>; + type =3D "active"; + }; + }; +}; + +/* NVMe */ +&pcie2x1l1 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pcie30x1m1_1_clkreqn &pcie30x1m1_1_waken>; + reset-gpios =3D <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>; + supports-clkreq; + vpcie3v3-supply =3D <&vcc_3v3_s3>; + status =3D "okay"; +}; + +/* NIC */ +&pcie2x1l2 { + reset-gpios =3D <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply =3D <&vcc3v3_phy1>; + status =3D "okay"; +}; + +&pinctrl { + bluetooth { + bt_wake_gpio: bt-wake-pin { + rockchip,pins =3D <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_wake_host_irq: bt-wake-host-irq { + rockchip,pins =3D <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + + usb { + vcc5v0_otg_en: vcc5v0-otg-en { + rockchip,pins =3D <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + wlan { + wifi_host_wake_irq: wifi-host-wake-irq { + rockchip,pins =3D <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; +}; + +&pwm15 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pwm15m2_pins>; + status =3D "okay"; +}; + +&pwm2 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pwm2m1_pins>; + status =3D "okay"; +}; + +&pwm3 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pwm3m2_pins>; + status =3D "okay"; +}; + +&sdhci { + status =3D "okay"; +}; + +&sdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + bus-width =3D <4>; + cap-sd-highspeed; + cap-sdio-irq; + keep-power-in-suspend; + max-frequency =3D <150000000>; + mmc-pwrseq =3D <&sdio_pwrseq>; + no-mmc; + no-sd; + non-removable; + sd-uhs-sdr104; + status =3D "okay"; + + ap6256: wifi@1 { + compatible =3D "brcm,bcm43456-fmac", "brcm,bcm4329-fmac"; + reg =3D <1>; + interrupt-names =3D "host-wake"; + interrupt-parent =3D <&gpio0>; + interrupts =3D ; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&wifi_host_wake_irq>; + }; +}; + +&uart9 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&uart9m2_xfer &uart9m2_ctsn &uart9m2_rtsn>; + uart-has-rtscts; + status =3D "okay"; + + bluetooth { + compatible =3D "brcm,bcm4345c5"; + clocks =3D <&hym8563>; + clock-names =3D "lpo"; + device-wakeup-gpios =3D <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + interrupt-names =3D "host-wakeup"; + interrupt-parent =3D <&gpio0>; + interrupts =3D ; + max-speed =3D <1500000>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&bt_wake_host_irq &bt_wake_gpio>; + shutdown-gpios =3D <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>; + vbat-supply =3D <&vcc_3v3_s3>; + vddio-supply =3D <&vcc_1v8_s3>; + }; +}; + +&usb_host0_xhci { + dr_mode =3D "host"; +}; + +&usbdp_phy0 { + rockchip,dp-lane-mux =3D <0 1>; +}; + +&vp1 { + vp1_out_dp0: endpoint@a { + reg =3D ; + remote-endpoint =3D <&dp0_in_vp1>; + }; +}; diff --git a/drivers/gpu/drm/bridge/synopsys/dw-dp.c b/drivers/gpu/drm/brid= ge/synopsys/dw-dp.c index fd23ca2834b0..b58f57b69b22 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-dp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-dp.c @@ -8,6 +8,7 @@ */ #include #include +#include #include #include #include @@ -330,6 +331,8 @@ struct dw_dp { u8 pixel_mode; =20 DECLARE_BITMAP(sdp_reg_bank, SDP_REG_BANK_SIZE); + + struct gpio_desc *hpd_gpiod; }; =20 enum { @@ -481,6 +484,9 @@ static bool dw_dp_hpd_detect(struct dw_dp *dp) { u32 value; =20 + if (dp->hpd_gpiod) + return gpiod_get_value_cansleep(dp->hpd_gpiod); + regmap_read(dp->regmap, DW_DP_HPD_STATUS, &value); =20 return FIELD_GET(HPD_STATE, value) =3D=3D DW_DP_HPD_STATE_PLUG; @@ -2002,6 +2008,12 @@ struct dw_dp *dw_dp_bind(struct device *dev, struct = drm_encoder *encoder, return ERR_CAST(dp->regmap); } =20 + dp->hpd_gpiod =3D devm_gpiod_get_optional(dev, "hpd", GPIOD_IN); + if (IS_ERR(dp->hpd_gpiod)) { + dev_err_probe(dev, PTR_ERR(dp->hpd_gpiod), "failed to get hpd GPIO\n"); + return ERR_CAST(dp->hpd_gpiod); + } + dp->phy =3D devm_of_phy_get(dev, dev->of_node, NULL); if (IS_ERR(dp->phy)) { dev_err_probe(dev, PTR_ERR(dp->phy), "failed to get phy\n"); --=20 2.53.0