From patchwork Wed Jun 12 20:48:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Kropatsch X-Patchwork-Id: 13695566 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 7ACEFC27C75 for ; Wed, 12 Jun 2024 20:54:41 +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=Dnc+9jBDOr8agspslhsiw4nsBrx90miVaT5AcaaLxIw=; b=sOKbAb8uG0Xg1K cYx1xtfrZ/7UYw6M+J10WfJfrmNS0rQPO1pXTeHKpYsD9KSkTBh48YjstRQhATX3bp817wjlPo2Ie NBiWpcdrY18LPIguOLSnMjeeszFokkzLfW0Nd7lBRQxwtAddbAgURD8XbwEoWnwM+FlIeU0B+cXL2 sbFPC6Gf+N5x2VtIi77Min8cRFcAdkl5ccbq0+uCFHcWALv5Ahg0479Ff5CXsOK9syFfrGsWsyh46 yb+M0UIwVie1zuKL0xRi6CZkdOc76EOmZ8woHT4S4kXuViAmypN/sszLE8+CbwkuygzKtWuLkX0Ll e7GbpuhvuW/7pV/UOwbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHUzO-0000000E6Ik-03j7; Wed, 12 Jun 2024 20:54:38 +0000 Received: from shout12.mail.de ([2001:868:100:600::f154]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHUz9-0000000E6Bk-0VLf; Wed, 12 Jun 2024 20:54:26 +0000 Received: from shout02.mail.de (unknown [10.0.120.222]) by shout12.mail.de (Postfix) with ESMTPS id 463FD24193F; Wed, 12 Jun 2024 22:54:18 +0200 (CEST) Received: from postfix02.mail.de (postfix02.bt.mail.de [10.0.121.126]) by shout02.mail.de (Postfix) with ESMTP id 324942409FE; Wed, 12 Jun 2024 22:54:18 +0200 (CEST) Received: from smtp01.mail.de (smtp01.bt.mail.de [10.0.121.211]) by postfix02.mail.de (Postfix) with ESMTP id 12140A00E2; Wed, 12 Jun 2024 22:54:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1718225658; bh=WnwRfPyeueYcu4XenBGVY15x51OIrxxyLkE0gtbmO7M=; h=From:To:Cc:Subject:Date:Message-ID:From:To:CC:Subject:Reply-To; b=fzouls5NFBKJzOtKJjM7wSAFFMwafLqyK60wdIxjjs0Z1BCNPDQx8dDXqS6j3kJiW +DDIEpeHsFUFAg/a3w90HFH+Ydmk17w9oZduYCsWNjKm5f8u6GM7mtrItepsyh6s2H dD8GEHIOuHS+4yLPx1AQ8LdG/z6httIp1K6ERuH1jyNJ3d1lKn9an2mX4bZTAtmhuV Va21VFvXAcLI/V3I2wG2c4cQfXnZLLMUt/MgBJxbTgrw0cI0fCyjHEAfI682vLv0xp UYkr43TDQ30dES5L0CwDwxppkQmEYctC93cILnTiryNlAckm55V9BgZyGjhsXVKQ3z +QnHozjV2uleQ== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp01.mail.de (Postfix) with ESMTPSA id 8BA9F240A39; Wed, 12 Jun 2024 22:54:17 +0200 (CEST) From: Sebastian Kropatsch To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] arm64: dts: rockchip: Add common definitions for NanoPi R6C and R6S Date: Wed, 12 Jun 2024 22:48:10 +0200 Message-ID: <20240612205056.397204-2-seb-dev@mail.de> In-Reply-To: <20240612205056.397204-1-seb-dev@mail.de> References: <20240612205056.397204-1-seb-dev@mail.de> MIME-Version: 1.0 X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 20572 X-purgate-ID: 154282::1718225657-FE5BF670-177C9480/0/0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240612_135423_485296_4B111F31 X-CRM114-Status: GOOD ( 11.89 ) 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 FriendlyElec NanoPi R6C and R6S are quite similar boards, although they differ in: - M.2 M-Key connector vs second RTL8125BG Ethernet port - One of the LEDs has a different function on each board - 12-pin GPIO FPC vs 30-pin GPIO header - R6S has a PWM-based IR receiver while the R6C has not - R6S has a 5V fan connector while the R6C has not Refactor their DT files by adding a common definitions file to improve differentiation clarity between both boards and to make hardware-specific DT changes easier in the long run. Do not introduce any functional changes. Signed-off-by: Sebastian Kropatsch --- ...-nanopi-r6s.dts => rk3588s-nanopi-r6.dtsi} | 7 +- .../boot/dts/rockchip/rk3588s-nanopi-r6c.dts | 2 +- .../boot/dts/rockchip/rk3588s-nanopi-r6s.dts | 756 +----------------- 3 files changed, 7 insertions(+), 758 deletions(-) copy arch/arm64/boot/dts/rockchip/{rk3588s-nanopi-r6s.dts => rk3588s-nanopi-r6.dtsi} (99%) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi similarity index 99% copy from arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts copy to arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi index 4fa644ae510c..e68d4071400e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi @@ -1,4 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Common devicetree definitions for the NanoPi R6C and R6S + */ /dts-v1/; @@ -8,9 +11,6 @@ #include "rk3588s.dtsi" / { - model = "FriendlyElec NanoPi R6S"; - compatible = "friendlyarm,nanopi-r6s", "rockchip,rk3588s"; - aliases { ethernet0 = &gmac1; mmc0 = &sdmmc; @@ -74,7 +74,6 @@ lan1_led: led-2 { }; lan2_led: led-3 { - label = "lan2_led"; gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&lan2_led_pin>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts index 497bbb57071f..ccc5e4627517 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts @@ -2,7 +2,7 @@ /dts-v1/; -#include "rk3588s-nanopi-r6s.dts" +#include "rk3588s-nanopi-r6.dtsi" / { model = "FriendlyElec NanoPi R6C"; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts index 4fa644ae510c..9c3e0b0daaac 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts @@ -2,763 +2,13 @@ /dts-v1/; -#include -#include -#include -#include "rk3588s.dtsi" +#include "rk3588s-nanopi-r6.dtsi" / { model = "FriendlyElec NanoPi R6S"; compatible = "friendlyarm,nanopi-r6s", "rockchip,rk3588s"; - - aliases { - ethernet0 = &gmac1; - mmc0 = &sdmmc; - mmc1 = &sdhci; - }; - - chosen { - stdout-path = "serial2:1500000n8"; - }; - - adc-keys { - compatible = "adc-keys"; - io-channels = <&saradc 0>; - io-channel-names = "buttons"; - keyup-threshold-microvolt = <1800000>; - poll-interval = <100>; - - button-maskrom { - label = "Maskrom"; - linux,code = ; - press-threshold-microvolt = <1800>; - }; - }; - - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&key1_pin>; - - button-user { - label = "User"; - linux,code = ; - gpios = <&gpio1 RK_PC0 GPIO_ACTIVE_LOW>; - debounce-interval = <50>; - }; - }; - - leds { - compatible = "gpio-leds"; - - sys_led: led-0 { - label = "sys_led"; - gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - pinctrl-names = "default"; - pinctrl-0 = <&sys_led_pin>; - }; - - wan_led: led-1 { - label = "wan_led"; - gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&wan_led_pin>; - }; - - lan1_led: led-2 { - label = "lan1_led"; - gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lan1_led_pin>; - }; - - lan2_led: led-3 { - label = "lan2_led"; - gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lan2_led_pin>; - }; - }; - - 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_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc_1v1_nldo_s3"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc_3v3_s0: vcc-3v3-s0-regulator { - compatible = "regulator-fixed"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-name = "vcc_3v3_s0"; - vin-supply = <&vcc_3v3_s3>; - }; - - vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&sd_s0_pwr>; - regulator-name = "vcc_3v3_sd_s0"; - regulator-boot-on; - regulator-max-microvolt = <3000000>; - regulator-min-microvolt = <3000000>; - vin-supply = <&vcc_3v3_s3>; - }; - - vcc_3v3_pcie20: vcc3v3-pcie20-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc_3v3_pcie20"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_3v3_s3>; - }; - - vcc5v0_usb: vcc5v0-usb-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_usb"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc5v0_usb_otg0: vcc5v0-usb-otg0-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&typec5v_pwren>; - regulator-name = "vcc5v0_usb_otg0"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v0_usb>; - }; - - vcc5v0_host_20: vcc5v0-host-20-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&vcc5v0_host20_en>; - regulator-name = "vcc5v0_host_20"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v0_usb>; - }; -}; - -&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"; -}; - -&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-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-ramp-delay = <2300>; - regulator-boot-on; - regulator-always-on; - vin-supply = <&vcc5v0_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; -}; - -&i2c6 { - clock-frequency = <200000>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c6m0_xfer>; - status = "okay"; - - hym8563: rtc@51 { - compatible = "haoyu,hym8563"; - reg = <0x51>; - #clock-cells = <0>; - clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&rtc_int>; - interrupt-parent = <&gpio0>; - interrupts = ; - wakeup-source; - }; -}; - -&mdio1 { - rgmii_phy1: ethernet-phy@1 { - compatible = "ethernet-phy-id001c.c916"; - reg = <0x1>; - pinctrl-names = "default"; - pinctrl-0 = <&rtl8211f_rst>; - reset-assert-us = <20000>; - reset-deassert-us = <100000>; - reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; - }; -}; - -&pcie2x1l1 { - reset-gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc_3v3_pcie20>; - status = "okay"; -}; - -&pcie2x1l2 { - reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc_3v3_pcie20>; - status = "okay"; -}; - -&pinctrl { - gpio-key { - key1_pin: key1-pin { - rockchip,pins = <1 RK_PC0 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - gpio-leds { - sys_led_pin: sys-led-pin { - rockchip,pins = - <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - wan_led_pin: wan-led-pin { - rockchip,pins = - <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - lan1_led_pin: lan1-led-pin { - rockchip,pins = - <1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - lan2_led_pin: lan2-led-pin { - rockchip,pins = - <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - hym8563 { - rtc_int: rtc-int { - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - sdmmc { - sd_s0_pwr: sd-s0-pwr { - rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - usb { - typec5v_pwren: typec5v-pwren { - rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - vcc5v0_host20_en: vcc5v0-host20-en { - rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - - rtl8211f { - rtl8211f_rst: rtl8211f-rst { - rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; -}; - -&saradc { - vref-supply = <&avcc_1v8_s0>; - status = "okay"; -}; - -&sdhci { - bus-width = <8>; - no-sdio; - no-sd; - non-removable; - mmc-hs200-1_8v; - 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"; -}; - -&spi2 { - status = "okay"; - assigned-clocks = <&cru CLK_SPI2>; - assigned-clock-rates = <200000000>; - pinctrl-names = "default"; - pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>; - num-cs = <1>; - - pmic@0 { - compatible = "rockchip,rk806"; - spi-max-frequency = <1000000>; - 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>; - - 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: vdd_gpu_mem_s0: dcdc-reg1 { - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; - regulator-name = "vdd_gpu_s0"; - regulator-enable-ramp-delay = <400>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; - regulator-name = "vdd_cpu_lit_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_log_s0: dcdc-reg3 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <675000>; - regulator-max-microvolt = <750000>; - regulator-ramp-delay = <12500>; - regulator-name = "vdd_log_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <750000>; - }; - }; - - vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <550000>; - regulator-max-microvolt = <950000>; - regulator-ramp-delay = <12500>; - regulator-name = "vdd_vdenc_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_ddr_s0: dcdc-reg5 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <675000>; - regulator-max-microvolt = <900000>; - regulator-ramp-delay = <12500>; - regulator-name = "vdd_ddr_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <850000>; - }; - }; - - vdd2_ddr_s3: dcdc-reg6 { - regulator-always-on; - regulator-boot-on; - regulator-name = "vdd2_ddr_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - }; - }; - - vcc_2v0_pldo_s3: dcdc-reg7 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <2000000>; - regulator-max-microvolt = <2000000>; - regulator-ramp-delay = <12500>; - regulator-name = "vdd_2v0_pldo_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <2000000>; - }; - }; - - vcc_3v3_s3: dcdc-reg8 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-name = "vcc_3v3_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <3300000>; - }; - }; - - vddq_ddr_s0: dcdc-reg9 { - regulator-always-on; - regulator-boot-on; - regulator-name = "vddq_ddr_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vcc_1v8_s3: dcdc-reg10 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-name = "vcc_1v8_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - avcc_1v8_s0: pldo-reg1 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-name = "avcc_1v8_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - vcc_1v8_s0: pldo-reg2 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-name = "vcc_1v8_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - avdd_1v2_s0: pldo-reg3 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - regulator-name = "avdd_1v2_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - avcc_3v3_s0: pldo-reg4 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-ramp-delay = <12500>; - regulator-name = "avcc_3v3_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vccio_sd_s0: pldo-reg5 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-ramp-delay = <12500>; - regulator-name = "vccio_sd_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - pldo6_s3: pldo-reg6 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-name = "pldo6_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <1800000>; - }; - }; - - vdd_0v75_s3: nldo-reg1 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - regulator-name = "vdd_0v75_s3"; - - regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <750000>; - }; - }; - - avdd_ddr_pll_s0: nldo-reg2 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <850000>; - regulator-name = "avdd_ddr_pll_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - regulator-suspend-microvolt = <850000>; - }; - }; - - avdd_0v75_s0: nldo-reg3 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - regulator-name = "avdd_0v75_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - avdd_0v85_s0: nldo-reg4 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <850000>; - regulator-name = "avdd_0v85_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vdd_0v75_s0: nldo-reg5 { - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - regulator-name = "vdd_0v75_s0"; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - }; - }; -}; - -&tsadc { - status = "okay"; -}; - -&u2phy2 { - status = "okay"; -}; - -&u2phy2_host { - phy-supply = <&vcc5v0_host_20>; - status = "okay"; -}; - -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; -}; - -&usb_host0_ehci { - status = "okay"; }; -&usb_host0_ohci { - status = "okay"; +&lan2_led { + label = "lan2_led"; }; From patchwork Wed Jun 12 20:48:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Kropatsch X-Patchwork-Id: 13695567 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 E36AEC27C53 for ; Wed, 12 Jun 2024 20:54:45 +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=m5izu+PdUDJf6gUvYzhaRrgUCg//P6MsSqa5Lqhdl1c=; b=NI1L6To6YhPr3l TrSPwAh5hf7sduhZO/Ng4lyMpqC+Q0xdNlH2K8eL748O0Vb/FqavCOBEYD739m4/7GCP4BNHgDfbt vyz/9+xbtkqtbNUS+UTrZMh46Ax9/rSSB+9fSQgXR4OpfbWokR/kRgDG8lMXj6hnwpzar+6Ah9/8Z JumCOYq78ysjS6/veUmbSvfQRdzrqV53R7fYRTCae99vr6x7nI4JOv8yD3CN5gn5/QzsAz3GeYut2 Chpf+imvZT51Yk0wSKwnu+RVAKpYhRM7omBRDpiKvhaIo6rr+FzyIr6OrHt3DrAHwvQ/73odL2RL7 9zns7DxtPrqBTPT5tbkQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHUzR-0000000E6Lg-0S3s; Wed, 12 Jun 2024 20:54:41 +0000 Received: from shout12.mail.de ([2001:868:100:600::f154]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHUzB-0000000E6Cs-44VM; Wed, 12 Jun 2024 20:54:28 +0000 Received: from shout01.mail.de (unknown [10.0.120.221]) by shout12.mail.de (Postfix) with ESMTPS id C2081241943; Wed, 12 Jun 2024 22:54:18 +0200 (CEST) Received: from postfix02.mail.de (postfix02.bt.mail.de [10.0.121.126]) by shout01.mail.de (Postfix) with ESMTP id A73EB2405B9; Wed, 12 Jun 2024 22:54:18 +0200 (CEST) Received: from smtp01.mail.de (smtp01.bt.mail.de [10.0.121.211]) by postfix02.mail.de (Postfix) with ESMTP id 880D0A00E2; Wed, 12 Jun 2024 22:54:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1718225658; bh=jUQqkFnD1pHKO30UuOJFQGN4n1IsfoEwchb+wGSVsIU=; h=From:To:Cc:Subject:Date:Message-ID:From:To:CC:Subject:Reply-To; b=XfaaoS/aRMPtISMkDQQdrF16lOeYkr7rrQKYvv4Zjf2O3536FwSoMeYxFkwcDEWCj DXd7Doz1aKQsW7StCOS7ca29B7sljyRGa31reLk+M+rV8/fOT9cBV8kU/PMxP3Bt4W s2EGmNQ+QiTwjDyfjUeXHGuBrvV2HrNEDsRh6mBG+ip0MPxX02fbV42D6rSIDWkUvb urVmSkMdFddoIhB+JQ+hV8kyiY1/mqDkY5X0nj0E1+bbs0oNqxLrgKsTLAGdE0CS0V wzGp29oXQvuEIFCFB+JzEt9wIDc6QKZ9FCXkhvGPdeEwooM5lvWFkFqPBpdU1TpKWJ vQu7o9hd0kAIQ== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp01.mail.de (Postfix) with ESMTPSA id 1C0A32400C1; Wed, 12 Jun 2024 22:54:18 +0200 (CEST) From: Sebastian Kropatsch To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] arm64: dts: rockchip: Fix regulators, gmac and naming on NanoPi R6C/R6S Date: Wed, 12 Jun 2024 22:48:11 +0200 Message-ID: <20240612205056.397204-3-seb-dev@mail.de> In-Reply-To: <20240612205056.397204-1-seb-dev@mail.de> References: <20240612205056.397204-1-seb-dev@mail.de> MIME-Version: 1.0 X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 13773 X-purgate-ID: 154282::1718225658-FE5BF670-DCDCD406/0/0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240612_135426_803794_A9D2B6E1 X-CRM114-Status: GOOD ( 14.67 ) 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 Fix the alphabetical ordering in some nodes and rename some regulators and pins to match the schematics [1][2] as well as to adhere to preferred naming schemes. In addition to that: * vcc_3v3_sd_s0: Fix voltage to be 3.3V * vcc3v3_pcie: - Move to NanoPi R6C, this power switch is not available on R6S - Fix vin-supply (is vcc_5v0 per schematics) - Add gpios/pincrtl to enable power * vcc5v0_usb: Remove this regulator since according to the schematics, vcc5v0_host_20 and vcc5v0_usb_otg0 are directly powered by vcc_5v0 * gmac1: Add rx_delay of 0 (no delay since phy-mode = "rgmii-rxid") * rgmii_phy1: Add phy-supply as seen in schematics * pcie2*: - Add pinctrl reset pins - Update vpcie3v3-supply to match the schematics * sdhci: Add vmmc-supply and vqmmc-supply Links: [1] https://wiki.friendlyelec.com/wiki/images/f/f7/NanoPi_R6C_2302_SCH.PDF [2] https://wiki.friendlyelec.com/wiki/images/2/2f/NanoPi_R6S_2208_SCH.PDF Fixes: f1b11f43b3e9 ("arm64: dts: rockchip: Add support for NanoPi R6S") Signed-off-by: Sebastian Kropatsch --- I didn't want to spam many patches with small fixes/improvements, so this one patch includes lots of small changes. Let me know if another method is preferred :) --- .../boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 169 +++++++++--------- .../boot/dts/rockchip/rk3588s-nanopi-r6c.dts | 28 +++ .../boot/dts/rockchip/rk3588s-nanopi-r6s.dts | 5 + 3 files changed, 122 insertions(+), 80 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi index e68d4071400e..8b90bae28302 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi @@ -21,7 +21,7 @@ chosen { stdout-path = "serial2:1500000n8"; }; - adc-keys { + adc-key-maskrom { compatible = "adc-keys"; io-channels = <&saradc 0>; io-channel-names = "buttons"; @@ -41,10 +41,10 @@ gpio-keys { pinctrl-0 = <&key1_pin>; button-user { - label = "User"; - linux,code = ; - gpios = <&gpio1 RK_PC0 GPIO_ACTIVE_LOW>; debounce-interval = <50>; + gpios = <&gpio1 RK_PC0 GPIO_ACTIVE_LOW>; + label = "User Button"; + linux,code = ; }; }; @@ -80,26 +80,27 @@ lan2_led: led-3 { }; }; - vcc5v0_sys: vcc5v0-sys-regulator { + vcc_5v0: regulator-vcc-5v0 { compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; + regulator-name = "vcc_5v0"; }; - vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { + vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 { compatible = "regulator-fixed"; - regulator-name = "vcc_1v1_nldo_s3"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; - vin-supply = <&vcc5v0_sys>; + regulator-name = "vcc_1v1_nldo_s3"; + vin-supply = <&vcc_5v0>; }; - vcc_3v3_s0: vcc-3v3-s0-regulator { + /* SY6280AAC power switch (U3824 in schematics) */ + vcc_3v3_s0: regulator-vcc-3v3-s0 { compatible = "regulator-fixed"; regulator-always-on; regulator-boot-on; @@ -109,61 +110,45 @@ vcc_3v3_s0: vcc-3v3-s0-regulator { vin-supply = <&vcc_3v3_s3>; }; - vcc_3v3_sd_s0: vcc-3v3-sd-s0-regulator { + vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 { compatible = "regulator-fixed"; enable-active-high; gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&sd_s0_pwr>; - regulator-name = "vcc_3v3_sd_s0"; - regulator-boot-on; - regulator-max-microvolt = <3000000>; - regulator-min-microvolt = <3000000>; - vin-supply = <&vcc_3v3_s3>; - }; - - vcc_3v3_pcie20: vcc3v3-pcie20-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc_3v3_pcie20"; - regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "vcc_3v3_sd_s0"; vin-supply = <&vcc_3v3_s3>; }; - vcc5v0_usb: vcc5v0-usb-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_usb"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc5v0_usb_otg0: vcc5v0-usb-otg0-regulator { + /* SY6280AAC power switch (U9539 in schematics) */ + /* For USB 2.0 Type-A port */ + vcc_5v0_host_20: regulator-vcc-5v0-host-20 { compatible = "regulator-fixed"; enable-active-high; - gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&typec5v_pwren>; - regulator-name = "vcc5v0_usb_otg0"; + pinctrl-0 = <&usb_host_pwren_h>; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v0_usb>; + regulator-name = "vcc_5v0_host_20"; + vin-supply = <&vcc_5v0>; }; - vcc5v0_host_20: vcc5v0-host-20-regulator { + /* SY6280AAC power switch (U9538 in schematics) */ + /* For USB 3.0 Type-A port */ + vcc5v0_usb_otg0: regulator-vcc5v0-usb-otg0 { compatible = "regulator-fixed"; enable-active-high; - gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&vcc5v0_host20_en>; - regulator-name = "vcc5v0_host_20"; + pinctrl-0 = <&typec5v_pwren_h>; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&vcc5v0_usb>; + regulator-name = "vcc5v0_usb_otg0"; + vin-supply = <&vcc_5v0>; }; }; @@ -211,12 +196,13 @@ &gmac1 { clock_in_out = "output"; phy-handle = <&rgmii_phy1>; phy-mode = "rgmii-rxid"; + pinctrl-names = "default"; pinctrl-0 = <&gmac1_miim &gmac1_tx_bus2 &gmac1_rx_bus2 &gmac1_rgmii_clk &gmac1_rgmii_bus>; - pinctrl-names = "default"; + rx_delay = <0x00>; tx_delay = <0x42>; status = "okay"; }; @@ -230,13 +216,13 @@ 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-name = "vdd_cpu_big0_s0"; regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc_5v0>; regulator-state-mem { regulator-off-in-suspend; @@ -247,13 +233,13 @@ 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-name = "vdd_cpu_big1_s0"; regulator-ramp-delay = <2300>; - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc_5v0>; regulator-state-mem { regulator-off-in-suspend; @@ -268,13 +254,13 @@ 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-name = "vdd_npu_s0"; regulator-ramp-delay = <2300>; - regulator-boot-on; - regulator-always-on; - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc_5v0>; regulator-state-mem { regulator-off-in-suspend; @@ -293,35 +279,43 @@ hym8563: rtc@51 { reg = <0x51>; #clock-cells = <0>; clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&rtc_int>; interrupt-parent = <&gpio0>; interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&rtc_int>; wakeup-source; }; }; +/* RTL8211F-CG Ethernet */ &mdio1 { rgmii_phy1: ethernet-phy@1 { compatible = "ethernet-phy-id001c.c916"; reg = <0x1>; + phy-supply = <&vcc_3v3_s0>; pinctrl-names = "default"; - pinctrl-0 = <&rtl8211f_rst>; + pinctrl-0 = <&gmac1_rstn_l>; reset-assert-us = <20000>; reset-deassert-us = <100000>; reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; }; }; +/* RTL8125BG Ethernet */ &pcie2x1l1 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie20x1_1_perstn_m2>; reset-gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc_3v3_pcie20>; + vpcie3v3-supply = <&vcc_3v3_s3>; status = "okay"; }; +/* R6C: M.2 M-Key socket */ +/* R6S: RTL8125BG Ethernet */ &pcie2x1l2 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie20x1_2_perstn_m0>; reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc_3v3_pcie20>; status = "okay"; }; @@ -360,24 +354,34 @@ rtc_int: rtc-int { }; }; + pcie { + pcie20x1_1_perstn_m2: pcie2x1-1-rst { + rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + pcie20x1_2_perstn_m0: pcie2x1-2-rst { + rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + sdmmc { - sd_s0_pwr: sd-s0-pwr { + sd_s0_pwr: sd-pwr { rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; }; }; usb { - typec5v_pwren: typec5v-pwren { + typec5v_pwren_h: usb3-pwren { rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; }; - vcc5v0_host20_en: vcc5v0-host20-en { + usb_host_pwren_h: usb2-pwren { rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; rtl8211f { - rtl8211f_rst: rtl8211f-rst { + gmac1_rstn_l: rtl8211f-rst { rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -388,15 +392,19 @@ &saradc { status = "okay"; }; +/* eMMC */ &sdhci { bus-width = <8>; - no-sdio; + mmc-hs200-1_8v; no-sd; + no-sdio; non-removable; - mmc-hs200-1_8v; + vmmc-supply = <&vcc_3v3_s3>; + vqmmc-supply = <&vcc_1v8_s3>; status = "okay"; }; +/* microSD card */ &sdmmc { bus-width = <4>; cap-sd-highspeed; @@ -411,16 +419,15 @@ &sdmmc { }; &spi2 { - status = "okay"; assigned-clocks = <&cru CLK_SPI2>; assigned-clock-rates = <200000000>; + num-cs = <1>; pinctrl-names = "default"; pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>; - num-cs = <1>; + status = "okay"; - pmic@0 { + rk806_single: pmic@0 { compatible = "rockchip,rk806"; - spi-max-frequency = <1000000>; reg = <0x0>; interrupt-parent = <&gpio0>; @@ -430,23 +437,24 @@ pmic@0 { 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>; + vcc1-supply = <&vcc_5v0>; + vcc2-supply = <&vcc_5v0>; + vcc3-supply = <&vcc_5v0>; + vcc4-supply = <&vcc_5v0>; + vcc5-supply = <&vcc_5v0>; + vcc6-supply = <&vcc_5v0>; + vcc7-supply = <&vcc_5v0>; + vcc8-supply = <&vcc_5v0>; + vcc9-supply = <&vcc_5v0>; + vcc10-supply = <&vcc_5v0>; vcc11-supply = <&vcc_2v0_pldo_s3>; - vcc12-supply = <&vcc5v0_sys>; + vcc12-supply = <&vcc_5v0>; vcc13-supply = <&vcc_1v1_nldo_s3>; vcc14-supply = <&vcc_1v1_nldo_s3>; - vcca-supply = <&vcc5v0_sys>; + vcca-supply = <&vcc_5v0>; gpio-controller; #gpio-cells = <2>; @@ -745,10 +753,11 @@ &u2phy2 { }; &u2phy2_host { - phy-supply = <&vcc5v0_host_20>; + phy-supply = <&vcc_5v0_host_20>; status = "okay"; }; +/* Debug UART */ &uart2 { pinctrl-0 = <&uart2m0_xfer>; status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts index ccc5e4627517..24dcd3e07ea7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts @@ -7,8 +7,36 @@ / { model = "FriendlyElec NanoPi R6C"; compatible = "friendlyarm,nanopi-r6c", "rockchip,rk3588s"; + + /* MP2143DJ power switch (U9536 in schematics) */ + vcc3v3_pcie: regulator-vcc3v3-pcie { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie20x1_2_con_pwren>; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc3v3_pcie"; + vin-supply = <&vcc_5v0>; + }; }; &lan2_led { label = "user_led"; }; + +/* M.2 M-Key socket */ +&pcie2x1l2 { + vpcie3v3-supply = <&vcc3v3_pcie>; +}; + +&pinctrl { + pcie { + pcie20x1_2_con_pwren: pcie20x1-2-con-pwren { + rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts index 9c3e0b0daaac..d24110b6cf5d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts @@ -12,3 +12,8 @@ / { &lan2_led { label = "lan2_led"; }; + +/* RTL8125BG Ethernet */ +&pcie2x1l2 { + vpcie3v3-supply = <&vcc_3v3_s3>; +}; From patchwork Wed Jun 12 20:48:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Kropatsch X-Patchwork-Id: 13695565 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 06D97C27C77 for ; Wed, 12 Jun 2024 20:54:34 +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=BNPwTHW4b1xkJnvZJTJWpQ4IvoWJVdFFZT4wtLNrP68=; b=lRDdxd5s/W6XcI 8f7ZrD27g4Vr903dT6qh/kVazQu14JJOc55KBDJKCXi5qPRNoFcF2XTICNzFYYkUXwlFIWX3T9Vmf iifrSL4/wFwNf2RN+cj6Anp2ht+LF9EnE5FTZ9q56EXy2l6hvYYE7Pv8A4iHAncJyel8L0iUZWljs nacEQePkgllWnw5YX0B0sy6vsV6B+lXBBXBSF+XtJ9/JMePJKeKEq71293DsoNTnY0VdseSEb12UG VINfqI+N/zCbLyFTsBycPep8TSbyXzsz2bHIjFm7rR6QsdcV2/rJkfoPnJII89wHIqkeIHhyOKd49 BrhcYHzBzmZ6YKMzQSFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHUzF-0000000E6EW-1auH; Wed, 12 Jun 2024 20:54:29 +0000 Received: from shout11.mail.de ([2001:868:100:600::f153]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHUz9-0000000E6Bl-17dc; Wed, 12 Jun 2024 20:54:24 +0000 Received: from shout01.mail.de (unknown [10.0.120.221]) by shout11.mail.de (Postfix) with ESMTPS id 55537240CA1; Wed, 12 Jun 2024 22:54:19 +0200 (CEST) Received: from postfix02.mail.de (postfix02.bt.mail.de [10.0.121.126]) by shout01.mail.de (Postfix) with ESMTP id 3A2572405B9; Wed, 12 Jun 2024 22:54:19 +0200 (CEST) Received: from smtp01.mail.de (smtp01.bt.mail.de [10.0.121.211]) by postfix02.mail.de (Postfix) with ESMTP id 160ABA00E2; Wed, 12 Jun 2024 22:54:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1718225659; bh=VCtcBjloeq2TIukMSshtT2aha3mHch2VVQdqj442tJI=; h=From:To:Cc:Subject:Date:Message-ID:From:To:CC:Subject:Reply-To; b=G9umbXzZXXiTuADQjt/FVnCK5JxcQmZjRtkKNWKUeDiizAAs/1ppi3W6uzJo6JKCG f8HDwt46AePF1tax0vYik1sVnDJ+hXzhJAEIlDCvUjaCFwqSYYpqXMxHxRZF72DwXu B1emLH7BK1KMvie06ds4LV+zs9Mw9B3tQepKKoz4RzddFIOJ1+UV7ifAen881hTnED FUXzFNkd0qqeveIqEoIQM6MNZxPe7ZFeS/hIHGFd54JuEYRRBVnds3ub4hiTeohm0B Q6JnUXGbYp5FdSX7WYpgtLiCFzWFoZkloOQ/jGtt8EH426jW2CXzOsEj9o1Ee05HJC +YuKw6QCC87xA== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp01.mail.de (Postfix) with ESMTPSA id 9B129240A39; Wed, 12 Jun 2024 22:54:18 +0200 (CEST) From: Sebastian Kropatsch To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] arm64: dts: rockchip: Improve LEDs on NanoPi R6C/R6S Date: Wed, 12 Jun 2024 22:48:12 +0200 Message-ID: <20240612205056.397204-4-seb-dev@mail.de> In-Reply-To: <20240612205056.397204-1-seb-dev@mail.de> References: <20240612205056.397204-1-seb-dev@mail.de> MIME-Version: 1.0 X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 6197 X-purgate-ID: 154282::1718225658-FE5BF670-7FE753F2/0/0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240612_135423_499244_AEF0AE1E X-CRM114-Status: GOOD ( 15.88 ) 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 Move led-3 node into NanoPi R6C/R6S's source files since they have different functionalities on each board: On the R6S this LED is used to signal LAN2 link up, while on the R6C this LED does not have a pre-defined purpose. In addition to that: - Remove deprecated label property - Add color and function properties - Add linux,default-trigger to trigger on Ethernet link Signed-off-by: Sebastian Kropatsch --- DT validation doesn't like the 'linux,default-trigger = "stmmac-0:01:link"' properties, since "*:link" is not a valid value according to [Documentation/devicetree/bindings/leds/common.yaml]. These LEDs do have the specific purpose to show if an Ethernet link is up though. There is one LED for each Ethernet port and they are labeled WAN and LAN. Using the 'linux,default-trigger' like this does work perfectly fine with this solution. I could not find another way to achieve this. Please let me know if there is a better way. Maybe it would also be valid to add an entry to the DT bindings file to allow "*:link" as a value for 'linux,default-trigger'? The same problem also applies to the NanoPi R5C/R5S which also has these LEDs to show Ethernet link up, although in their current DT these LEDs are simply not functional. --- .../boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 32 +++++++------------ .../boot/dts/rockchip/rk3588s-nanopi-r6c.dts | 22 ++++++++++--- .../boot/dts/rockchip/rk3588s-nanopi-r6s.dts | 26 +++++++++++++-- 3 files changed, 54 insertions(+), 26 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi index 8b90bae28302..69d0f1f2349b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi @@ -8,6 +8,7 @@ #include #include #include +#include #include "rk3588s.dtsi" / { @@ -52,7 +53,8 @@ leds { compatible = "gpio-leds"; sys_led: led-0 { - label = "sys_led"; + color = ; + function = LED_FUNCTION_HEARTBEAT; gpios = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; pinctrl-names = "default"; @@ -60,24 +62,22 @@ sys_led: led-0 { }; wan_led: led-1 { - label = "wan_led"; + color = ; + function = LED_FUNCTION_WAN; gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "stmmac-0:01:link"; pinctrl-names = "default"; pinctrl-0 = <&wan_led_pin>; }; lan1_led: led-2 { - label = "lan1_led"; + color = ; + function = LED_FUNCTION_LAN; gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "r8169-3-3100:00:link"; pinctrl-names = "default"; pinctrl-0 = <&lan1_led_pin>; }; - - lan2_led: led-3 { - gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lan2_led_pin>; - }; }; vcc_5v0: regulator-vcc-5v0 { @@ -328,23 +328,15 @@ key1_pin: key1-pin { gpio-leds { sys_led_pin: sys-led-pin { - rockchip,pins = - <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; }; wan_led_pin: wan-led-pin { - rockchip,pins = - <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; }; lan1_led_pin: lan1-led-pin { - rockchip,pins = - <1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - lan2_led_pin: lan2-led-pin { - rockchip,pins = - <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts index 24dcd3e07ea7..d1b6aa033abc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts @@ -8,6 +8,18 @@ / { model = "FriendlyElec NanoPi R6C"; compatible = "friendlyarm,nanopi-r6c", "rockchip,rk3588s"; + leds { + compatible = "gpio-leds"; + + led1_led: led-3 { + color = ; + function = "led1"; + gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&led1_led_pin>; + }; + }; + /* MP2143DJ power switch (U9536 in schematics) */ vcc3v3_pcie: regulator-vcc3v3-pcie { compatible = "regulator-fixed"; @@ -24,16 +36,18 @@ vcc3v3_pcie: regulator-vcc3v3-pcie { }; }; -&lan2_led { - label = "user_led"; -}; - /* M.2 M-Key socket */ &pcie2x1l2 { vpcie3v3-supply = <&vcc3v3_pcie>; }; &pinctrl { + gpio-leds { + led1_led_pin: led1-led-pin { + rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + pcie { pcie20x1_2_con_pwren: pcie20x1-2-con-pwren { rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts index d24110b6cf5d..09afbc0a2581 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts @@ -7,13 +7,35 @@ / { model = "FriendlyElec NanoPi R6S"; compatible = "friendlyarm,nanopi-r6s", "rockchip,rk3588s"; + + leds { + compatible = "gpio-leds"; + + lan2_led: led-3 { + color = ; + function = LED_FUNCTION_LAN; + function-enumerator = <2>; + gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "r8169-4-4100:00:link"; + pinctrl-names = "default"; + pinctrl-0 = <&lan2_led_pin>; + }; + }; }; -&lan2_led { - label = "lan2_led"; +&lan1_led { + function-enumerator = <1>; }; /* RTL8125BG Ethernet */ &pcie2x1l2 { vpcie3v3-supply = <&vcc_3v3_s3>; }; + +&pinctrl { + gpio-leds { + lan2_led_pin: lan2-led-pin { + rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; From patchwork Wed Jun 12 20:48:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Kropatsch X-Patchwork-Id: 13695568 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 22B0AC27C75 for ; Wed, 12 Jun 2024 20:54:51 +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=1dcXwRq+pKgfU2SvbOYJ4NXymijXr3LGqfoHFplcxYU=; b=qVS6ZY0qe56pzm ltBkJOcb9vDL2+TvAJ/n79pR1Ff5Php8QZtwrOhqOQcWXcyhnyxPv4z/EZTVLt/KVZNVtai98sM2l Jub1clhkm1R/ccDHKos6yQ/jjSbmLEPcSttOAUS8/0jtZxiskAJHcXsVS3vOhkygbtv5T9yzTpY1S HNFctTB396sXnub2FusxR5LUqFWyQChxVAekNvL/egKQ2GG1mRYExTkLji4RQjLJ/Htz5K5AuQWD/ 70ZQg2R/Q2MLvPTu5YaDIPlYPJQdQvj+Z9Xn6EZJ0S6BXM0Jj63OYjhMN+lIE7sfDbVdonqJmozxD 3b9mn1u/Kl/RqWqLtQ/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHUzX-0000000E6QV-0TQv; Wed, 12 Jun 2024 20:54:47 +0000 Received: from shout12.mail.de ([2001:868:100:600::f154]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHUzE-0000000E6DV-21Nm; Wed, 12 Jun 2024 20:54:29 +0000 Received: from shout02.mail.de (unknown [10.0.120.222]) by shout12.mail.de (Postfix) with ESMTPS id 6B134241947; Wed, 12 Jun 2024 22:54:20 +0200 (CEST) Received: from postfix03.mail.de (postfix03.bt.mail.de [10.0.121.127]) by shout02.mail.de (Postfix) with ESMTP id 542CB240B18; Wed, 12 Jun 2024 22:54:20 +0200 (CEST) Received: from smtp01.mail.de (smtp01.bt.mail.de [10.0.121.211]) by postfix03.mail.de (Postfix) with ESMTP id 3320480192; Wed, 12 Jun 2024 22:54:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1718225660; bh=BvUjBepg9rtChkeT/pdj72DFwlLCiHqhtDRbHO1RpT8=; h=From:To:Cc:Subject:Date:Message-ID:From:To:CC:Subject:Reply-To; b=Xv3IXYUrqafsca3VME6fWD8IiJ3nt1og0+DXjskBitKFPJxsDC965JFd4S7ChlpY7 0ixR5w1dnZsZb9xt4ZFM9+G39Ql+/aTSKPhwF9HXtRkP0QLG7R62ZxTOgCd3HvB93X RXQx6uwFVWSvNdvjctYGeKrYT+hLvmW36YF29tSPzyv8LTwAouwLYRBcwzPbNMYWR7 maFfFrhl/Sdqi6YJbE//Qh14egbjgfA3qwe0GkafI2e470eBMyrL0WTBabuNO0X0eH g0hJIH+j0Iwj6HflJY7VBgaWpR55FTwUxmJuULy6QJy7CuwHKqnMQNzFkWBTa8vRf9 anOXKckBUeLdw== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp01.mail.de (Postfix) with ESMTPSA id 251F52400C1; Wed, 12 Jun 2024 22:54:19 +0200 (CEST) From: Sebastian Kropatsch To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] arm64: dts: rockchip: Enable lower USB3 port on NanoPi R6C/R6S Date: Wed, 12 Jun 2024 22:48:13 +0200 Message-ID: <20240612205056.397204-5-seb-dev@mail.de> In-Reply-To: <20240612205056.397204-1-seb-dev@mail.de> References: <20240612205056.397204-1-seb-dev@mail.de> MIME-Version: 1.0 X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 1458 X-purgate-ID: 154282::1718225659-FE5BF670-EFB7948E/0/0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240612_135428_729328_11BE8A10 X-CRM114-Status: UNSURE ( 7.97 ) 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 support for the lower USB 3.0 Type-A port on the NanoPi R6C and NanoPi R6S. The upper USB 2.0 Type-A port is already supported. Signed-off-by: Sebastian Kropatsch --- .../boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi index 69d0f1f2349b..9676e7194451 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi @@ -740,6 +740,17 @@ &tsadc { status = "okay"; }; +/* USB2 PHY for USB 3.0 Type-A (lower port)*/ +&u2phy0 { + status = "okay"; +}; + +&u2phy0_otg { + phy-supply = <&vcc5v0_usb_otg0>; + status = "okay"; +}; + +/* USB2 PHY for USB 2.0 Type-A (upper port)*/ &u2phy2 { status = "okay"; }; @@ -755,10 +766,27 @@ &uart2 { status = "okay"; }; +/* USB 2.0 Type-A (upper port) */ +/* PHY: <&u2phy2_host> */ &usb_host0_ehci { status = "okay"; }; +/* USB 2.0 Type-A (upper port) */ +/* PHY: <&u2phy2_host> */ &usb_host0_ohci { status = "okay"; }; + +/* USB 3.0 Type-A (lower port) */ +/* PHYs: <&u2phy0_otg>, <&usbdp_phy0> */ +&usb_host0_xhci { + dr_mode = "host"; + extcon = <&u2phy0>; + status = "okay"; +}; + +/* USB3 PHY for USB 3.0 Type-A (lower port)*/ +&usbdp_phy0 { + status = "okay"; +}; From patchwork Wed Jun 12 20:48:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Kropatsch X-Patchwork-Id: 13695569 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 C149CC27C53 for ; Wed, 12 Jun 2024 20:55: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: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=almLFX1N2inRebK7zSm08wAo5f06pNG/MauNjcQC+Xk=; b=Hvciu5LovJkkuG s2TFAFS5C/hWjBFQKDSAd46pra6XOqMP7hREBNUfeCKQuTJux8JVSRWE5CWE619TNUDeKUy9fMoiz zbHjjZTKSaTwNiOYsKFYPpiSffeQw89GmtJFNlQZtUnmA6hCUIGWLb/gFfppKy1Bp9pMjQ+BKThtU zjyGM8GG4b2w/xe5IMPlusXVIWw45VhX3j6Y0vohJHNwrin00uGWZnS36id/s6szH1GmWgfErlXuw sMX64GFCT3t1Y8/nVmTmQuKWOlG80ZroQnUiHzCSMOq4Yj6mXCf79CGT0orR43UXrFSSNTnzu3bjF E1BaTpq+dZlfrmJMJ9Dw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHUzh-0000000E6aB-10XN; Wed, 12 Jun 2024 20:54:57 +0000 Received: from shout12.mail.de ([2001:868:100:600::f154]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHUzF-0000000E6EP-2mgn; Wed, 12 Jun 2024 20:54:31 +0000 Received: from shout01.mail.de (unknown [10.0.120.221]) by shout12.mail.de (Postfix) with ESMTPS id 0B797241949; Wed, 12 Jun 2024 22:54:21 +0200 (CEST) Received: from postfix01.mail.de (postfix01.bt.mail.de [10.0.121.125]) by shout01.mail.de (Postfix) with ESMTP id E62722405B9; Wed, 12 Jun 2024 22:54:20 +0200 (CEST) Received: from smtp01.mail.de (smtp01.bt.mail.de [10.0.121.211]) by postfix01.mail.de (Postfix) with ESMTP id C6BD68016E; Wed, 12 Jun 2024 22:54:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1718225660; bh=X/r/oHMy8dOwR8VKQt0p0IMSLPiew0x6KHjtkpK4Q7M=; h=From:To:Cc:Subject:Date:Message-ID:From:To:CC:Subject:Reply-To; b=lDhlTD5Kv+jOfeVrYfJo0m45ybKSOinIQlktcMl5tem0Hhv1LnueMppD4D3hgcBg0 c1mz1wG13LHivrN9YlWPeiRRVdl1jSdZKft2Zn7fWnkAGfqEPl0IEH3s0MyZoWea2+ Jy6c/mK99//RkhBvxQ/a72IXWcrhE+ZBLSkkp5lsdpX9oLG21hkdoZgrx12hmqan72 Bd828D8kIj7192kiNLnWp2Jrs1/HH8zrg1P8MmR1V8x7UZej/PWvehXc58J2iHUFXe dfzM5ilw/7AqEWgRgo0vXGGn+l9G1HvlCk6nuLGMHtzmEUReOc7uUJLFlKyzdZ4F5Y B5GzCG46inNbw== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp01.mail.de (Postfix) with ESMTPSA id 444B6240EB5; Wed, 12 Jun 2024 22:54:20 +0200 (CEST) From: Sebastian Kropatsch To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] arm64: dts: rockchip: Enable GPU on NanoPi R6C/R6S Date: Wed, 12 Jun 2024 22:48:14 +0200 Message-ID: <20240612205056.397204-6-seb-dev@mail.de> In-Reply-To: <20240612205056.397204-1-seb-dev@mail.de> References: <20240612205056.397204-1-seb-dev@mail.de> MIME-Version: 1.0 X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 760 X-purgate-ID: 154282::1718225660-FE5BF670-E64745C7/0/0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240612_135429_866438_62B62BB9 X-CRM114-Status: UNSURE ( 7.54 ) 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 Mali GPU on the FriendlyElec NanoPi R6C and R6S. Signed-off-by: Sebastian Kropatsch --- arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi index 9676e7194451..3620677dc7b4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi @@ -207,6 +207,12 @@ &gmac1_rgmii_clk status = "okay"; }; +&gpu { + mali-supply = <&vdd_gpu_s0>; + sram-supply = <&vdd_gpu_mem_s0>; + status = "okay"; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0m2_xfer>;