From patchwork Thu Oct 24 09:50:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cenk Uluisik X-Patchwork-Id: 13848671 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 2D71ACDDE69 for ; Thu, 24 Oct 2024 10:00:29 +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:Message-ID:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=988xRMPhXONdt5HNfGph1orrrt+WzCeNOgQsMKNmHMQ=; b=sdxoCPBAQh/h98 SGicA57OkTymkKa/jN1dOn1uz3dY+3jQterqdKA9Dz1OqF/890tRPRbyVj9Sxm9wln/8YnNoC62Qw h1edSvx+c83N+5vrbL1ZK/rbw529cQd5+CWIfJolMvtLkO9U7D56DHBzzaBXyx9GDI/LWRJ6y9VaY 8G6L3NKe9TAW5n0l8pZY7tzAruY8xG2ltP8unqH1kRCpfJtgou6KlKxDkLtsZp/SsGS8FGVQ2dBfw r0IRZ4Trr1S8GIHCZr9eWp81Hh1J5OnNkVB4vW6UYw9dqYQoKa/g3HDd+NZ4RFt55f2coZGgXmRjk o9OHjhTvxQvw3aWjnzjA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3udh-0000000HaTN-42Rv; Thu, 24 Oct 2024 10:00:21 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3uW6-0000000HYa9-100r; Thu, 24 Oct 2024 09:52:32 +0000 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-37d4c1b1455so457130f8f.3; Thu, 24 Oct 2024 02:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1729763548; x=1730368348; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=6cfCqEEQWYqsWxPcQ8z8+CrGqw/gN5aef/zdhljFzGk=; b=jk0akTaDfF8jcQBXuB1auwlT9hLowbIBGrVsbrcll8xWB1ts9PL7WXpUBV/avd3Jn1 kvHIN7JGiTTTmB7lzuCqGvbJK9YlKtR3Q5tewv5+lwGphkMBcm/tCSA100YU53k639Ux J2fG3eWKrybIhEI+bxG5zCuVPytAHX6zs76d78T4LobARMUbPmaFkMLd49OlWW7f+DRl aufJ5Uk3aJNFsfjagwMLL38QtYNTOyrApCsGRdhMkOJtBREu0as2y+kOiS02p2W/Hx3Z oPOfiZsNjEHh00KDyrjkUXp3tIB7rS5P6TDRz984249puTAh/iDU8Oeo/nkJ1aWRPwc1 pq/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729763548; x=1730368348; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6cfCqEEQWYqsWxPcQ8z8+CrGqw/gN5aef/zdhljFzGk=; b=VkIegl6NadVhS/gxi1xgJ5WiPjUZIygsHF9JvkAwdgwBDaqP6aMtoKn8oMnUNnVgKs 7/fnKQPmIy79qUzME6pkZORQaZnxuiXzUCXD5EUJHVCJ4pn0/dtVoT/AwBXmMkkcKpkn UX9rPYI7iBe+4s/HTbnIDF5yBz/HgBWZ3WVhUSU+U9JBpIR+SegoCgu77gzRzqVkb3Il zW2c+GjorTzWOsHOT+hrTlhwDXDu4hwr6VHPM8AiZYGE3FnUrcM8gFjnhPA5x3F5HQ7s mfWeenNCpQSHLMyyfsSHFyhvkalGvzj0WhgYYjGtdkEgZnRlRkNwPYr38viUaqaW5JcC 3C6A== X-Forwarded-Encrypted: i=1; AJvYcCU5hAM+d5oO9bftedL6GRFfQLOfEsrpT4KIT+hw2IGMvBdvjB1qSBwaGqjugUhU2DbmlWSMiidmCBcT/KBrWKYG@lists.infradead.org, AJvYcCVLWQOmDxO8eGrK+WiWHNlmFcGoXtFMZW0laBRpKdMX+OUE+1yTNBq0zHB0L8vUzwBoVU9eEFioobEzU6ZlJkg=@lists.infradead.org X-Gm-Message-State: AOJu0Yy9TWHRqYfL0ViQXaaAJNir3EP+5OGFgOutVvTNF6BRUs2FeRfI SAQlXzUHolCka6YloFtP9LcHTtdgV1PPXrgKqhseLCa2whjOTlB3 X-Google-Smtp-Source: AGHT+IHWvMs+0GGmvrgk7LDPXSiyo7rD87hzR4wZUa0JreNhJLMhzBnvZEcLXjP4S9+kCKlunjkERw== X-Received: by 2002:a5d:6252:0:b0:374:c614:73df with SMTP id ffacd0b85a97d-37efcf936a4mr3302822f8f.57.1729763547867; Thu, 24 Oct 2024 02:52:27 -0700 (PDT) Received: from localhost.localdomain ([2a02:908:1587:1e60:e265:6c8b:f62b:1474]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a37ac4sm10996286f8f.6.2024.10.24.02.52.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 02:52:27 -0700 (PDT) From: Cenk Uluisik To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Jimmy Hon , Cenk Uluisik , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 1/3] arm64: dts: rockchip: refactor common Orange Pi 5 board Date: Thu, 24 Oct 2024 09:50:20 +0000 Message-ID: <20241024095038.42079-1-cenk.uluisik@googlemail.com> X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241024_025230_321659_CCBE7A5E X-CRM114-Status: UNSURE ( 9.94 ) 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 Unique to the Orange Pi 5 board: - M.2 NVMe M-Key PCIe 2.0x1 on combphy0_ps - SPI NOR flash Signed-off-by: Cenk Uluisik Signed-off-by: Jimmy Hon --- Changes in v7: - Refactor the common .dtsi file to be on top of newly introduced changes to the Orange Pi 5 - Revert the &sdmmc back to be assigned to the mmc0 alias to avoid breaking changes .../boot/dts/rockchip/rk3588s-orangepi-5.dts | 908 +----------------- ...orangepi-5.dts => rk3588s-orangepi-5.dtsi} | 23 +- 2 files changed, 33 insertions(+), 898 deletions(-) rewrite arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts (96%) copy arch/arm64/boot/dts/rockchip/{rk3588s-orangepi-5.dts => rk3588s-orangepi-5.dtsi} (96%) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts dissimilarity index 96% index 189fd9d83..9c0d13482 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts @@ -1,876 +1,32 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) - -/dts-v1/; - -#include -#include -#include -#include -#include -#include -#include "rk3588s.dtsi" - -/ { - model = "Xunlong Orange Pi 5"; - compatible = "xunlong,orangepi-5", "rockchip,rk3588s"; - - aliases { - ethernet0 = &gmac1; - mmc0 = &sdmmc; - }; - - chosen { - stdout-path = "serial2:1500000n8"; - }; - - adc-keys { - 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 = <1800>; - }; - }; - - analog-sound { - compatible = "simple-audio-card"; - pinctrl-names = "default"; - pinctrl-0 = <&hp_detect>; - simple-audio-card,name = "rockchip,es8388"; - simple-audio-card,bitclock-master = <&masterdai>; - simple-audio-card,format = "i2s"; - simple-audio-card,frame-master = <&masterdai>; - simple-audio-card,hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>; - simple-audio-card,mclk-fs = <256>; - simple-audio-card,pin-switches = "Headphones"; - 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"; - - simple-audio-card,cpu { - sound-dai = <&i2s1_8ch>; - }; - - masterdai: simple-audio-card,codec { - sound-dai = <&es8388>; - system-clock-frequency = <12288000>; - }; - }; - - hdmi0-con { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi0_con_in: endpoint { - remote-endpoint = <&hdmi0_out_con>; - }; - }; - }; - - pwm-leds { - compatible = "pwm-leds"; - - led { - color = ; - function = LED_FUNCTION_STATUS; - linux,default-trigger = "heartbeat"; - max-brightness = <255>; - pwms = <&pwm0 0 25000 0>; - }; - }; - - vbus_typec: vbus-typec-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&typec5v_pwren>; - regulator-name = "vbus_typec"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc5v0_sys: vcc5v0-sys-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - - vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator { - compatible = "regulator-fixed"; - gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_LOW>; - regulator-name = "vcc_3v3_sd_s0"; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_3v3_s3>; - }; - - vcc3v3_pcie20: vcc3v3-pcie20-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - regulator-name = "vcc3v3_pcie20"; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - startup-delay-us = <50000>; - vin-supply = <&vcc5v0_sys>; - }; -}; - -&combphy0_ps { - status = "okay"; -}; - -&combphy2_psu { - status = "okay"; -}; - -&cpu_b0 { - cpu-supply = <&vdd_cpu_big0_s0>; -}; - -&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>; -}; - -&cpu_l2 { - cpu-supply = <&vdd_cpu_lit_s0>; -}; - -&cpu_l3 { - cpu-supply = <&vdd_cpu_lit_s0>; -}; - -&gmac1 { - clock_in_out = "output"; - phy-handle = <&rgmii_phy1>; - phy-mode = "rgmii-rxid"; - pinctrl-0 = <&gmac1_miim - &gmac1_tx_bus2 - &gmac1_rx_bus2 - &gmac1_rgmii_clk - &gmac1_rgmii_bus>; - pinctrl-names = "default"; - tx_delay = <0x42>; - status = "okay"; -}; - -&gpu { - mali-supply = <&vdd_gpu_s0>; - 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>; - 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; - }; - }; -}; - -&i2c2 { - status = "okay"; - - vdd_npu_s0: regulator@42 { - compatible = "rockchip,rk8602"; - reg = <0x42>; - fcs,suspend-voltage-selector = <1>; - regulator-name = "vdd_npu_s0"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; -}; - -&i2c6 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c6m3_xfer>; - status = "okay"; - - es8388: audio-codec@10 { - compatible = "everest,es8388"; - reg = <0x10>; - clocks = <&cru I2S1_8CH_MCLKOUT>; - AVDD-supply = <&vcc_3v3_s0>; - DVDD-supply = <&vcc_1v8_s0>; - HPVDD-supply = <&vcc_3v3_s0>; - PVDD-supply = <&vcc_3v3_s0>; - assigned-clocks = <&cru I2S1_8CH_MCLKOUT>; - assigned-clock-rates = <12288000>; - #sound-dai-cells = <0>; - }; - - usbc0: usb-typec@22 { - compatible = "fcs,fusb302"; - reg = <0x22>; - interrupt-parent = <&gpio0>; - interrupts = ; - pinctrl-names = "default"; - pinctrl-0 = <&usbc0_int>; - vbus-supply = <&vbus_typec>; - status = "okay"; - - usb_con: connector { - compatible = "usb-c-connector"; - label = "USB-C"; - data-role = "dual"; - op-sink-microwatt = <1000000>; - power-role = "dual"; - sink-pdos = - ; - source-pdos = - ; - try-power-role = "source"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - usbc0_hs: endpoint { - remote-endpoint = <&usb_host0_xhci_drd_sw>; - }; - }; - - port@1 { - reg = <1>; - usbc0_ss: endpoint { - remote-endpoint = <&usbdp_phy0_typec_ss>; - }; - }; - - port@2 { - reg = <2>; - usbc0_sbu: endpoint { - remote-endpoint = <&usbdp_phy0_typec_sbu>; - }; - }; - }; - }; - }; - - hym8563: rtc@51 { - compatible = "haoyu,hym8563"; - reg = <0x51>; - #clock-cells = <0>; - clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&hym8563_int>; - interrupt-parent = <&gpio0>; - interrupts = ; - wakeup-source; - }; -}; - -&i2s1_8ch { - rockchip,i2s-tx-route = <3 2 1 0>; - rockchip,i2s-rx-route = <1 3 2 0>; - pinctrl-names = "default"; - pinctrl-0 = <&i2s1m0_sclk - &i2s1m0_mclk - &i2s1m0_lrck - &i2s1m0_sdi1 - &i2s1m0_sdo3>; - status = "okay"; -}; - -&mdio1 { - rgmii_phy1: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0x1>; - reset-assert-us = <20000>; - reset-deassert-us = <100000>; - reset-gpios = <&gpio3 RK_PB2 GPIO_ACTIVE_LOW>; - }; -}; - -&pcie2x1l2 { - reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie20>; - status = "okay"; -}; - -&pinctrl { - hym8563 { - hym8563_int: hym8563-int { - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - sound { - hp_detect: hp-detect { - rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - usb-typec { - usbc0_int: usbc0-int { - rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - typec5v_pwren: typec5v-pwren { - rockchip,pins = <3 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; -}; - -&pwm0 { - pinctrl-0 = <&pwm0m2_pins>; - pinctrl-names = "default"; - status = "okay"; -}; - -&saradc { - vref-supply = <&avcc_1v8_s0>; - status = "okay"; -}; - -&sdmmc { - bus-width = <4>; - cap-sd-highspeed; - disable-wp; - max-frequency = <150000000>; - no-mmc; - no-sdio; - sd-uhs-sdr104; - vmmc-supply = <&vcc_3v3_sd_s0>; - vqmmc-supply = <&vccio_sd_s0>; - status = "okay"; -}; - -&sfc { - pinctrl-names = "default"; - pinctrl-0 = <&fspim0_pins>; - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0x0>; - spi-max-frequency = <100000000>; - spi-rx-bus-width = <4>; - spi-tx-bus-width = <1>; - }; -}; - -&spi2 { - status = "okay"; - assigned-clocks = <&cru CLK_SPI2>; - assigned-clock-rates = <200000000>; - num-cs = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>; - - 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 = <&vcc_1v1_nldo_s3>; - vcc14-supply = <&vcc_1v1_nldo_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-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; - regulator-enable-ramp-delay = <400>; - - 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 = <750000>; - 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 = <950000>; - 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>; - }; - }; - - vcc_1v1_nldo_s3: vdd2_ddr_s3: dcdc-reg6 { - regulator-name = "vdd2_ddr_s3"; - regulator-always-on; - regulator-boot-on; - regulator-max-microvolt = <1100000>; - regulator-min-microvolt = <1100000>; - - 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; - }; - }; - - 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; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - - 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"; -}; - -&u2phy0 { - status = "okay"; -}; - -&u2phy0_otg { - status = "okay"; -}; - -&u2phy2 { - status = "okay"; -}; - -&u2phy2_host { - status = "okay"; -}; - -&u2phy3 { - status = "okay"; -}; - -&u2phy3_host { - status = "okay"; -}; - -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; -}; - -&usbdp_phy0 { - mode-switch; - orientation-switch; - sbu1-dc-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; - sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; - status = "okay"; - - port { - #address-cells = <1>; - #size-cells = <0>; - - usbdp_phy0_typec_ss: endpoint@0 { - reg = <0>; - remote-endpoint = <&usbc0_ss>; - }; - - usbdp_phy0_typec_sbu: endpoint@1 { - reg = <1>; - remote-endpoint = <&usbc0_sbu>; - }; - }; -}; - -&usb_host0_ehci { - status = "okay"; -}; - -&usb_host0_ohci { - status = "okay"; -}; - -&usb_host0_xhci { - dr_mode = "otg"; - usb-role-switch; - status = "okay"; - - port { - usb_host0_xhci_drd_sw: endpoint { - remote-endpoint = <&usbc0_hs>; - }; - }; -}; - -&usb_host1_ehci { - status = "okay"; -}; - -&usb_host1_ohci { - status = "okay"; -}; - -&usb_host2_xhci { - status = "okay"; -}; - -&vop_mmu { - status = "okay"; -}; - -&vop { - status = "okay"; -}; - -&vp0 { - vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { - reg = ; - remote-endpoint = <&hdmi0_in_vp0>; - }; -}; +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "rk3588s-orangepi-5.dtsi" + +/ { + model = "Xunlong Orange Pi 5"; + compatible = "xunlong,orangepi-5", "rockchip,rk3588s"; + + vcc3v3_pcie20: vcc3v3-pcie20-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + regulator-name = "vcc3v3_pcie20"; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + startup-delay-us = <50000>; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&pcie2x1l2 { + reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc3v3_pcie20>; + status = "okay"; +}; + +&sfc { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi similarity index 96% copy from arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts copy to arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi index 189fd9d83..5ef0ccfcf 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi @@ -11,9 +11,6 @@ #include "rk3588s.dtsi" / { - model = "Xunlong Orange Pi 5"; - compatible = "xunlong,orangepi-5", "rockchip,rk3588s"; - aliases { ethernet0 = &gmac1; mmc0 = &sdmmc; @@ -123,18 +120,6 @@ vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator { regulator-max-microvolt = <3300000>; vin-supply = <&vcc_3v3_s3>; }; - - vcc3v3_pcie20: vcc3v3-pcie20-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; - regulator-name = "vcc3v3_pcie20"; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - startup-delay-us = <50000>; - vin-supply = <&vcc5v0_sys>; - }; }; &combphy0_ps { @@ -380,12 +365,6 @@ rgmii_phy1: ethernet-phy@1 { }; }; -&pcie2x1l2 { - reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie20>; - status = "okay"; -}; - &pinctrl { hym8563 { hym8563_int: hym8563-int { @@ -437,7 +416,7 @@ &sdmmc { &sfc { pinctrl-names = "default"; pinctrl-0 = <&fspim0_pins>; - status = "okay"; + status = "disabled"; flash@0 { compatible = "jedec,spi-nor"; From patchwork Thu Oct 24 09:50:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cenk Uluisik X-Patchwork-Id: 13848672 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 D079ECDDE69 for ; Thu, 24 Oct 2024 10:02:01 +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:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ItsUFpfIVW7VK5PuR3+hyxHccJZvcBiIjphiKb2zD8U=; b=dew4nqNhuz6lHP o3DUutnAuoo+6ijBqNgD7IcJkgFnN3zcFDIx8ag6bJLRtp5n3Hh2JDMxpMXcPpBjRx0I/qvKeSbau sIVUd9sx4hcg4zDGrXGN43gOit1SUKbTLLj/T2+0SWb9AaLqHRWLFZ+EYbpiviNb1obJHH5pxd/1F QM/RsAXipYOJ1bRnM8cmf19bfVg1SKmrH5a/KxIF8+2BV7gzBwiKEgh0Y6lCc6Q2dTdc/CA4VOU91 tDnKEa4dJ0vcVt6qatK0FJCaHwn4Bvk3nLrhPSzpyDFfs6KE/aAkcX+orHJ7aHi13sIQjlC6OlJTV WPgmXRSvkFq7oNX3nD2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3ufE-0000000HalE-49Ru; Thu, 24 Oct 2024 10:01:56 +0000 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3uWA-0000000HYbe-2JJ9; Thu, 24 Oct 2024 09:52:35 +0000 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4314a26002bso7537625e9.0; Thu, 24 Oct 2024 02:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1729763552; x=1730368352; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zbGlZH2YPT556Yg7F/kd5yHQZFw5b8+sD6ABVMiAEf0=; b=bBgcR0bftJUR5hMX4Q7UXMxYJ65GVT3tpvzxe9XxGwDsGPiwMfKu41JHrCPIuHr98L P9uau2THkT1PfPvPISacm0QYC+DMdLUl+D+S/w+o7AfW6/vMtFfDxFa/f8nz74gi642I z2hudQe40edn3AlFg11vl8j5ntGMesUHEVJyQ5nWzaEatnawCkjp8rFcd+g/NCZw8Tq4 3wa4CgvY1UJ9fCZURoqz//vFzmFMR0tuet5Bw6QW1oT+9rpsoCxB8wJyt27LHmrcduHi yhPvB1H9vpzkAHfJ5/4iQhSeh+TMJu+Cf1d8DnOemIaarhy1QgLdbqJ9qWnQAlgNR0EV JZqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729763552; x=1730368352; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zbGlZH2YPT556Yg7F/kd5yHQZFw5b8+sD6ABVMiAEf0=; b=OhTXMYo/whDbdt34rHPqOrYBYaKEKLcs9m97gUV6BVGmECvX7OOJHVdUmhCM1i7ARH ubdcbWTOlTixXY7Y3BK3UMCc5IceUKL1x1rTGdn1uBHglCxWrWfwbmPcBmj+rljaCAAR psSMKp9ktOYSn7b29rxodVAfJOn0FU30dOW64vz8CLlgmC1eNd00mM+VaHcayVe/O0KE 0sVy05Z5BMppRW+qY8YURnUqOUINlnXakvD9iTQOskcrmsDyaBzGgQl17a1dQYtzTYTk NrNT25I5VE/OHd9B40f7YTjyNQRmCk1nNYWiuICDP6dKhnpOguzZg36It6bw+E1FaBJi 1dew== X-Forwarded-Encrypted: i=1; AJvYcCV83BOzL7TxscYGJfyuatoJor8mxXDEp4DzJcTf6NwpY1QXsb4Xgs0jYTajloMC7guixdJQByx24RfsmNV6UJ8=@lists.infradead.org, AJvYcCWHq18RTmbbKzYzbSXqAEy4LmZVJ2d/jVaTfLRwF0k7Ny/fp4NqqXZ2ozLqrjqYr6bX/Sk+7fa8kV+qice6i73Q@lists.infradead.org X-Gm-Message-State: AOJu0YxcWOvoiVLos8KBECg9xHngLrteqSZnwG5XzfXDYzdiFwBuxCYV EuE6xoh10WKkHBk3D8Znqbof7azxUe2GcGCvHK2VoRpliuFndAVp X-Google-Smtp-Source: AGHT+IH6+FDqRxvf+ZtXVfydc1RVsL1eaYqfFGtXJ+QNYha+sQ1JmohsKezDc9XL54BBl2gx5N8lAw== X-Received: by 2002:adf:fdd1:0:b0:37d:8084:160b with SMTP id ffacd0b85a97d-3804587eed6mr1086117f8f.23.1729763552405; Thu, 24 Oct 2024 02:52:32 -0700 (PDT) Received: from localhost.localdomain ([2a02:908:1587:1e60:e265:6c8b:f62b:1474]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a37ac4sm10996286f8f.6.2024.10.24.02.52.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 02:52:32 -0700 (PDT) From: Cenk Uluisik To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Jimmy Hon , Cenk Uluisik , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 2/3] dt-bindings: arm: rockchip: Add Orange Pi 5b enum to Orange Pi 5 entry Date: Thu, 24 Oct 2024 09:50:21 +0000 Message-ID: <20241024095038.42079-2-cenk.uluisik@googlemail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20241024095038.42079-1-cenk.uluisik@googlemail.com> References: <20241024095038.42079-1-cenk.uluisik@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241024_025234_616252_2D40A146 X-CRM114-Status: GOOD ( 12.46 ) 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 This extends the Xunlong Orange Pi 5 device tree binding with an enum for the Orange Pi 5b, which is implemented before the device tree. How does this board differ from the original Orange Pi 5? - the Orange Pi 5 has a M.2 NVMe M-key PCI 2.0x1 slot (hooked to combphy0_ps) whereas the Orange Pi 5b uses combphy0_ps for the WiFi. - The Orange Pi 5 with the M.2 socket has a regulator defined hooked to "GPIO0_C5" (i.e. PCIE_PWREN_H) whereas the Orange Pi 5B has GPIO0_C5 hooked to BT_WAKE_HOST. - builtin eMMC storage - no SPI NOR flash (u-boot, preboot etc. initiates from within the eMMC storage) - ap6275p Wifi module (like the Orange Pi 5 Plus) - builtin BlueTooth module Signed-off-by: Cenk Uluisik Reviewed-by: Rob Herring (Arm) --- Changes in v7: - No changes to this patch (same as v6) Documentation/devicetree/bindings/arm/rockchip.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index b7c4de06b..2f9fcc634 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -1079,7 +1079,9 @@ properties: - description: Xunlong Orange Pi 5 items: - - const: xunlong,orangepi-5 + - enum: + - xunlong,orangepi-5 + - xunlong,orangepi-5b - const: rockchip,rk3588s - description: Zkmagic A95X Z2 From patchwork Thu Oct 24 09:50:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cenk Uluisik X-Patchwork-Id: 13848689 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 532FFCFA456 for ; Thu, 24 Oct 2024 10:03:37 +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:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fpuVm4goDhOUzPKhcKFHBH/E7246gsirIwjxswxAozA=; b=0PTWMUrf6YUW48 QAQcGxSdejh9JU0+dGRJo40Ldw89FZXaPFDxp3InGgP8Q7BZFKbjpqXNp/nt6+JBQ5QqoXCSZ3GLf pOuTVUEYqo1LJZ1sZQoC1YYRt/LcQwACzkPZIXeMn/sck6rLLUknCt/SasCnsExgEXJzT9U4s3PgG idC1WEIGrrGWguNgL+NwroqIDecR909w0RAb4GWzN8EkISpq0A86sjvnzqZBt9xYpBoH54/vUOKAZ MCKbx1xUpxkYUJLFxH+Z5dd7ruVz369v36BBnHGy+MGt6FWOkZe/u1h4y1Zfjx9XeqQTha9fXfPPT jfJ1M3jdGFr6MElSHAZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3ugm-0000000Hb6g-3DIS; Thu, 24 Oct 2024 10:03:32 +0000 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3uWE-0000000HYcx-3EyF; Thu, 24 Oct 2024 09:52:40 +0000 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-37d4c1b1455so457206f8f.3; Thu, 24 Oct 2024 02:52:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1729763557; x=1730368357; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RnCDGJfcN3PLmfYBMIFGhUBG768VdNHJJP6i96p6xYA=; b=Czxv3cXcIQR561Iqh0W8VqU3DUexIq8jL36ZE/MMF43AFjnDSG0uVOkK26KFTiytUv 8NF+ifLDPSBDVKxTlzqZv5LSUujW7P5md/2jyIGOcdo0NTK9a7Aix6F0tTU3aucLLgmq t4Eo/usZ54b0X6gyqUytsji5FiectMpPFbuOfX+WWxz31tkx8fEiaF0wCax07iwala/f LYYlqZvylZ9lQKz/XVQjK42DTMl9GNZhe765BNS1vLnRdnXNCGTQQcj9a/Waow8AYLSP hmKuT0qKpIFUcbGTxB7PM7jUR8YZmOxUMbKVqTXFTFLc0PCRxJY/xIO8LdFJC+p2ujhm 03Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729763557; x=1730368357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RnCDGJfcN3PLmfYBMIFGhUBG768VdNHJJP6i96p6xYA=; b=W3DjgmD6HCGzcLp/10lybfU/WvZhZIMcQjqEzLxvYjw/x7ILw5+arZwTUOFW6ERNTY ckMis+Nk6/6ioLWPLl6ZiRuUnCkLMb30FkkujDTFyTNDZpozrPviF2d3YKD22JqXTBon OfEFeVVYpQ/F2q0pSFQmh0hNcOATZJYYr7nn59VODl0E0JG+LbqO0aU2kKJII1U0BPZF C+35v409AQj4Dto0SEn0r3G8EBclPkGJ7iltuROFQOmd1SEsUT6/dymZGbnrkB2ZRrfp LUzrF4s2eAp03HpRM76JG74s02UQuDV87qKIAkXPYmS/wXH9dknL4CpWVmLbRdhyuGmj acmQ== X-Forwarded-Encrypted: i=1; AJvYcCU9h6Rat9QedvO80mCY0Jvx4NHvNw8niKSE0dzZuia4g0ZqBH5mZ/HN6B9xQ8N3Rm6QCb58v11wd8apv5og7Pa8@lists.infradead.org, AJvYcCXzdEfs5+0G1dnMdkOrYtR8i2WY5QXOtCUq0A3gSyGV9sxgpsLtw4E1BPVz3pSXd/8xOdEfgKDOxpBeNVzL97w=@lists.infradead.org X-Gm-Message-State: AOJu0YxGyXi8JXYg0nRUATvGISvqU6VCMeMEdivrarqvZYLDe5BdI0mM LEOmsSnaGa3TdYYew1tzMKytM9IF7dreoY3j9Lr76S77qi+xr2Q2 X-Google-Smtp-Source: AGHT+IHOGIh30cZeVBaManyxCwsLnI9f8EReanEFaNeNhbdtE6TT2V9YrSK8ERkjOnhQ6SSbt3KcFg== X-Received: by 2002:adf:fbca:0:b0:37d:377d:c7b0 with SMTP id ffacd0b85a97d-37efcf0699bmr3536455f8f.18.1729763556938; Thu, 24 Oct 2024 02:52:36 -0700 (PDT) Received: from localhost.localdomain ([2a02:908:1587:1e60:e265:6c8b:f62b:1474]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a37ac4sm10996286f8f.6.2024.10.24.02.52.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 02:52:36 -0700 (PDT) From: Cenk Uluisik To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Jimmy Hon , Cenk Uluisik , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 3/3] arm64: dts: rockchip: Add rk3588-orangepi-5b device tree Date: Thu, 24 Oct 2024 09:50:22 +0000 Message-ID: <20241024095038.42079-3-cenk.uluisik@googlemail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20241024095038.42079-1-cenk.uluisik@googlemail.com> References: <20241024095038.42079-1-cenk.uluisik@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241024_025238_838414_5E3B37E3 X-CRM114-Status: GOOD ( 15.45 ) 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 Implements a slightly modified rk3588s-orangepi-5b.dts from the vendor. Unfortunately the &wireless_bluetooth and &wireless_wlan are not implemented yet. Therefore add the sdhci alias to be mmc0 on the rk3588s-orangepi-5b.dts. How is the Orange Pi 5B unique? - the Orange Pi 5b uses combphy0_ps for the WiFi. - the Orange Pi 5B has GPIO0_C5 hooked to BT_WAKE_HOST. - builtin eMMC storage - ap6275p Wifi module (like the Orange Pi 5 Plus) - builtin BlueTooth module Signed-off-by: Cenk Uluisik --- Changes in v7: - Set sdmmc to mmc1 (because this is now reverted in common .dtsi to be mmc0, to avoid breaking changes) arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 11 +++++++++++ .../boot/dts/rockchip/rk3588s-orangepi-5b.dts | 19 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index e641033d2..2e485553c 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -160,3 +160,4 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-nanopi-r6c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-odroid-m2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5b.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi index 5ef0ccfcf..0573b8f2d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi @@ -400,6 +400,17 @@ &saradc { status = "okay"; }; +&sdhci { + bus-width = <8>; + no-sdio; + no-sd; + non-removable; + max-frequency = <200000000>; + mmc-hs400-1_8v; + mmc-hs400-enhanced-strobe; + status = "disabled"; +}; + &sdmmc { bus-width = <4>; cap-sd-highspeed; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts new file mode 100644 index 000000000..d21ec320d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "rk3588s-orangepi-5.dtsi" + +/ { + model = "Xunlong Orange Pi 5B"; + compatible = "xunlong,orangepi-5b", "rockchip,rk3588s"; + + aliases { + mmc0 = &sdhci; + mmc1 = &sdmmc; + }; +}; + +&sdhci { + status = "okay"; +};