From patchwork Sun Dec 29 18:41:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jimmy Hon X-Patchwork-Id: 13922816 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 7C8F9E7718B for ; Sun, 29 Dec 2024 18:46:22 +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=q8RQVp/AZoX8/qz3YYIQl2OaZo/u/Iej+A+Zii+0TFQ=; b=ub4E+E5P+LQT7W HPY/q6DgYnGJD+ZyirQzrNBaSwhHIa4Rvr6WR+0OgZIzq2zq2hX/WkoSlo6uXKn7E5SZ7rR3iCxX2 CxsLqVin3+W3vYboouA7gtYHwOiYgjPjT+6j7+z+W6LbnHXib3TCkU0VPYTMWvy7BwBLgFHVW5xtB xZNp4gJni3aa0ZiCOtYlaUmlnC6k3u1XoAzTt17ZbGzkagoRw273mhHwXFS2JvV2Q50TFAETo5LL6 aWYXsJHUxQJWiMz6q7oYlmIsFPbMAKwVqxeFipVpHSQIbCey4a+9YIISjr86FUZjy+/AZv9y8GOdA uoOEJ4UAe0zjsasqylZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tRyIt-00000003lLW-0inO; Sun, 29 Dec 2024 18:46:19 +0000 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tRyGk-00000003l60-3Tmt; Sun, 29 Dec 2024 18:44:08 +0000 Received: by mail-oi1-x230.google.com with SMTP id 5614622812f47-3eb98b3b63dso1707339b6e.1; Sun, 29 Dec 2024 10:44:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735497845; x=1736102645; darn=lists.infradead.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=b8BY8QtWq5OBvIWwFBGSDYVL4Q15ZIpsskd9b5fxCg4=; b=YIJzN0FWGffalZ1wCUtm41HwKyu1pi6OlORkDn30SCdT6HKyfUgmY/inWac6JQZkay BnfnoYRMsTikB333I4tQ+Lp3GzuaebjBZqoGUmu5TZFowAMbcGAop09xJjpj+B/af2y4 346dAo1vkgjSDiU19ZC+mWm09dDAh+xWWr43GADpMTGIQzQJ4NmsozZ0bQKJCIMg567B IChJ1UFNl2KPihpvmIKbptml5jV+W89oiBvPwKUqNFhQf9smiyaAOVhAkUoieEalcoQ8 +FKh33xZ0y13GsP7ww0nm+2cshdnuNzPpRPjgmdaC9fhvVTlK+BM8gRFqFFDEfXMS4xM ClOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735497845; x=1736102645; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b8BY8QtWq5OBvIWwFBGSDYVL4Q15ZIpsskd9b5fxCg4=; b=a3Oo7tXxIs75gTtbFawYF1P7rmzxeCkAr+6qpXN56hIDU9iMtpH0Qtji92VKVcoXlI 890kHPpU5fFss0Cioo9+lRRaKDGOLwZPv2qQYPP1Xzq/8ATAcqSC4UNvLwigyiPu1N7N xtaxi9kBkA9elMjnT0xJbFNLKQitt+dDxSmV9x431o1XtIVQn6AnaVGDLWfmcIsDIxb4 FFgf9Wpxct/rcqrzdduZaK47Sf0x4jUq3P6ppe/7fh/+kNRSXYXNFvZkw1eiTC2ahuag y6W9nzIwZb3VN84ZYe7jGIV0tu0Sj6ScmQKN+HkSULz1CraAShFjBIL6qIV11J0J2fPO AiBw== X-Forwarded-Encrypted: i=1; AJvYcCU0v7D72aT8DlEnAbib0OH7pY8in6cQ/brq4UDO1VRL2ZbloYKYSdVh6e/qpT3mjqYw7Pwn1dvEs5zuO5yhejxs@lists.infradead.org, AJvYcCVlTQW8PMww2MiBLhIucSGPOH0f4o2LtoHtKiwnq3NexC7OKF2oLkZTtjODElUFsc0TQen2Zw+Zde2gWDlqo2g=@lists.infradead.org X-Gm-Message-State: AOJu0YyaZ6xyn8RB7LVk9ZmUeZP8w+ddPu9fla4E5xWjP2QNW/EmbM/d LjGaUfbvoAkgrHG4XfyLudgZ51zVGo4u8byBRtvVmT9qrGrC+EJc X-Gm-Gg: ASbGnctnDYFAh9iBJbwdpNEhd2Tm4Sf+MQp7SjCboQRBFh1EQPOMqHjIMaH4DCMarlO 7enyptnxKkA/UoHLG+9Y9CWYRq38wr0nQiPt53C1aJF4qoVo8anMX2sLRLoxphaIaYuz/r05MWd JJXFhJgPXCfpSk4dZYPQrUwBBIG6lsq3/P6vFP3/auCEWMh6C9+6Fkabvg3KQYGrEXtEjES8TJW s36C1k8iKV4G0CNJLSDzP+bb+dy8HwK6DsJmiWDTnd54l1fdplqd3a54wENQHKq X-Google-Smtp-Source: AGHT+IHkZw0kqMOWBrXK7fO7Whbx0euKOXmkX35VmE0qEcKOXJwMq+oT8i7syTfYIz1bddxcrjdjsA== X-Received: by 2002:a05:6830:6e0e:b0:71d:58df:3277 with SMTP id 46e09a7af769-720ff8f9cb5mr18197736a34.24.1735497844924; Sun, 29 Dec 2024 10:44:04 -0800 (PST) Received: from tower.cjhon.com ([2603:8081:ad00:4a:e765:a49c:5c4:1103]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-71fc97d6fafsm5515645a34.31.2024.12.29.10.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2024 10:44:03 -0800 (PST) From: Jimmy Hon To: Heiko Stuebner Cc: Ondrej Jirman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Jimmy Hon Subject: [PATCH 1/7] arm64: dts: rockchip: refactor common rk3588-orangepi-5.dtsi Date: Sun, 29 Dec 2024 12:41:26 -0600 Message-ID: <20241229184256.1870-3-honyuenkwun@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241229184256.1870-2-honyuenkwun@gmail.com> References: <20241229184256.1870-2-honyuenkwun@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241229_104406_888626_B9BB9BCC X-CRM114-Status: GOOD ( 10.52 ) 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 for Orange Pi 5 Plus/Max/Ultra and AI Max --- .../dts/rockchip/rk3588-orangepi-5-plus.dts | 833 ++---------------- ...gepi-5-plus.dts => rk3588-orangepi-5.dtsi} | 195 +--- 2 files changed, 77 insertions(+), 951 deletions(-) copy arch/arm64/boot/dts/rockchip/{rk3588-orangepi-5-plus.dts => rk3588-orangepi-5.dtsi} (80%) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts index 9f5a38b290bf..fd49a7c8a381 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -6,86 +6,15 @@ /dts-v1/; #include -#include -#include #include #include #include -#include "rk3588.dtsi" +#include "rk3588-orangepi-5.dtsi" / { model = "Xunlong Orange Pi 5 Plus"; compatible = "xunlong,orangepi-5-plus", "rockchip,rk3588"; - aliases { - mmc0 = &sdhci; - mmc1 = &sdmmc; - }; - - chosen { - stdout-path = "serial2:1500000n8"; - }; - - adc-keys-0 { - compatible = "adc-keys"; - io-channels = <&saradc 0>; - io-channel-names = "buttons"; - keyup-threshold-microvolt = <1800000>; - poll-interval = <100>; - - button-maskrom { - label = "Mask Rom"; - linux,code = ; - press-threshold-microvolt = <2000>; - }; - }; - - adc-keys-1 { - compatible = "adc-keys"; - io-channels = <&saradc 1>; - io-channel-names = "buttons"; - keyup-threshold-microvolt = <1800000>; - poll-interval = <100>; - - button-recovery { - label = "Recovery"; - linux,code = ; - press-threshold-microvolt = <2000>; - }; - }; - - speaker_amp: speaker-audio-amplifier { - compatible = "simple-audio-amplifier"; - enable-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; - sound-name-prefix = "Speaker Amp"; - }; - - headphone_amp: headphones-audio-amplifier { - compatible = "simple-audio-amplifier"; - enable-gpios = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>; - sound-name-prefix = "Headphones Amp"; - }; - - ir-receiver { - compatible = "gpio-ir-receiver"; - gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&ir_receiver_pin>; - }; - - gpio-leds { - compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&blue_led_pin>; - - led { - color = ; - function = LED_FUNCTION_INDICATOR; - function-enumerator = <1>; - gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; - }; - }; - hdmi0-con { compatible = "hdmi-connector"; type = "a"; @@ -97,24 +26,11 @@ hdmi0_con_in: endpoint { }; }; - fan: pwm-fan { - compatible = "pwm-fan"; - cooling-levels = <0 70 75 80 100>; - fan-supply = <&vcc5v0_sys>; - pwms = <&pwm3 0 50000 0>; - #cooling-cells = <2>; - }; - - pwm-leds { - compatible = "pwm-leds"; - - led { - color = ; - function = LED_FUNCTION_INDICATOR; - function-enumerator = <2>; - max-brightness = <255>; - pwms = <&pwm2 0 25000 0>; - }; + ir-receiver { + compatible = "gpio-ir-receiver"; + gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&ir_receiver_pin>; }; rfkill { @@ -123,161 +39,62 @@ rfkill { radio-type = "wlan"; shutdown-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; }; - - sound { - compatible = "simple-audio-card"; - pinctrl-names = "default"; - pinctrl-0 = <&hp_detect>; - simple-audio-card,name = "Analog"; - simple-audio-card,aux-devs = <&speaker_amp>, <&headphone_amp>; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <256>; - simple-audio-card,hp-det-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; - simple-audio-card,bitclock-master = <&daicpu>; - simple-audio-card,frame-master = <&daicpu>; - /*TODO: SARADC_IN3 is used as MIC detection / key input */ - - simple-audio-card,widgets = - "Microphone", "Onboard Microphone", - "Microphone", "Microphone Jack", - "Speaker", "Speaker", - "Headphone", "Headphones"; - - simple-audio-card,routing = - "Headphones", "LOUT1", - "Headphones", "ROUT1", - "Speaker", "LOUT2", - "Speaker", "ROUT2", - - "Headphones", "Headphones Amp OUTL", - "Headphones", "Headphones Amp OUTR", - "Headphones Amp INL", "LOUT1", - "Headphones Amp INR", "ROUT1", - - "Speaker", "Speaker Amp OUTL", - "Speaker", "Speaker Amp OUTR", - "Speaker Amp INL", "LOUT2", - "Speaker Amp INR", "ROUT2", - - /* single ended signal to LINPUT1 */ - "LINPUT1", "Microphone Jack", - "RINPUT1", "Microphone Jack", - /* differential signal */ - "LINPUT2", "Onboard Microphone", - "RINPUT2", "Onboard Microphone"; - - daicpu: simple-audio-card,cpu { - sound-dai = <&i2s0_8ch>; - system-clock-frequency = <12288000>; - }; - - daicodec: simple-audio-card,codec { - sound-dai = <&es8388>; - system-clock-frequency = <12288000>; - }; - }; - - vcc3v3_pcie30: regulator-vcc3v3-pcie30 { - compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>; - regulator-name = "vcc3v3_pcie30"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <5000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc3v3_pcie_eth: regulator-vcc3v3-pcie-eth { - compatible = "regulator-fixed"; - gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>; - regulator-name = "vcc3v3_pcie_eth"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <50000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc3v3_wf: regulator-vcc3v3-wf { - compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>; - regulator-name = "vcc3v3_wf"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <50000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc5v0_sys: regulator-vcc5v0-sys { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - - vcc5v0_usb20: regulator-vcc5v0-usb20 { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&vcc5v0_usb20_en>; - regulator-name = "vcc5v0_usb20"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v0_sys>; - }; }; -&combphy0_ps { +&speaker_amp { + enable-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; -&combphy1_ps { - status = "okay"; -}; - -&combphy2_psu { - status = "okay"; -}; - -&cpu_b0 { - cpu-supply = <&vdd_cpu_big0_s0>; +&headphone_amp { + enable-gpios = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>; }; -&cpu_b1 { - cpu-supply = <&vdd_cpu_big0_s0>; -}; - -&cpu_b2 { - cpu-supply = <&vdd_cpu_big1_s0>; -}; - -&cpu_b3 { - cpu-supply = <&vdd_cpu_big1_s0>; -}; - -&cpu_l0 { - cpu-supply = <&vdd_cpu_lit_s0>; -}; - -&cpu_l1 { - cpu-supply = <&vdd_cpu_lit_s0>; +&analog_sound { + pinctrl-names = "default"; + pinctrl-0 = <&hp_detect>; + simple-audio-card,aux-devs = <&speaker_amp>, <&headphone_amp>; + simple-audio-card,hp-det-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; + simple-audio-card,widgets = + "Microphone", "Onboard Microphone", + "Microphone", "Microphone Jack", + "Speaker", "Speaker", + "Headphone", "Headphones"; + + simple-audio-card,routing = + "Headphones", "LOUT1", + "Headphones", "ROUT1", + "Speaker", "LOUT2", + "Speaker", "ROUT2", + + "Headphones", "Headphones Amp OUTL", + "Headphones", "Headphones Amp OUTR", + "Headphones Amp INL", "LOUT1", + "Headphones Amp INR", "ROUT1", + + "Speaker", "Speaker Amp OUTL", + "Speaker", "Speaker Amp OUTR", + "Speaker Amp INL", "LOUT2", + "Speaker Amp INR", "ROUT2", + + /* single ended signal to LINPUT1 */ + "LINPUT1", "Microphone Jack", + "RINPUT1", "Microphone Jack", + /* differential signal */ + "LINPUT2", "Onboard Microphone", + "RINPUT2", "Onboard Microphone"; }; -&cpu_l2 { - cpu-supply = <&vdd_cpu_lit_s0>; +&combphy0_ps { + status = "okay"; }; -&cpu_l3 { - cpu-supply = <&vdd_cpu_lit_s0>; +&combphy1_ps { + status = "okay"; }; -&gpu { - mali-supply = <&vdd_gpu_s0>; - status = "okay"; +&fan { + pwms = <&pwm3 0 50000 0>; }; &hdmi0 { @@ -300,128 +117,20 @@ &hdptxphy_hdmi0 { status = "okay"; }; -&i2c0 { +&hym8563 { + interrupt-parent = <&gpio0>; + interrupts = ; pinctrl-names = "default"; - pinctrl-0 = <&i2c0m2_xfer>; - status = "okay"; - - vdd_cpu_big0_s0: regulator@42 { - compatible = "rockchip,rk8602"; - reg = <0x42>; - fcs,suspend-voltage-selector = <1>; - regulator-name = "vdd_cpu_big0_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <1050000>; - regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_cpu_big1_s0: regulator@43 { - compatible = "rockchip,rk8603", "rockchip,rk8602"; - reg = <0x43>; - fcs,suspend-voltage-selector = <1>; - regulator-name = "vdd_cpu_big1_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <1050000>; - regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; -}; - -&i2c6 { - clock-frequency = <400000>; - status = "okay"; - - hym8563: rtc@51 { - compatible = "haoyu,hym8563"; - reg = <0x51>; - interrupt-parent = <&gpio0>; - interrupts = ; - #clock-cells = <0>; - clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&hym8563_int>; - wakeup-source; - }; + pinctrl-0 = <&hym8563_int>; }; -&i2c7 { - status = "okay"; - - /* PLDO2 vcca 1.8V, BUCK8 gated by PLDO2 being enabled */ - es8388: audio-codec@11 { - compatible = "everest,es8388"; - reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; - AVDD-supply = <&vcc_1v8_s0>; - DVDD-supply = <&vcc_1v8_s0>; - HPVDD-supply = <&vcc_3v3_s0>; - PVDD-supply = <&vcc_3v3_s0>; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; - assigned-clock-rates = <12288000>; - #sound-dai-cells = <0>; - }; -}; - -&i2s0_8ch { - pinctrl-names = "default"; - pinctrl-0 = <&i2s0_lrck - &i2s0_mclk - &i2s0_sclk - &i2s0_sdi0 - &i2s0_sdo0>; +&led_blue_gpio { + gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; status = "okay"; }; -&i2s2_2ch { - pinctrl-names = "default"; - pinctrl-0 = <&i2s2m0_lrck - &i2s2m0_sclk - &i2s2m0_sdi - &i2s2m0_sdo>; - status = "okay"; -}; - -&package_thermal { - polling-delay = <1000>; - - cooling-maps { - map0 { - trip = <&package_fan0>; - cooling-device = <&fan THERMAL_NO_LIMIT 1>; - }; - - map1 { - trip = <&package_fan1>; - cooling-device = <&fan 2 THERMAL_NO_LIMIT>; - }; - }; - - trips { - package_fan0: package-fan0 { - temperature = <55000>; - hysteresis = <2000>; - type = "active"; - }; - - package_fan1: package-fan1 { - temperature = <65000>; - hysteresis = <2000>; - type = "active"; - }; - }; +&led_green_pwm { + pwms = <&pwm2 0 25000 0>; }; /* phy1 - M.KEY socket */ @@ -445,16 +154,6 @@ &pcie2x1l2 { status = "okay"; }; -&pcie30phy { - status = "okay"; -}; - -&pcie3x4 { - reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie30>; - status = "okay"; -}; - &pinctrl { hym8563 { hym8563_int: hym8563-int { @@ -498,405 +197,13 @@ &pwm3 { status = "okay"; }; -&saradc { - vref-supply = <&vcc_1v8_s0>; - status = "okay"; -}; - -&sdhci { - bus-width = <8>; - no-sdio; - no-sd; - non-removable; - max-frequency = <200000000>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; - status = "okay"; -}; - -&sdmmc { - bus-width = <4>; - cap-sd-highspeed; - cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; - disable-wp; - max-frequency = <150000000>; - no-sdio; - no-mmc; - sd-uhs-sdr104; - vmmc-supply = <&vcc_3v3_s3>; - vqmmc-supply = <&vccio_sd_s0>; +&recovery_button { status = "okay"; }; &sfc { pinctrl-names = "default"; pinctrl-0 = <&fspim1_pins>; - status = "okay"; - - spi_flash: flash@0 { - compatible = "jedec,spi-nor"; - reg = <0x0>; - spi-max-frequency = <100000000>; - spi-rx-bus-width = <4>; - spi-tx-bus-width = <1>; - }; -}; - -&spi2 { - assigned-clocks = <&cru CLK_SPI2>; - assigned-clock-rates = <200000000>; - num-cs = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>; - status = "okay"; - - pmic@0 { - compatible = "rockchip,rk806"; - reg = <0x0>; - interrupt-parent = <&gpio0>; - interrupts = <7 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, - <&rk806_dvs2_null>, <&rk806_dvs3_null>; - spi-max-frequency = <1000000>; - system-power-controller; - - vcc1-supply = <&vcc5v0_sys>; - vcc2-supply = <&vcc5v0_sys>; - vcc3-supply = <&vcc5v0_sys>; - vcc4-supply = <&vcc5v0_sys>; - vcc5-supply = <&vcc5v0_sys>; - vcc6-supply = <&vcc5v0_sys>; - vcc7-supply = <&vcc5v0_sys>; - vcc8-supply = <&vcc5v0_sys>; - vcc9-supply = <&vcc5v0_sys>; - vcc10-supply = <&vcc5v0_sys>; - vcc11-supply = <&vcc_2v0_pldo_s3>; - vcc12-supply = <&vcc5v0_sys>; - vcc13-supply = <&vdd2_ddr_s3>; - vcc14-supply = <&vdd2_ddr_s3>; - vcca-supply = <&vcc5v0_sys>; - - gpio-controller; - #gpio-cells = <2>; - - rk806_dvs1_null: dvs1-null-pins { - pins = "gpio_pwrctrl1"; - function = "pin_fun0"; - }; - - rk806_dvs2_null: dvs2-null-pins { - pins = "gpio_pwrctrl2"; - function = "pin_fun0"; - }; - - rk806_dvs3_null: dvs3-null-pins { - pins = "gpio_pwrctrl3"; - function = "pin_fun0"; - }; - - regulators { - vdd_gpu_s0: dcdc-reg1 { - regulator-name = "vdd_gpu_s0"; - regulator-boot-on; - regulator-enable-ramp-delay = <400>; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_cpu_lit_s0: dcdc-reg2 { - regulator-name = "vdd_cpu_lit_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_log_s0: dcdc-reg3 { - regulator-name = "vdd_log_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <675000>; - regulator-max-microvolt = <825000>; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <750000>; - }; - }; - - vdd_vdenc_s0: dcdc-reg4 { - regulator-name = "vdd_vdenc_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <825000>; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_ddr_s0: dcdc-reg5 { - regulator-name = "vdd_ddr_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <675000>; - regulator-max-microvolt = <900000>; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <850000>; - }; - }; - - vdd2_ddr_s3: dcdc-reg6 { - regulator-name = "vdd2_ddr_s3"; - regulator-always-on; - regulator-boot-on; - - regulator-state-mem { - regulator-on-in-suspend; - }; - }; - - vcc_2v0_pldo_s3: dcdc-reg7 { - regulator-name = "vdd_2v0_pldo_s3"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <2000000>; - regulator-max-microvolt = <2000000>; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <2000000>; - }; - }; - - vcc_3v3_s3: dcdc-reg8 { - regulator-name = "vcc_3v3_s3"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <3300000>; - }; - }; - - vddq_ddr_s0: dcdc-reg9 { - regulator-name = "vddq_ddr_s0"; - regulator-always-on; - regulator-boot-on; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vcc_1v8_s3: dcdc-reg10 { - regulator-name = "vcc_1v8_s3"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - avcc_1v8_s0: pldo-reg1 { - regulator-name = "avcc_1v8_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - /* shorted to avcc_1v8_s0 on the board */ - vcc_1v8_s0: pldo-reg2 { - regulator-name = "vcc_1v8_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - avdd_1v2_s0: pldo-reg3 { - regulator-name = "avdd_1v2_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vcc_3v3_s0: pldo-reg4 { - regulator-name = "vcc_3v3_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vccio_sd_s0: pldo-reg5 { - regulator-name = "vccio_sd_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-ramp-delay = <12500>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - pldo6_s3: pldo-reg6 { - regulator-name = "pldo6_s3"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - vdd_0v75_s3: nldo-reg1 { - regulator-name = "vdd_0v75_s3"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <750000>; - }; - }; - - vdd_ddr_pll_s0: nldo-reg2 { - regulator-name = "vdd_ddr_pll_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <850000>; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <850000>; - }; - }; - - avdd_0v75_s0: nldo-reg3 { - regulator-name = "avdd_0v75_s0"; - regulator-always-on; - regulator-boot-on; - /* - * The schematic mentions that actual setting - * should be 0.8375V. RK3588 datasheet specifies - * maximum as 0.825V. So we set datasheet max - * here. - */ - regulator-min-microvolt = <825000>; - regulator-max-microvolt = <825000>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_0v85_s0: nldo-reg4 { - regulator-name = "vdd_0v85_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <850000>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_0v75_s0: nldo-reg5 { - regulator-name = "vdd_0v75_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - }; - }; -}; - -&tsadc { - status = "okay"; -}; - -&u2phy2 { - status = "okay"; -}; - -&u2phy3 { - status = "okay"; -}; - -&u2phy2_host { - phy-supply = <&vcc5v0_usb20>; - status = "okay"; -}; - -&u2phy3_host { - phy-supply = <&vcc5v0_usb20>; - status = "okay"; -}; - -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; }; &uart9 { @@ -904,28 +211,18 @@ &uart9 { status = "okay"; }; -&usb_host0_ehci { - status = "okay"; +&vcc3v3_pcie_eth { + gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>; }; -&usb_host0_ohci { +&vcc3v3_wf { status = "okay"; }; -&usb_host1_ehci { - status = "okay"; -}; - -&usb_host1_ohci { - status = "okay"; -}; - -&vop_mmu { - status = "okay"; -}; - -&vop { - status = "okay"; +&vcc5v0_usb20 { + gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_usb20_en>; }; &vp0 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi similarity index 80% copy from arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts copy to arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi index 9f5a38b290bf..d72afd368d8b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi @@ -9,14 +9,10 @@ #include #include #include -#include #include #include "rk3588.dtsi" / { - model = "Xunlong Orange Pi 5 Plus"; - compatible = "xunlong,orangepi-5-plus", "rockchip,rk3588"; - aliases { mmc0 = &sdhci; mmc1 = &sdmmc; @@ -40,12 +36,13 @@ button-maskrom { }; }; - adc-keys-1 { + recovery_button: adc-keys-1 { compatible = "adc-keys"; io-channels = <&saradc 1>; io-channel-names = "buttons"; keyup-threshold-microvolt = <1800000>; poll-interval = <100>; + status = "disabled"; button-recovery { label = "Recovery"; @@ -56,44 +53,23 @@ button-recovery { speaker_amp: speaker-audio-amplifier { compatible = "simple-audio-amplifier"; - enable-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; sound-name-prefix = "Speaker Amp"; + status = "disabled"; }; headphone_amp: headphones-audio-amplifier { compatible = "simple-audio-amplifier"; - enable-gpios = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>; sound-name-prefix = "Headphones Amp"; }; - ir-receiver { - compatible = "gpio-ir-receiver"; - gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&ir_receiver_pin>; - }; - gpio-leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&blue_led_pin>; - led { + led_blue_gpio: led { color = ; function = LED_FUNCTION_INDICATOR; function-enumerator = <1>; - gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; - }; - }; - - hdmi0-con { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi0_con_in: endpoint { - remote-endpoint = <&hdmi0_out_con>; - }; + status = "disabled"; }; }; @@ -101,19 +77,17 @@ fan: pwm-fan { compatible = "pwm-fan"; cooling-levels = <0 70 75 80 100>; fan-supply = <&vcc5v0_sys>; - pwms = <&pwm3 0 50000 0>; #cooling-cells = <2>; }; pwm-leds { compatible = "pwm-leds"; - led { + led_green_pwm: led-2 { color = ; function = LED_FUNCTION_INDICATOR; function-enumerator = <2>; max-brightness = <255>; - pwms = <&pwm2 0 25000 0>; }; }; @@ -124,48 +98,15 @@ rfkill { shutdown-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; }; - sound { + analog_sound: sound { compatible = "simple-audio-card"; - pinctrl-names = "default"; - pinctrl-0 = <&hp_detect>; simple-audio-card,name = "Analog"; - simple-audio-card,aux-devs = <&speaker_amp>, <&headphone_amp>; simple-audio-card,format = "i2s"; simple-audio-card,mclk-fs = <256>; - simple-audio-card,hp-det-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>; simple-audio-card,bitclock-master = <&daicpu>; simple-audio-card,frame-master = <&daicpu>; /*TODO: SARADC_IN3 is used as MIC detection / key input */ - simple-audio-card,widgets = - "Microphone", "Onboard Microphone", - "Microphone", "Microphone Jack", - "Speaker", "Speaker", - "Headphone", "Headphones"; - - simple-audio-card,routing = - "Headphones", "LOUT1", - "Headphones", "ROUT1", - "Speaker", "LOUT2", - "Speaker", "ROUT2", - - "Headphones", "Headphones Amp OUTL", - "Headphones", "Headphones Amp OUTR", - "Headphones Amp INL", "LOUT1", - "Headphones Amp INR", "ROUT1", - - "Speaker", "Speaker Amp OUTL", - "Speaker", "Speaker Amp OUTR", - "Speaker Amp INL", "LOUT2", - "Speaker Amp INR", "ROUT2", - - /* single ended signal to LINPUT1 */ - "LINPUT1", "Microphone Jack", - "RINPUT1", "Microphone Jack", - /* differential signal */ - "LINPUT2", "Onboard Microphone", - "RINPUT2", "Onboard Microphone"; - daicpu: simple-audio-card,cpu { sound-dai = <&i2s0_8ch>; system-clock-frequency = <12288000>; @@ -190,12 +131,11 @@ vcc3v3_pcie30: regulator-vcc3v3-pcie30 { vcc3v3_pcie_eth: regulator-vcc3v3-pcie-eth { compatible = "regulator-fixed"; - gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>; regulator-name = "vcc3v3_pcie_eth"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; startup-delay-us = <50000>; - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc_3v3_s3>; }; vcc3v3_wf: regulator-vcc3v3-wf { @@ -207,6 +147,7 @@ vcc3v3_wf: regulator-vcc3v3-wf { regulator-max-microvolt = <3300000>; startup-delay-us = <50000>; vin-supply = <&vcc5v0_sys>; + status = "disabled"; }; vcc5v0_sys: regulator-vcc5v0-sys { @@ -221,9 +162,6 @@ vcc5v0_sys: regulator-vcc5v0-sys { vcc5v0_usb20: regulator-vcc5v0-usb20 { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&vcc5v0_usb20_en>; regulator-name = "vcc5v0_usb20"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -231,14 +169,6 @@ vcc5v0_usb20: regulator-vcc5v0-usb20 { }; }; -&combphy0_ps { - status = "okay"; -}; - -&combphy1_ps { - status = "okay"; -}; - &combphy2_psu { status = "okay"; }; @@ -280,26 +210,6 @@ &gpu { status = "okay"; }; -&hdmi0 { - status = "okay"; -}; - -&hdmi0_in { - hdmi0_in_vp0: endpoint { - remote-endpoint = <&vp0_out_hdmi0>; - }; -}; - -&hdmi0_out { - hdmi0_out_con: endpoint { - remote-endpoint = <&hdmi0_con_in>; - }; -}; - -&hdptxphy_hdmi0 { - status = "okay"; -}; - &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0m2_xfer>; @@ -347,12 +257,8 @@ &i2c6 { hym8563: rtc@51 { compatible = "haoyu,hym8563"; reg = <0x51>; - interrupt-parent = <&gpio0>; - interrupts = ; #clock-cells = <0>; clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&hym8563_int>; wakeup-source; }; }; @@ -365,10 +271,11 @@ es8388: audio-codec@11 { compatible = "everest,es8388"; reg = <0x11>; clocks = <&cru I2S0_8CH_MCLKOUT>; - AVDD-supply = <&vcc_1v8_s0>; + clock-names = "mclk"; + AVDD-supply = <&vcc_3v3_s0>; DVDD-supply = <&vcc_1v8_s0>; HPVDD-supply = <&vcc_3v3_s0>; - PVDD-supply = <&vcc_3v3_s0>; + PVDD-supply = <&vcc_1v8_s0>; assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; assigned-clock-rates = <12288000>; #sound-dai-cells = <0>; @@ -424,27 +331,6 @@ package_fan1: package-fan1 { }; }; -/* phy1 - M.KEY socket */ -&pcie2x1l0 { - reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_wf>; - status = "okay"; -}; - -/* phy2 - right ethernet port */ -&pcie2x1l1 { - reset-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie_eth>; - status = "okay"; -}; - -/* phy0 - left ethernet port */ -&pcie2x1l2 { - reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie_eth>; - status = "okay"; -}; - &pcie30phy { status = "okay"; }; @@ -455,49 +341,6 @@ &pcie3x4 { status = "okay"; }; -&pinctrl { - hym8563 { - hym8563_int: hym8563-int { - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - leds { - blue_led_pin: blue-led { - rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - ir-receiver { - ir_receiver_pin: ir-receiver-pin { - rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - sound { - hp_detect: hp-detect { - rockchip,pins = <1 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - usb { - vcc5v0_usb20_en: vcc5v0-usb20-en { - rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; -}; - -&pwm2 { - pinctrl-0 = <&pwm2m1_pins>; - pinctrl-names = "default"; - status = "okay"; -}; - -&pwm3 { - pinctrl-0 = <&pwm3m1_pins>; - status = "okay"; -}; - &saradc { vref-supply = <&vcc_1v8_s0>; status = "okay"; @@ -529,8 +372,6 @@ &sdmmc { }; &sfc { - pinctrl-names = "default"; - pinctrl-0 = <&fspim1_pins>; status = "okay"; spi_flash: flash@0 { @@ -899,11 +740,6 @@ &uart2 { status = "okay"; }; -&uart9 { - pinctrl-0 = <&uart9m0_xfer>; - status = "okay"; -}; - &usb_host0_ehci { status = "okay"; }; @@ -927,10 +763,3 @@ &vop_mmu { &vop { status = "okay"; }; - -&vp0 { - vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { - reg = ; - remote-endpoint = <&hdmi0_in_vp0>; - }; -}; From patchwork Sun Dec 29 18:41:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jimmy Hon X-Patchwork-Id: 13922817 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 B31E2E7718B for ; Sun, 29 Dec 2024 18:47:32 +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=CLljMdoimjNOCn8P6grCxfe/0j9bXcsNSx0sGsVSIEk=; b=Ankvmtyc5RxSYz WeGGwTVMJH9VxSzifrB/qpuVLQ1SNIqDuy8uRubVzbh7XxTI4d42U/zxiHGPkvhZ46SMKzIJeXHm9 uNzRFimuxq02YUG5AGt3TbdSs33nVPcYOtOaNA/MomrA2Cyoxdg2A0jaX/YG0tbbJs80IIMOlQsT5 7CLcoEk+sxrbnG5lE2yHL8jhaivw15XEtkyxsPzk/Oh/sBLIMmHweFHzElzTbvxGauUf0/Zg5P3Zz 4UcBu8DnJ3d5pQwfOkfhw0X6uzzhgxBS/ZTR0wR0UPGreK7k+8lpJapRqskXN5A1PFG/uHZzxF7G1 6gZ+b1s+I8jGEEdjp1qg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tRyK1-00000003lW7-3BTo; Sun, 29 Dec 2024 18:47:29 +0000 Received: from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tRyGp-00000003l6N-3d1U; Sun, 29 Dec 2024 18:44:13 +0000 Received: by mail-ot1-x334.google.com with SMTP id 46e09a7af769-71e10e6a1ceso1642528a34.0; Sun, 29 Dec 2024 10:44:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735497851; x=1736102651; darn=lists.infradead.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=7zcYlsUzO0vGDNcLCnF4KdwOB7P4WtjzUTN//CHxhAU=; b=d/KD+LciyrI8SUVtpxO4mgl6xEtyyxFYCdEofkyNRfafrH+aAxgwqnVZak/oC3RCre ynYRTqJumZ4outfY+Gn/G+AqZLvMt6HZP8ZBZ0BlP2ELz6UHKqCSD0IiYm8/VpVu3ZJ2 a4iH8Mrul1MONP3/YPYaZ3GCVUDKigzWbkzNfCfjPQYuTBRMgQSyHVJPIRoB/ikkHoOy cx2NgUy3PQYD9qTFQGLVx6U0RX6j3lCuq05w248EJyGeDtK6OMAfH6cKccoWJYfLti5N NDGeinz1N9Rfh6opMiLi3cSOK0sKBRGUSnb9S8PMGdKgGmRd2+MnVUpZm5S2Ix8yaq6+ Ob3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735497851; x=1736102651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7zcYlsUzO0vGDNcLCnF4KdwOB7P4WtjzUTN//CHxhAU=; b=grkmt92/2BxDjbDXrFUrPpUQ/di2pHFoSd5Irw6SKaWvVuZiEz6utfRZlFhV0qp1UR ysK6lR4C/Ip6mayCFIXJR0nGns5sjvvAFepaHe6nf3LKTcf1nQbsyk9jebmTg3aarO+w 7i2NENPYG0xEYKt3cL8CelivicUGLYyUiuK4MSvtWAz1VV2IAWzFB6WrVmN4XLfNhksY IGL0eQyYMrdoEUkPV7hCgOc2kJwilR4dw5UadoyrCDXxM6L8Rs1lFd4NF/vhKs9OwfCf DzJPxVkobCU4ODTuNIjAUskN+ULq8Z7HxYUesopEKUUNTrW6LwGg41CCqSehSkkWFsKX iNGg== X-Forwarded-Encrypted: i=1; AJvYcCVG+wre72tlD6IiBPX7ke5YlKGVs7QuVqJqaCg/JMTVcjxcmP+q8ULOyRs25JOGo63mDKhAzBpDZwxiNjWxW8e4@lists.infradead.org, AJvYcCWhMOEXKtTbHBKoYMhYcPZ4k4CsFdLhCfpyUvI3w5gXrHXPraVIr3op3sa/Y1z90TAsMpkwewU7cHV+ZSWptME=@lists.infradead.org X-Gm-Message-State: AOJu0YzihVa0G0Ys5E3FxUBq1y1JNga/lRDBs6N5J1PzXJLtCMoRyMye 9a7Uq5L86zNT6OCcz6duihNFfes/xQWpSskf6WE5V2U12kaD7dN+ X-Gm-Gg: ASbGncvwdgRgf3GI1jUCyEJS89v7LpfXZqPQ58sueyweCqSzXgXNlbg5j5WXsn4YH5g lelCmmRxkVv534boDJtvhspTybblfw48mVZgQGqBGf0Ol0ev+Hm+x1E/LwzBBfeVHcbwLZ8D4TR 9WUtM5NWjngYmGgh/1IF0Bdf1wzwI06c4elLHhg8sOw8BAT3dRRKxA6mofxZh213HnHexiex21c B7t94qUdKqmIw5t3+sy+i0IEO2fCSWpHAnytzHOhlbpoCaO6yaAxEcqHtkoGkMr X-Google-Smtp-Source: AGHT+IHcOvw4X/mURfyMbYbaw9HI7UAEZMSk8SYcZJoXJXIdCfuyH++j/uv2ZWP/3V4lKKq1MCLQ4w== X-Received: by 2002:a05:6830:4422:b0:718:123e:922d with SMTP id 46e09a7af769-720ff801918mr17728569a34.18.1735497851231; Sun, 29 Dec 2024 10:44:11 -0800 (PST) Received: from tower.cjhon.com ([2603:8081:ad00:4a:e765:a49c:5c4:1103]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-71fc97d6fafsm5515645a34.31.2024.12.29.10.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2024 10:44:10 -0800 (PST) From: Jimmy Hon To: Heiko Stuebner Cc: Ondrej Jirman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Jimmy Hon , Conor Dooley , Krzysztof Kozlowski Subject: [PATCH 2/7] dt-bindings: arm: rockchip: Add Xunlong Orange Pi 5 Max Date: Sun, 29 Dec 2024 12:41:27 -0600 Message-ID: <20241229184256.1870-4-honyuenkwun@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241229184256.1870-2-honyuenkwun@gmail.com> References: <20241229184256.1870-2-honyuenkwun@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241229_104411_900831_668C0B54 X-CRM114-Status: UNSURE ( 9.34 ) X-CRM114-Notice: Please train this message. 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 devicetree binding for the Xunlong Orange Pi 5 Max board. The Orange Pi 5 Max is a single board computer powered by the Rockchip RK3588 similar to the Orange Pi 5 Plus. Acked-by: Conor Dooley Acked-by: Krzysztof Kozlowski Signed-off-by: Jimmy Hon --- Documentation/devicetree/bindings/arm/rockchip.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 753199a12923..2a141d99c533 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -1075,9 +1075,11 @@ properties: - const: xunlong,orangepi-3b - const: rockchip,rk3566 - - description: Xunlong Orange Pi 5 Plus + - description: Xunlong Orange Pi 5 Max/Plus items: - - const: xunlong,orangepi-5-plus + - enum: + - xunlong,orangepi-5-max + - xunlong,orangepi-5-plus - const: rockchip,rk3588 - description: Xunlong Orange Pi R1 Plus / LTS From patchwork Sun Dec 29 18:41:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jimmy Hon X-Patchwork-Id: 13922818 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 0B1C9E7718B for ; Sun, 29 Dec 2024 18:48:43 +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=e1dFM4J6M2/Vioe6xFYCHa+y4Dv8TNdwZR6QLit2EVw=; b=Sd5H1K3CZwsHdN YGjtCd6pmZ8AuT2kdevUkUcb16SqCMIOVjhz9DRpGzjbYXVlmzrFKz24XQkl9WKo8ahp7J9bgwvmA cpDcW9IhnE0SuPQYg/p/gAUN1xEZLM3wTieQGFMtkd3ZgzJ82S2jqA5yypII1J4AvCne0DT6z8jQL rfw5meFbWqMh15FtRs+2mLD9xVCxlODN2rOaq1Vc4Slkc0fqxhwtirzGRm9Rj2X22+rKE4R7NRDPH lgR0wv4OD0Ph4CNQV8ZnzP3tGYFHA3U4gTxT0JQlXMXPEgER2OJg9hAvodOdxb4YZsnxnKuZ9Pgzg xD7i7VlpxiD127ORSdow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tRyL9-00000003lea-3bTj; Sun, 29 Dec 2024 18:48:39 +0000 Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tRyH1-00000003l7j-1wLo; Sun, 29 Dec 2024 18:44:24 +0000 Received: by mail-oi1-x22e.google.com with SMTP id 5614622812f47-3ebb1652729so4684848b6e.3; Sun, 29 Dec 2024 10:44:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735497862; x=1736102662; darn=lists.infradead.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=KEKvlrGBfQ3i/toVzOy0uGRkS1fjYIOhUZvv0D44E2Q=; b=mH6NlFFW9tL0K8gUmiFcLSScpjlUtukftqvjdKxLg9RCKhrh89rS8jqCayPTTaI/QA PLqGbMlpiK11yxmW/DgbMrJIzOwgceAgke3G3+5iN/r9+XjfEKPxrfYy7mUT0a7qGhbm hATnAmKQ1abD3mAOJJ6qyE1LKpPJ8Cd8+IscKXHMS4bH+T+UiAXvmzoN/S+of3vtY81G B6icv7jXPS7mChOk4GdRPtyHhYIBGiFzbD9lis6IieFYnlIx8uqSIRj/5nUuLUFPu3Sm heN8v5LRJ5WZAuA8e3gD75SWtp1cBHzdMj8yPkK1JVdeEWdygOZjn2uT16J3c9GyXynp 2Zrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735497862; x=1736102662; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KEKvlrGBfQ3i/toVzOy0uGRkS1fjYIOhUZvv0D44E2Q=; b=uSMjHZwNcxQm1rdQIZjDVbKY4iveEfCabqgz/lDu8ZHoyn5hR+yA9dOwQuRgdwkgb5 0GtDuRObGdgopinrkIU54pkcqPjFeXQqQm7B4ScOK088WIZzzVreOvy299Cna8k81mWn i+dl36YZtF2TvmQjYFS/MI8+RjXUZoCIrHuwCIDlfDW1FBXDpVGAQ8GoOXj1crVXXTbz sZo6Z9wsxazmn49E3k0hO682bPGfrsfuxKjbiYgnR9kiaxqiRvzAXt1k+7wEkauv46rL c7KYCfXzc6KVouM3b6nOXAVHPdC4Wnr0zYX/UfP1KdNBaRhZdHhx1g2X8sy058TAikOC xE7Q== X-Forwarded-Encrypted: i=1; AJvYcCU0bTWLmzFw+mFl47lTSRoPOMTn2tDigRrPvEAL+cygGlF/qbTPvoVrHCkyB2IyC2NbyHNvTNhDGgq3jjorj/4p@lists.infradead.org, AJvYcCVPbaQa4pwSXs9eNIKRtiMY2zx3vysIs+ccI3ed8hJL4Q8LaA6sny8pyWB8vkyAB0NyUvdyNlBJOm+q81HlCQ0=@lists.infradead.org X-Gm-Message-State: AOJu0YxtQxRNi7A+K24AwntwClMvsO4yfyfk9s1JlMExXwiwHVfHyL/0 wXjwSc5vYfYq7rSvgwonzw1VPssVijdQBpwqZQupkEnbhr5osBES X-Gm-Gg: ASbGncvWmyZjDwGbiCbO3eGLIMhaTQCfuKAxqQBa2EtqQL8QZmpI3TdBTyMKnzIenjC tNO+L7uoze8BGlSMtiCJCDf1yOkzpZh/YQxnt2dOMDUQdPE9+nnLZ0On++BUPpnJwsZgufU/+XC pOC1cq67onkmWXqV6FTEyZJcHRep4Sk/tTWPT1wxT+WYM9p51qg9V9FhojOJuSF4xEL5/pWOWko tHs4m5JBtINhLunITz34Lrn+1TIcRPRR+ptWAl9uvMavEPkCReiv0XqKnShge3A X-Google-Smtp-Source: AGHT+IHXVoTWqslzerWOc8JEAEQJkAO4xaCucnBeWVbar8czJv7T/PY6AFVfzy0KwQ2g7QYNMUjZ9g== X-Received: by 2002:a05:6870:ff84:b0:2a3:be8a:eebb with SMTP id 586e51a60fabf-2a7fb54149bmr18739636fac.35.1735497862315; Sun, 29 Dec 2024 10:44:22 -0800 (PST) Received: from tower.cjhon.com ([2603:8081:ad00:4a:e765:a49c:5c4:1103]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-71fc97d6fafsm5515645a34.31.2024.12.29.10.44.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2024 10:44:21 -0800 (PST) From: Jimmy Hon To: Heiko Stuebner Cc: Ondrej Jirman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Jimmy Hon Subject: [PATCH 3/7] arm64: dts: rockchip: Add Orange Pi 5 Max board Date: Sun, 29 Dec 2024 12:41:28 -0600 Message-ID: <20241229184256.1870-5-honyuenkwun@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241229184256.1870-2-honyuenkwun@gmail.com> References: <20241229184256.1870-2-honyuenkwun@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241229_104423_504604_17E2F14E X-CRM114-Status: GOOD ( 16.40 ) 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 The RK3588 Single Board Computer includes - eMMC - microSD - UART - 2 PWM LEDs - RTC - RTL8125 network controller on PCIe 2.0x1. - M.2 M-key connector routed to PCIe 3.0x4 - PWM controlled heat sink fan. - 2 USB2 ports - lower USB3 port - upper USB3 port with OTG capability - Mali GPU - SPI NOR flash - Mask Rom button - Analog audio using es8388 codec via the headset jack and onboard mic - HDMI0 the vcc5v0_usb30 regulator shares the same enable gpio pin as the vcc5v0_usb20 regulator. The Orange Pi 5 Max and Orange Pi 5 Ultra are both credit-card sized boards with similar layout. The 5 Max has an extra HDMI0 while the 5 Ultra has a HDMI IN instead. Signed-off-by: Jimmy Hon --- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../rockchip/rk3588-orangepi-5-compact.dtsi | 126 ++++++++++++++++++ .../dts/rockchip/rk3588-orangepi-5-max.dts | 60 +++++++++ .../boot/dts/rockchip/rk3588-orangepi-5.dtsi | 8 ++ 4 files changed, 195 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-compact.dtsi create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 86cc418a2255..83ad11650f0b 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -142,6 +142,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-jaguar.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-lts.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-ok3588-c.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-max.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-quartzpro64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5-itx.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-compact.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-compact.dtsi new file mode 100644 index 000000000000..205130a3efec --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-compact.dtsi @@ -0,0 +1,126 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include +#include +#include "rk3588-orangepi-5.dtsi" + +/ { + model = "Xunlong Orange Pi 5 Max"; + compatible = "xunlong,orangepi-5-max", "rockchip,rk3588"; +}; + +&headphone_amp { + /* PHONE_CTL */ + enable-gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; +}; + +&analog_sound { + pinctrl-names = "default"; + pinctrl-0 = <&hp_detect>; + simple-audio-card,aux-devs = <&headphone_amp>; + simple-audio-card,hp-det-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; + + simple-audio-card,routing = + "Headphones", "LOUT1", + "Headphones", "ROUT1", + "LINPUT1", "Microphone Jack", + "RINPUT1", "Microphone Jack", + "LINPUT2", "Onboard Microphone", + "RINPUT2", "Onboard Microphone"; + simple-audio-card,widgets = + "Microphone", "Microphone Jack", + "Microphone", "Onboard Microphone", + "Headphone", "Headphones"; +}; + +&fan { + /* FAN_CTL_H */ + pwms = <&pwm9 0 50000 0>; +}; + +&hym8563 { + interrupt-parent = <&gpio0>; + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&rtc_int_l>; +}; + +&led_blue_pwm { + /* PWM_LED1 */ + pwms = <&pwm4 0 25000 0>; + status = "okay"; +}; + +&led_green_pwm { + /* PWM_LED2 */ + pwms = <&pwm5 0 25000 0>; +}; + +/* phy2 */ +&pcie2x1l1 { + reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc3v3_pcie_eth>; + status = "okay"; +}; + +&pinctrl { + hym8563 { + rtc_int_l: hym8563-int { + rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + sound { + hp_detect: hp-detect { + rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + + usb { + usb_host_pwren: usb-host-pwren { + rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&pwm4 { + pinctrl-names = "default"; + pinctrl-0 = <&pwm4m0_pins>; + status = "okay"; +}; + +&pwm5 { + pinctrl-names = "default"; + pinctrl-0 = <&pwm5m1_pins>; + status = "okay"; +}; + +&pwm9 { + pinctrl-names = "default"; + pinctrl-0 = <&pwm9m2_pins>; + status = "okay"; +}; + +&sfc { + pinctrl-names = "default"; + pinctrl-0 = <&fspim2_pins>; +}; + +/* pcie eth. not a real regulator. 33VAUX */ +&vcc3v3_pcie_eth { + /* Ethernet_power_en */ + gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>; +}; + +/* + * Represents the vcc5v0_usb20 and vcc5v0_usb30 in the schematic, + * both regulators share the same enable gpio + */ +&vcc5v0_usb20 { + /* USB_HOST_PWREN */ + gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_host_pwren>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts new file mode 100644 index 000000000000..ce44549babf4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include +#include +#include +#include "rk3588-orangepi-5-compact.dtsi" + +/ { + model = "Xunlong Orange Pi 5 Max"; + compatible = "xunlong,orangepi-5-max", "rockchip,rk3588"; + + hdmi0-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi0_con_in: endpoint { + remote-endpoint = <&hdmi0_out_con>; + }; + }; + }; +}; + +&hdmi0 { + status = "okay"; +}; + +&hdmi0_in { + hdmi0_in_vp0: endpoint { + remote-endpoint = <&vp0_out_hdmi0>; + }; +}; + +&hdmi0_out { + hdmi0_out_con: endpoint { + remote-endpoint = <&hdmi0_con_in>; + }; +}; + +&hdptxphy_hdmi0 { + status = "okay"; +}; + +&pinctrl { + + usb { + usb_otg_pwren: usb-otg-pwren { + rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&vp0 { + vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + reg = ; + remote-endpoint = <&hdmi0_in_vp0>; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi index d72afd368d8b..df9b0fd18e24 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi @@ -83,6 +83,14 @@ fan: pwm-fan { pwm-leds { compatible = "pwm-leds"; + led_blue_pwm: led-1 { + color = ; + function = LED_FUNCTION_STATUS; + linux,default-trigger = "heartbeat"; + max-brightness = <255>; + status = "disabled"; + }; + led_green_pwm: led-2 { color = ; function = LED_FUNCTION_INDICATOR; From patchwork Sun Dec 29 18:41:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jimmy Hon X-Patchwork-Id: 13922824 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 BE4B8E7718B for ; Sun, 29 Dec 2024 18:49:52 +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=F+2il5kpqQe7IJ7uY4gqAkBaO8/1K5WaFgPwO1Iywf0=; b=eseJRbVoiEP8Sw wbUTELO2TJIfAE+B/Lf+lyRKmnDU3nnRfoTKfhBct+tgtQBWK19RLrOmbAtiqUB9ea+XYyAK6jTgB 4SXCC0E33JfOhoE1Lizk5H88Rdbn55Yn1NeJC/DqVGHls81U/IoTz3rrdEADKggY/UeC9NEgUs1e+ oq3n/FFoxPIdMyThBWxU3CGlhfnRAlprvB4EdCKTf5xbVXi84Y+5NR8/fU+igRS8UeWB7AsXSHBzQ LyhYVGmFGfdn2LIinVuFSLgryf6kpH+i37uAaZTEa74paAst+GyEMbLGdX6YCRwPXK0CqYLPbgpMg YCQgcSd3vavHIU0XSRpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tRyMH-00000003lmk-3jtO; Sun, 29 Dec 2024 18:49:49 +0000 Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tRyHY-00000003lA8-3fiB; Sun, 29 Dec 2024 18:44:57 +0000 Received: by mail-ot1-x329.google.com with SMTP id 46e09a7af769-71fbb0d035dso4582313a34.2; Sun, 29 Dec 2024 10:44:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735497896; x=1736102696; darn=lists.infradead.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=ulhKLw5+JbKqvDhRwJDvbEaKwvgTV3rkm9lX6bKO/k4=; b=jobNDCeueziZlPSBgiMtGja8RuF1f3AYE6OMdoab5Egkfx+SzStoo616v7ypky6QzI Up9vhQDChBewfznCBoOguKj7cXt2Ke/vdA2I8bZDAg7dB6PLy3Ep3SHwfPtZTHvmIEPL CgcxZttfCfxLYC/fOH3yfYMcZ0duZpH0FqGeOezoz6osPx1nl0z3Dfsi/CbI7jMeNKgZ 0Jd/hnTWll6I88MkF6IYTG39PrXI4ueP6S79jIYtQbfjOdt5MKCo44nND5CazC9pLqKH UbRvsB6S36lkATGsYFeUYf7PWikhtqALmQwF/BlhTyAmJlnG+bdHAs4fwLL/TmAcRHvC QdDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735497896; x=1736102696; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ulhKLw5+JbKqvDhRwJDvbEaKwvgTV3rkm9lX6bKO/k4=; b=M6q2M3npGpUYLkSXbeXelJnJkcU3oA/XCBulj/K0J/gelFdM2mrz8+ZDJ6G3F1xKdL ua1WTh3z4DWY5uX0AZFDsUsAKMUG6Ed/5bjO9d9wwSQaT5+coWarZQQX1qQB5OA3hPzF zUymkSWLFQ2KW26jsylS0ne+o4RFoOuPT4Wki/6YtMKIi7Hy09lyW15/DY9EueFaIAhL CZKrBlH0LX3NCEoJsH9t4uh0Zr9R+NAI/YPJzIpnZ9Mjd0L7rhoqGJH8BFEqrbbwMSGa EWrQL1Ab1eVNP0uQpl8F1NF7r3wn9oPY0P8Wfm4mFcDlSY7jpgaiGhpoEMNlXvDP5nue uw4w== X-Forwarded-Encrypted: i=1; AJvYcCUJX0BGSFysiXQT+/oavhNlad9J8WbfjCzrfdVm7907sf3AqJJR5GaH1DklzsaDFz0r+wY9gyNhaGjUzueJ2pk=@lists.infradead.org, AJvYcCXau1uzwyb1EcN0YfzVO246QHUGRbFHCWszne2apL2LH2pHVu4gEPq4GtrUbOGYsfKZ137q+DpYFMbW2OIoHJj0@lists.infradead.org X-Gm-Message-State: AOJu0Ywc4I7XbO578l4HiAliNMdqVld8RODLXFqblssSVRdVsyPiYLyJ bsd1esRCG51BCNnlDsh1HE6CvEtr3VV4UNJ0bXzK1czIHt9yK4kO X-Gm-Gg: ASbGncub2m5H8xjPPCuVuGoqLwRTECZ5aELssgmxcLC4htE2wjYmM0qh5Dcw1BjfGoO 6p1GYS3Fmkx5PWWdDOSpHB1YOVrmduNaD3PyMWGulGbLgJwfTQjFUJpD/Pzdy9arEuKKA7yBuGv pnph3psDE2ZZAAloYkmGzUVes9M2n37olGLnx196CyX06Phnv+aSueJ4ME8ogKCIS960e9pxRaX RUUT+EDla8SZxlqCk8oGqQkigoAPSoFeaeQEP9g2fduhbdFMb9IKXBuTGBhuWIP X-Google-Smtp-Source: AGHT+IG353lfPKAUO0GPTNdiBZOi3/4Y24X8g/neHVLcYZrSeT7KQ9bG0wnDvPuvP6aZoQyN2ycVig== X-Received: by 2002:a05:6830:488b:b0:718:d31:feb8 with SMTP id 46e09a7af769-720ff6c9bcbmr24007839a34.7.1735497895925; Sun, 29 Dec 2024 10:44:55 -0800 (PST) Received: from tower.cjhon.com ([2603:8081:ad00:4a:e765:a49c:5c4:1103]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-71fc97d6fafsm5515645a34.31.2024.12.29.10.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2024 10:44:54 -0800 (PST) From: Jimmy Hon To: Heiko Stuebner Cc: Ondrej Jirman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Jimmy Hon Subject: [RFC 4/7] dt-bindings: arm: rockchip: Add Xunlong Orange Pi 5 Ultra Date: Sun, 29 Dec 2024 12:41:31 -0600 Message-ID: <20241229184256.1870-8-honyuenkwun@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241229184256.1870-2-honyuenkwun@gmail.com> References: <20241229184256.1870-2-honyuenkwun@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241229_104456_911776_3570A303 X-CRM114-Status: UNSURE ( 9.49 ) X-CRM114-Notice: Please train this message. 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 devicetree binding for the Xunlong Orange Pi 5 Ultra board. The Orange Pi 5 Ultra is a single board computer powered by the Rockchip RK3588 with similar board layout as the 5 Max but with the HDMI0 swapped for HDMI IN. Signed-off-by: Jimmy Hon --- Documentation/devicetree/bindings/arm/rockchip.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 2a141d99c533..9dd424265826 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -1075,11 +1075,12 @@ properties: - const: xunlong,orangepi-3b - const: rockchip,rk3566 - - description: Xunlong Orange Pi 5 Max/Plus + - description: Xunlong Orange Pi 5 Max/Plus/Ultra items: - enum: - xunlong,orangepi-5-max - xunlong,orangepi-5-plus + - xunlong,orangepi-5-ultra - const: rockchip,rk3588 - description: Xunlong Orange Pi R1 Plus / LTS From patchwork Sun Dec 29 18:41:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jimmy Hon X-Patchwork-Id: 13922825 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 B8A5EE7718B for ; Sun, 29 Dec 2024 18:51:05 +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=TxUbhLDZOhZ4QYIAQaKoCfX/x/Kcii5HkVB9NDe8zVQ=; b=KbmTbbhPS+N/Px LSxDelAkQ++Iymmu4Hg5D3uq/cZwzPVc8UUTgnrHstd9NaV5RQba1MCQAgXIMAYRHSyad4Q3jtkg/ 5it9AgfP00mary5+WWAkZAHBukdt+v1OWoTvK24U1OdErEPBchtsVzODE0fE3VVYS8GBNEgVNzVy8 lkmZ0MExxCmCMf73T4WzXOXN7rmrXYrOY9tqIdiEKtckj+7mrrYh2YGVuMZaB40n5ed6VyRNr3NCC XLjadPR5YJ22p5ZgJgwOU4enM3C1tVrZFWyn0x7jNzUPX2F4QdyO+630Oaf9BqeBbCW53TLUQIfxH VqnIPD7gjTZTnTYWy7JQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tRyNR-00000003lwJ-00Cs; Sun, 29 Dec 2024 18:51:01 +0000 Received: from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tRyHo-00000003lCy-3U60; Sun, 29 Dec 2024 18:45:13 +0000 Received: by mail-ot1-x334.google.com with SMTP id 46e09a7af769-71e15d9629bso2193579a34.1; Sun, 29 Dec 2024 10:45:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735497912; x=1736102712; darn=lists.infradead.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=KKu1TS5Psj7hTyzCNbm0iN4cOOpfVFcu5dCXNycI6ow=; b=cWcROaASCHvxoTkgBDB3wNbC7xNgEf9X/3DmcV9e9cXWi1zaYr/X7Hf38KSKq3PAha 7+a2OVEKXGq3Ie7V0VzG+J4G+8a+JChR6w3tKZ1DVOT5z7FoNO/Fe2IzE4V25fjSJEiO RfLzaT7iQk8dFbZUrCrmf8XUHhm/BzaBMwV4wkBnrJ7zpHLHCiaCJXjYqRvG9wjVvlBy AHP/3KdsxUg5Uvycl56eHlgiuGPH4JWfGFUNK1dJpMYPOr3bsriBef0KqmJmcwhZcQ6m d1dYSCIcdg7x0TlDuUKVFLvv4qDylTNLGGfEEJUCN5FDtCLg2B9NXrGh1qvi3cfy7esz Vxyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735497912; x=1736102712; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KKu1TS5Psj7hTyzCNbm0iN4cOOpfVFcu5dCXNycI6ow=; b=W0bbZQ4MKPQ88515RpMlMm0HQR0tSJqolMA4L2HdUcPhJfgcdOMRR4Pt/bMPhd8veJ Bj792nTLy+d8tZVUUWnLx0aa6kCvpVINZ85+vx0YIpPFrKoOacea2hvOxLTkUfJ2ETTh Nz/0nfsIltvDibNxv1EGmdZNLPOn9hbJceKa4sfCxVJ/XdeXhD1p4YTGVgSjaXak/iQB 2aVNXHplpqn+G7demoKUQiOSzJImebHZKYri+5+HzFwMgqcKLbc2EzEri2Pg1Nztunxi /Gq3vPgaz2lG2je3f0XkMfXYeiy3s0HsEm6ZMlDmNREVOFqYOI02JgNDAoVbviaxQ0w8 dMGA== X-Forwarded-Encrypted: i=1; AJvYcCUje92UaN5zc8c260FNxs/CVzC6P59yIaT9flk44SvacRJ877sv5wSJnVKL+nBe+gsIYtRjzyAjT3umEMYCgeo=@lists.infradead.org, AJvYcCV6nLyCqLpghp/Np/WJ7Eu4/wjTOpBhJx4V89MFi+qZMej0sRNhJPhG86KKlnhWarjzGTiwS4g6q2gPKqjvAUTH@lists.infradead.org X-Gm-Message-State: AOJu0YwxXhYnDWYQ5e78EFnrwaqzFD4r3bTAkyq2NkLiI4eL22ZtPZuH ZL6KhjnaAMkD0gWGevm9FMhTRY7eiDCQWCRucTP9ZUaRoB9mn7iU88qYCknk X-Gm-Gg: ASbGncsjPztz+28gKf4xarE/nUlBIUUsuFCoEY264/FOK9i/UJRN0eVHt1ahAbo8uf9 UfmNOrs6kIB4ZJ0sNcEfjsQ7QBvez/7EyVnOC1SrPk1TgP9lpnKwo15CqinIqSqEhK0pSvJEbtM rq8+89p83kFWEu34hLzEZZdErmNcmhmu7rUK6rhmNjsBLDEBifX2B2k2VJG6l2ITuYlmoUUHGSr E8Kl/FwBd6FINb0hy3etTyKW73xd2W65jRNPZ3MTJcx3TXc4/3Qh4nP8xBGG2yF X-Google-Smtp-Source: AGHT+IETOyubIpNaewSb5YWblmDG49HSLncL7ygLwmf7mXu2oV9Tarb4CVAUQOoSuZ0xPYYC/d9Emw== X-Received: by 2002:a05:6830:718c:b0:71e:223c:1789 with SMTP id 46e09a7af769-720ff894f99mr22567508a34.16.1735497912149; Sun, 29 Dec 2024 10:45:12 -0800 (PST) Received: from tower.cjhon.com ([2603:8081:ad00:4a:e765:a49c:5c4:1103]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-71fc97d6fafsm5515645a34.31.2024.12.29.10.45.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2024 10:45:11 -0800 (PST) From: Jimmy Hon To: Heiko Stuebner Cc: Ondrej Jirman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Jimmy Hon Subject: [RFC 5/7] arm64: dts: rockchip: Add Orange Pi 5 Ultra board Date: Sun, 29 Dec 2024 12:41:33 -0600 Message-ID: <20241229184256.1870-10-honyuenkwun@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241229184256.1870-2-honyuenkwun@gmail.com> References: <20241229184256.1870-2-honyuenkwun@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241229_104512_887979_4781D7E6 X-CRM114-Status: GOOD ( 12.85 ) 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 The RK3588 Single Board Computer includes - eMMC - microSD - UART - 2 PWM LEDs - RTC - RTL8125 network controller on PCIe 2.0x1. - M.2 M-key connector routed to PCIe 3.0x4 - PWM controlled heat sink fan. - 2 USB2 ports - lower USB3 port - upper USB3 port with OTG capability - Mali GPU - SPI NOR flash - Mask Rom button - Analog audio using es8388 codec via the headset jack and onboard mic - HDMI1 - HDMI IN the vcc5v0_usb30 regulator shares the same enable gpio pin as the vcc5v0_usb20 regulator. Signed-off-by: Jimmy Hon --- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../dts/rockchip/rk3588-orangepi-5-ultra.dts | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-ultra.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 83ad11650f0b..7c7560b8fda3 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -144,6 +144,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-lts.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-ok3588-c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-max.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-ultra.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-quartzpro64.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5-itx.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-ultra.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-ultra.dts new file mode 100644 index 000000000000..41d8d297ce4b --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-ultra.dts @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include +#include +#include "rk3588-orangepi-5-compact.dtsi" + +/ { + model = "Xunlong Orange Pi 5 Ultra"; + compatible = "xunlong,orangepi-5-ultra", "rockchip,rk3588"; +}; + +&pinctrl { + + usb { + usb_otg_pwren: usb-otg-pwren { + rockchip,pins = <4 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; From patchwork Sun Dec 29 18:41:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jimmy Hon X-Patchwork-Id: 13922826 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 8F688E7718B for ; Sun, 29 Dec 2024 18:51:13 +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=5oCdDSBsWm4xvy4+2B47esN0OBDnRIUZdQJd18/HPlE=; b=EaJlzfdHzRHGGL sgTIe/LDthhL1CiCR+IOoDeBh3HdKx0QBMFaxx2KRG7fig+kSdaVBzheH5H398K41K4qsve0LOWIS b0bEKHYxtnimh/cRfIjGp2E94sYNF8QkC7VxE4wSUOu2nqY4nKgtNwlCObXOJxKq1fQlkhOKbNzmn IgQD+SySpy3G12E4VJn27zWwJFN6oUKmn4XAgE8/vjM804PGJSG8al9jJleF9YAB5Lylvl8v6exzb 5AWkP0sAw2tO6hWPRcpEvG5MQi0SClRJQYf09XzHvhcjmV1/hUpekauWYNZyz9hCHLinaAchFH1kX S09Mjau12L41Y0aW4mKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tRyNa-00000003lzf-49aF; Sun, 29 Dec 2024 18:51:10 +0000 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tRyHw-00000003lEF-0JH3; Sun, 29 Dec 2024 18:45:21 +0000 Received: by mail-oi1-x22a.google.com with SMTP id 5614622812f47-3eb9ba53f90so2139815b6e.1; Sun, 29 Dec 2024 10:45:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735497919; x=1736102719; darn=lists.infradead.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=xhbPOgs5hdCM6+iNzYizeI0jRjlgIwhloeZJA197DFE=; b=f+1XxlK69wWRo30vpZ2a21t4VSqHUm1gkt2MED3JJQytI7ASyDAx1wWO8YVLjmUHbW 2DLwulgG9fVIMaVzeKdWl1YDmyjRxbtEj0nviV0BuwfpGey8iugVxWwaJtS12U4PTuXL YKriPphB/puDCJ/2Zaxy8aaG14OaHnmUUcpg/XUoFHDE7h8b/7pi9jJ6yyGQjPIMYi5l 8fP3XGeBC9Dg2MUXPMDr1Xi7g4SbYgqFIlZslhcwJpV57QAr/1OxCL6XtZRfJRTK+RiN fwfU4bvrUOOISnJuG2XknJukm2b6dkgSbv3QDBOBMjgpE3gbnNWkLV32M7icx3CDlns2 68VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735497919; x=1736102719; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xhbPOgs5hdCM6+iNzYizeI0jRjlgIwhloeZJA197DFE=; b=S2VmdrqAa93ril75pKVlhzSAckNdtXph5uleA33+V/swlnsQFCs2UhsiujiBNd6s4t pUBMPlNaPV812gK21gt/51G6qKyUqJ1x+rKprcSqMP92cdinbuHvah/OAznWaEmCckyy JeO04b9TnOTe/4isFjHa7CmHgtDFyH0U6hX/nk9VCk4MhHbZNmjo9WET5Fjn+L35vfdL bhWs2RI/TwB3DpJBAvT7XgcrrXhEKmKOS6FHdCROAWcnEGgT0QxPWyOTtaDURlbem4E9 ASJa33WXMe5AlX9pV2f70TRQkj8iYKNn2r6fnP62DcqB66UGvcgEkP4j3xjJrQtWgAzW Xk3Q== X-Forwarded-Encrypted: i=1; AJvYcCUwzdSij4berI2XPmzrDhh7NWe8xYVZujvboQkTSZ+WJef0OGeUch7Q5+NUo0zUK3vR3u9J16nuitCPGzJMgs7H@lists.infradead.org, AJvYcCWXdEW3JEEZ61o/YX9P0fCxVTbFSU6mFThZ/4HmKV3TXQn+fvJEV8Mp06oWEpxg7Rrh+K5QfaVrlz+9D+xXfdI=@lists.infradead.org X-Gm-Message-State: AOJu0Yw2IRnEL9Nm5FfFTTnzR/1RWnnSn8/3MuCvgTVdHg36K5KNQKW1 n4m1r64TbGpTMnLqGL9LgsvXCWSrM9MxuiBt84Psr75zmccxPMiJitMNf0/R X-Gm-Gg: ASbGncvqsQ/NzvrJZEuT0Rq0yDu3HtBrIw71ccQXaSpecEIjvMxM5gE2C/61MTpvzDv Mb0gDXyjHLES5fN/wBK+LEBxyQCX10hIwFAM+XptVmBUbPBY1eIT5XZW9+O0oN+inub8GPdnjSV cVYlHWWl6SfB2mzJiUUheDehR2fx20Aw2l9sFS4WpX5kzKZs88czVR15UEe1MsqnPBgyxmfTTnL CzuWU/WV/BgVr3CeL7OJnj7X/teexmutT31RMImg7nOJW/BYiRowkWW0ZezMQNY X-Google-Smtp-Source: AGHT+IG5Dz6PKTeZW52qvpIKHumr7L106ymsa0PWmwxEz12ib8r4giLp1CEwxs+6Mx00o60XZ9fD4Q== X-Received: by 2002:a05:6808:1903:b0:3eb:62d4:7098 with SMTP id 5614622812f47-3ed890b15f0mr18259001b6e.37.1735497919043; Sun, 29 Dec 2024 10:45:19 -0800 (PST) Received: from tower.cjhon.com ([2603:8081:ad00:4a:e765:a49c:5c4:1103]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-71fc97d6fafsm5515645a34.31.2024.12.29.10.45.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2024 10:45:17 -0800 (PST) From: Jimmy Hon To: Heiko Stuebner Cc: Ondrej Jirman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Jimmy Hon Subject: [PATCH 6/7] arm64: dts: rockchip: Enable HDMI1 on Orange Pi 5 Max Date: Sun, 29 Dec 2024 12:41:34 -0600 Message-ID: <20241229184256.1870-11-honyuenkwun@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241229184256.1870-2-honyuenkwun@gmail.com> References: <20241229184256.1870-2-honyuenkwun@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241229_104520_129568_85E936A2 X-CRM114-Status: UNSURE ( 9.49 ) X-CRM114-Notice: Please train this message. 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 Enable the second HDMI output port on the Orange Pi 5 Max Signed-off-by: Jimmy Hon --- .../dts/rockchip/rk3588-orangepi-5-max.dts | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts index ce44549babf4..ecfbed2d0059 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts @@ -21,6 +21,17 @@ hdmi0_con_in: endpoint { }; }; }; + + hdmi1-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi1_con_in: endpoint { + remote-endpoint = <&hdmi1_out_con>; + }; + }; + }; }; &hdmi0 { @@ -39,10 +50,33 @@ hdmi0_out_con: endpoint { }; }; +&hdmi1 { + pinctrl-names = "default"; + pinctrl-0 = <&hdmim0_tx1_cec &hdmim0_tx1_hpd + &hdmim1_tx1_scl &hdmim1_tx1_sda>; + status = "okay"; +}; + +&hdmi1_in { + hdmi1_in_vp1: endpoint { + remote-endpoint = <&vp1_out_hdmi1>; + }; +}; + +&hdmi1_out { + hdmi1_out_con: endpoint { + remote-endpoint = <&hdmi1_con_in>; + }; +}; + &hdptxphy_hdmi0 { status = "okay"; }; +&hdptxphy1 { + status = "okay"; +}; + &pinctrl { usb { @@ -58,3 +92,10 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { remote-endpoint = <&hdmi0_in_vp0>; }; }; + +&vp1 { + vp1_out_hdmi1: endpoint@ROCKCHIP_VOP2_EP_HDMI1 { + reg = ; + remote-endpoint = <&hdmi1_in_vp1>; + }; +}; From patchwork Sun Dec 29 18:41:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jimmy Hon X-Patchwork-Id: 13922827 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 81FB0E7718B for ; Sun, 29 Dec 2024 18:51:25 +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=w3PD1JL4PU8zFsuOq7tmOhbrJZateSbD0nwgY337wvc=; b=cWyhFYZyyHiS3t dTAhBERFIP/jjAzkO4kvi0lxhdLHjTL69xjT+kBvOOdyYyuM4y0MeHtJ9bLmpwVyix1a4yyg41bO+ 7sQUHJB2yTBfGVWJG8AHbVrSOs106ONdy5rzISfwkEOpmwdcVDNfdehfvFCvLCwOd2s09nmljmw0E mlEI/qMDPRBbLIP4kCzquZbNR4vUBh941FP9O7YVjGkJy6r95qHcWo0X7ZMlGcTnFM4G0y1S//P5x P7QabhHmjoVwEF6yB2DQt8+IHesUecFLuDCRGjtrvB5DSE+SkiuB+6SJIeMMZ6U5xJL1Sr32krVlb ALIu1BEczNmLtAW23UAw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tRyNm-00000003m2w-1mG1; Sun, 29 Dec 2024 18:51:22 +0000 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tRyJ4-00000003lOw-1Gwj; Sun, 29 Dec 2024 18:46:31 +0000 Received: by mail-ot1-x32e.google.com with SMTP id 46e09a7af769-71e1e051e50so2056381a34.0; Sun, 29 Dec 2024 10:46:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735497989; x=1736102789; darn=lists.infradead.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=LIzqFVb8VM/Dn21FDFP1KauNhPaiLjtJM9i6mgqafNM=; b=EtWNYz3lKtwQDBOF48NTxDb/v++PM+FYwRILhfGahxHmr7GOb/WuHzXTw3rTWtb8/s 7qF4F2waidMKcgL3RJvN96879GeZ5TuEWpiY/MhlNubv9UYcITPx6/25w+zlKJSlPOYt qukddRg3+UXhOJd65dhYulW8FecR83jq5X04pqR6GBcjQsn0q93K5EGFRbLucG/N8My8 V35bBwdWSU4JqyqcdjR6xfR6rcgYanhDD7zXK1sh+qQqJh//oIrkVv8M252RF0rBAWtO kQXHWxlayTfrBIqgZVeQW7IdPvH79rqaEGvhKeRf79CZOUMyc38WYnE7+F0pTmxfL2ZO fdHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735497989; x=1736102789; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LIzqFVb8VM/Dn21FDFP1KauNhPaiLjtJM9i6mgqafNM=; b=vxhhKmFdeCLYA3c+MzY35nKy+ttRjVbxP1RWyX0cs4Grejg43ZdEZyPzIh1C6KMF6Z XZIJfhw3b8pnGPMZFc05bWR5cCaXrVaD9DkiUF24I+ZbL8M675Aq0TBRvBPR3Wy9W7eX 4tHJ2C0jgoI5A5LO8y60YPgERvx1gjauFWG9aQAaWVkfzEQ6NyzsKxg0aTtJjWUs0lhL we7lApcG7D2woFfXgQpYwUd3jkp1hZOTABKTwtGdX33qK4p7HBsXoPokL9bZF4W5U9Jp WCSj6P49yvo1AsIQcSJts14ye95QlRPKcxvkdGvKRIHN1WcPCrjdahScMcZeQx3s3M14 DHBw== X-Forwarded-Encrypted: i=1; AJvYcCWnTTV9s65jk68uSbzEEsSfkPhanfE1mu8npl4wKnFaNSvkM0emsKJ8/qo//bHir9dPqpPVRig3T7X3FK4GcP6D@lists.infradead.org, AJvYcCWsOnZ8kUBGmg2tKcJqSiDV4HCbwAYZDcAhWcT6mcrD/iMvMHJkGN0dfd1l9UA7PoOPLqy3RpKxuwxGt/TAD8Y=@lists.infradead.org X-Gm-Message-State: AOJu0Yz8sfh0NH2YITbyEemMJFKc8tTEYrVq3J2wFTrEBx8As5y2gaZQ bS+s8U+4pIkOcmHzepBUwjBNNCLs+iSzWb1jZkrSwkQ+YI4udTZ7 X-Gm-Gg: ASbGncs+mb2GMbl55axrv9OF9enyPJcEG7XkuDOWqLpH7dsfhY+9+gGtphagMEwMwif gYnyO+qSQXXppZGkBSBK986QoIAHy2IZj2TuLqfBnuS+pvOgV4PErU7d6dcG03oyer/waCLh9Kp 9pZNxxFISDhbcIUdqcuVCHcmXH9dpeRMO99PDbJbUHzWHAMB9JiYVnvne0ac2BUUsCdsNxtsAVs DyvpMS5n5mxygFJ8mAegCcbUdxDkjYI2Mko4xFvO5G99Iw9hTuA/gCIaKbLz8Kz X-Google-Smtp-Source: AGHT+IG11WX7BWv9bA87ugTxsqNhxXvFWiqNeKDLE6ZeYckYBnSyMP/5ZZfpUnS6K2hcMLs+dnuaGw== X-Received: by 2002:a05:6830:718c:b0:71e:223c:1789 with SMTP id 46e09a7af769-720ff894f99mr22569284a34.16.1735497989261; Sun, 29 Dec 2024 10:46:29 -0800 (PST) Received: from tower.cjhon.com ([2603:8081:ad00:4a:e765:a49c:5c4:1103]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-71fc97d6fafsm5515645a34.31.2024.12.29.10.46.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2024 10:46:28 -0800 (PST) From: Jimmy Hon To: Heiko Stuebner Cc: Ondrej Jirman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Jimmy Hon Subject: [PATCH UNTESTED 7/7] arm64: dts: rockchip: Enable HDMI1 on Orange Pi 5 Plus Date: Sun, 29 Dec 2024 12:41:36 -0600 Message-ID: <20241229184256.1870-13-honyuenkwun@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241229184256.1870-2-honyuenkwun@gmail.com> References: <20241229184256.1870-2-honyuenkwun@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241229_104630_393487_F1C3120B X-CRM114-Status: UNSURE ( 9.37 ) X-CRM114-Notice: Please train this message. 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 Enable the second HDMI output port on the Orange Pi 5 Plus Signed-off-by: Jimmy Hon --- .../dts/rockchip/rk3588-orangepi-5-plus.dts | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts index fd49a7c8a381..fd9252d32298 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -26,6 +26,17 @@ hdmi0_con_in: endpoint { }; }; + hdmi1-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi1_con_in: endpoint { + remote-endpoint = <&hdmi1_out_con>; + }; + }; + }; + ir-receiver { compatible = "gpio-ir-receiver"; gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_LOW>; @@ -113,10 +124,30 @@ hdmi0_out_con: endpoint { }; }; +&hdmi1 { + status = "okay"; +}; + +&hdmi1_in { + hdmi1_in_vp1: endpoint { + remote-endpoint = <&vp1_out_hdmi1>; + }; +}; + +&hdmi1_out { + hdmi1_out_con: endpoint { + remote-endpoint = <&hdmi1_con_in>; + }; +}; + &hdptxphy_hdmi0 { status = "okay"; }; +&hdptxphy1 { + status = "okay"; +}; + &hym8563 { interrupt-parent = <&gpio0>; interrupts = ; @@ -231,3 +262,10 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { remote-endpoint = <&hdmi0_in_vp0>; }; }; + +&vp1 { + vp1_out_hdmi1: endpoint@ROCKCHIP_VOP2_EP_HDMI1 { + reg = ; + remote-endpoint = <&hdmi1_in_vp1>; + }; +};