From patchwork Fri Sep 9 19:50:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 12972107 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 1BCD1ECAAA1 for ; Fri, 9 Sep 2022 19:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=Fr8DdoL5fZm0PLfZild9AUEeAaMM5PQEpfINrYsfH0E=; b=I+g6ZyaiqrCb2H S8WlBlIiX1w/DiHPsbS54AAMgcptr6stbJr6zxYMQj+ZKTusEVCmiYQ6/NI//lLrRel58RfEuRsws Jh9hzH3xqOD2kwpRXDmlszk/p/PBngJl836B9csLHWQHNHHndKGE6QcR0AO3gxTgw7jOgd2YZUXEU UUL0PHfPh5MtapbFitTS/HO/2/Kx0RpTenMl7OeiOhhhPJTSnLHglk2e5Cdeye1DThamNGGkfjhGp ZY9/C+O9MC9O41zGhq72XHzNDFvlM5wKFmyrn8eKgBNc36CTjS2MtjJ892UsLhooDnfi4JKHuJb21 jCwsNNyHu7lWFhklfZSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2l-002CPc-TW; Fri, 09 Sep 2022 19:52:03 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2k-002CM7-Br; Fri, 09 Sep 2022 19:52:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=GBUegw456x7lyB5+ywCsGuP/n7U5Q8gK4QGnXYy6myY=; b=n76EZXelQKZhdPba2dIceOWlvr iPEbFn4uAa2N8kAKwdmxOgig+kxCbXI3f/oSN8XTa0kd0/mNuRwGOXu6vDhIVrmZN/KhucQCbW9ct fO0kHLH0V29Y3QnHaenuyyFVf7+4saYEDifodV2dcCbZvC44sXwGsTqyeSz734WGUI6+k1Ac/kALS tqBDUJWjZBWdkZ2iUqGbnmxXDMg/XQku89yLczZcxhYFBQ+Ud/z/HQykv1ANR8vqJmuJnEKk1lgAZ lf1e2QLsSBA5DF0NyxQb1OzzH6TjYsS1wiycdJ/Ydy8d1BZIIeZIbSdnGeDWETYyUbFnj36T6+zKS HBl4+eIQ==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2d-00DWYI-TG; Fri, 09 Sep 2022 19:52:02 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 289Joxei025079; Sat, 10 Sep 2022 04:51:00 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH 1/6] arm64: dts: rockchip: rk3399-rock-4c-plus: connect vcca_1v8 to APIO5_VDD Date: Fri, 9 Sep 2022 19:50:01 +0000 Message-Id: <20220909195006.127957-1-naoki@radxa.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220909_205156_470594_A6468BAD X-CRM114-Status: UNSURE ( 7.24 ) 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 GPIO pins for LEDs on ROCK 4C+ are in APIO5 Signed-off-by: FUKAUMI Naoki --- arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts index 3f01772c66ad..d7051b5d4904 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts @@ -427,6 +427,7 @@ &i2s2 { &io_domains { bt656-supply = <&vcc_3v0>; + audio-supply = <&vcca_1v8>; gpio1830-supply = <&vcc_3v0>; sdmmc-supply = <&vccio_sd>; status = "okay"; From patchwork Fri Sep 9 19:50:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 12972108 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 D54D7ECAAA1 for ; Fri, 9 Sep 2022 19:52:19 +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=mpHvy+CIpQXP+TRmop7Oqk0uEZd270KjOjnaryqZT14=; b=QIoYEAsISoxX2Z DF9KbkszzO3CGQK3SBTq4YsSO6Cs7ZdyOzKo6N0lP/AOsiNr9b/clelYmsSwRsJpRvnkSEybSNT3s pIWpRnU8O0mzowC/NOR6NmONAdqLWtYMuaa5XAeXvgsPHN1RQDDCwY2pirF9ehVnPgJG2r5qy3yOu cfIlrA6z0ph3Alnths/58SqTSen4zaC+ZsOkXTvANjosAqigPLu0TmX/oQyaoO9hDCIFAkQE1BdtF fAxAlxTVBQ9bDYUQdNGC30NdX0Rv/K5sZGhipCz8eqVmZyfKz5ehGDvfOIrWaHOvJczLwvCXIJC4p siXKmNEeb6Je87sCGTWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2m-002CPp-6s; Fri, 09 Sep 2022 19:52:04 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2k-002CMA-Bu; Fri, 09 Sep 2022 19:52:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=LatpASvDqEcpIsWcU7+NrsGu31twO0yFAzCKrTG1BKM=; b=LiIoOwyTsX+R6VYFCLn4soyr0k aMtHgjAUUT7L1n/MckohU7uoCzJwetiQfOQowjq1zmtqydXozhwpna5p2MnW+OEUISynH+cTC7ZHK MGfeFBc6BLx2mFK+tV1Gamw9WA4hpgJMi2qHZ5UxliwMMO+4yTlBxj41qE/Yd9aC+nU0yMuvc0STT Q3I/yhQ+kBpSgbRM1cU7XSSfj4q3hEqVuuE8y5/srVSRFYVMVudmUsjn8QzjZGDdMWvt0GIqe1lMq DCU0ST3gAQJfKzoSU5vX7WvQVBte+jvlvbU/EI6rbYmRM6TyHHCM9iZRDq34DhIDkyrAPTjQHKXoS Zl/v09uw==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2d-00DWYH-TC; Fri, 09 Sep 2022 19:52:02 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 289Joxej025079; Sat, 10 Sep 2022 04:51:00 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH 2/6] arm64: dts: rockchip: rk3399-rock-4c-plus: fix regulator name Date: Fri, 9 Sep 2022 19:50:02 +0000 Message-Id: <20220909195006.127957-2-naoki@radxa.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220909195006.127957-1-naoki@radxa.com> References: <20220909195006.127957-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220909_205156_470653_F04EC374 X-CRM114-Status: UNSURE ( 7.72 ) 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 fix regulator name. also, add vcc_3v3 and vdd_log. ref: https://dl.radxa.com/rockpi4/docs/hw/rockpi4/rockpi4c_plus_v12_sch_220304.pdf Signed-off-by: FUKAUMI Naoki --- .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 83 ++++++++++++------- 1 file changed, 52 insertions(+), 31 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts index d7051b5d4904..c88a7512e296 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts @@ -61,6 +61,16 @@ led-1 { }; }; + vcc_3v3: vcc-3v3-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_3v3"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc3v3_sys>; + }; + vcc5v0_sys: vcc5v0-sys-regulator { compatible = "regulator-fixed"; regulator-name = "vcc5v0_sys"; @@ -94,13 +104,24 @@ vcc5v0_typec: vcc5v0-typec-regulator { vin-supply = <&vcc5v0_sys>; }; - vcc_lan: vcc3v3-phy-regulator { + vcc3v3_phy1: vcc3v3-phy1-regulator { compatible = "regulator-fixed"; - regulator-name = "vcc_lan"; + regulator-name = "vcc3v3_phy1"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_3v3>; + }; + + vdd_log: vdd-log-regulator { + compatible = "regulator-fixed"; + regulator-name = "vdd_log"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <950000>; + vin-supply = <&vcc5v0_sys>; }; }; @@ -136,7 +157,7 @@ &gmac { assigned-clocks = <&cru SCLK_RMII_SRC>; assigned-clock-parents = <&clkin_gmac>; clock_in_out = "input"; - phy-supply = <&vcc_lan>; + phy-supply = <&vcc3v3_phy1>; phy-mode = "rgmii"; pinctrl-names = "default"; pinctrl-0 = <&rgmii_pins>; @@ -186,20 +207,20 @@ rk809: pmic@20 { vcc2-supply = <&vcc5v0_sys>; vcc3-supply = <&vcc5v0_sys>; vcc4-supply = <&vcc5v0_sys>; - vcc5-supply = <&vcc_buck5>; - vcc6-supply = <&vcc_buck5>; + vcc5-supply = <&vcc_buck5_s3>; + vcc6-supply = <&vcc_buck5_s3>; vcc7-supply = <&vcc5v0_sys>; vcc8-supply = <&vcc3v3_sys>; vcc9-supply = <&vcc5v0_sys>; regulators { - vdd_log: DCDC_REG1 { + vdd_center: DCDC_REG1 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <750000>; regulator-max-microvolt = <1350000>; regulator-initial-mode = <0x2>; - regulator-name = "vdd_log"; + regulator-name = "vdd_center"; regulator-state-mem { regulator-off-in-suspend; regulator-suspend-microvolt = <900000>; @@ -242,59 +263,59 @@ regulator-state-mem { }; }; - vcc_buck5: DCDC_REG5 { + vcc_buck5_s3: DCDC_REG5 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-name = "vcc_buck5"; + regulator-name = "vcc_buck5_s3"; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <3300000>; }; }; - vcca_0v9: LDO_REG1 { + vcc_0v9_s3: LDO_REG1 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <900000>; regulator-max-microvolt = <900000>; - regulator-name = "vcca_0v9"; + regulator-name = "vcc_0v9_s3"; regulator-state-mem { regulator-off-in-suspend; }; }; - vcc_1v8: LDO_REG2 { + vcc_1v8_s3: LDO_REG2 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "vcc_1v8"; + regulator-name = "vcc_1v8_s3"; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; }; }; - vcc0v9_soc: LDO_REG3 { + vcc_0v9_s0: LDO_REG3 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <900000>; regulator-max-microvolt = <900000>; - regulator-name = "vcc0v9_soc"; + regulator-name = "vcc_0v9_s0"; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <900000>; }; }; - vcca_1v8: LDO_REG4 { + vcc_1v8_s0: LDO_REG4 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - regulator-name = "vcca_1v8"; + regulator-name = "vcc_1v8_s0"; regulator-state-mem { regulator-off-in-suspend; }; @@ -311,34 +332,34 @@ regulator-state-mem { }; }; - vcc_1v5: LDO_REG6 { + vcc_1v5_s0: LDO_REG6 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; - regulator-name = "vcc_1v5"; + regulator-name = "vcc_1v5_s0"; regulator-state-mem { regulator-off-in-suspend; }; }; - vcc_3v0: LDO_REG7 { + vcc_3v0_s0: LDO_REG7 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; - regulator-name = "vcc_3v0"; + regulator-name = "vcc_3v0_s0"; regulator-state-mem { regulator-off-in-suspend; }; }; - vccio_sd: LDO_REG8 { + vcc_sdio_s0: LDO_REG8 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - regulator-name = "vccio_sd"; + regulator-name = "vcc_sdio_s0"; regulator-state-mem { regulator-off-in-suspend; }; @@ -426,10 +447,10 @@ &i2s2 { }; &io_domains { - bt656-supply = <&vcc_3v0>; - audio-supply = <&vcca_1v8>; - gpio1830-supply = <&vcc_3v0>; - sdmmc-supply = <&vccio_sd>; + bt656-supply = <&vcc_3v0_s0>; + audio-supply = <&vcc_1v8_s0>; + gpio1830-supply = <&vcc_3v0_s0>; + sdmmc-supply = <&vcc_sdio_s0>; status = "okay"; }; @@ -513,13 +534,13 @@ wifi_host_wake_l: wifi-host-wake-l { }; &pmu_io_domains { - pmu1830-supply = <&vcc_3v0>; + pmu1830-supply = <&vcc_3v0_s0>; status = "okay"; }; &saradc { status = "okay"; - vref-supply = <&vcc_1v8>; + vref-supply = <&vcc_1v8_s3>; }; &sdhci { @@ -566,7 +587,7 @@ &sdmmc { pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>; cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; - vqmmc-supply = <&vccio_sd>; + vqmmc-supply = <&vcc_sdio_s0>; status = "okay"; }; @@ -620,7 +641,7 @@ bluetooth { pinctrl-names = "default"; pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>; vbat-supply = <&vcc3v3_sys>; - vddio-supply = <&vcc_1v8>; + vddio-supply = <&vcc_1v8_s3>; }; }; From patchwork Fri Sep 9 19:50:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 12972109 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 1E899ECAAD3 for ; Fri, 9 Sep 2022 19:52:30 +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=KPWL2CoDT3pAU7llgLwTkaRRbdwoD+njyrOEOCHZnrg=; b=2YiQLulMCCk7Pc 34HkWZWbink4QXKVR4NomoRehw+641ZhaGkqWa+SLXpMhCpaSXdObo6DCBCkHD807RDAltwurXbgi zZFCDjyqm7+CddNPMV5s1Gm0i6WORbn2StrJj6/vCMchEcAbiqGgwcjlC3+t7rUJpBKW4BectOOBa sq0EEr8vJdluxBIJfnRB2eGsvqmyv2cYE1XCV9pNKt8ttCg5pf/5ofSSxFWWzlxn4Dcn0v96JE9yt 3GqnBP8tV+3MJBOng0T5r0mwvtG07YELmgqhQIwM3WJQKSOli16V9w2EKtQ6CMSVCzVKnjFcuFIq7 b/EaxRcllgxyAWKJGFvw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk34-002Cbb-DK; Fri, 09 Sep 2022 19:52:22 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2l-002CNd-BS; Fri, 09 Sep 2022 19:52:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=3Bqx2anVFu2ttnX5WJFb+s4q72mFO3Wf35HaYAmUeEc=; b=dtiVeWqBQlxl+g5Co3RBcqNSeP aGxQtJM8mdMfn4V4FIGMixOXTMqLAcm9Pr8bThN1x9bwqbbBt1KI2Civu6dHwfFjZrcviOwEHVWcD TasXBmoZaW0E9FnRMCeCiWFpr8f7QBnJu3/r+/PLnz0lyavocTzhVoTEH8PAFJhVlrlIgO3u2JDVy ep6g8ThLHsz/dsTvsIInSqrekLQUN+Nni5GqlIx+h1A6nmqP1v+LMR+ILqbq/peBwqlN8brGGtg+9 f+jTHFJ27dgOu1mJ5GpC3+DOKrv0v/qdLo6KHsHQJcfPX8DrdlqToeESCrzqg2dLFSVOFXDu/y+6i vhQU6TVQ==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2f-00DWYO-4H; Fri, 09 Sep 2022 19:52:03 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 289Joxek025079; Sat, 10 Sep 2022 04:51:00 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH 3/6] arm64: dts: rockchip: rk3399-rock-4c-plus: sort nodes/properties Date: Fri, 9 Sep 2022 19:50:03 +0000 Message-Id: <20220909195006.127957-3-naoki@radxa.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220909195006.127957-1-naoki@radxa.com> References: <20220909195006.127957-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220909_205157_808817_554A3659 X-CRM114-Status: UNSURE ( 7.23 ) 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 sort nodes/properties alphabetically Signed-off-by: FUKAUMI Naoki --- .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts index c88a7512e296..fdee9d7b2372 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts @@ -23,15 +23,6 @@ chosen { stdout-path = "serial2:1500000n8"; }; - sdio_pwrseq: sdio-pwrseq { - compatible = "mmc-pwrseq-simple"; - clocks = <&rk809 1>; - clock-names = "ext_clock"; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_enable_h>; - reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; - }; - clkin_gmac: external-gmac-clock { compatible = "fixed-clock"; clock-frequency = <125000000>; @@ -61,6 +52,15 @@ led-1 { }; }; + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&rk809 1>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_enable_h>; + reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; + }; + vcc_3v3: vcc-3v3-regulator { compatible = "regulator-fixed"; regulator-name = "vcc_3v3"; @@ -71,13 +71,14 @@ vcc_3v3: vcc-3v3-regulator { vin-supply = <&vcc3v3_sys>; }; - vcc5v0_sys: vcc5v0-sys-regulator { + vcc3v3_phy1: vcc3v3-phy1-regulator { compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; + regulator-name = "vcc3v3_phy1"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_3v3>; }; vcc5v0_host1: vcc5v0-host-regulator { @@ -92,6 +93,15 @@ vcc5v0_host1: vcc5v0-host-regulator { vin-supply = <&vcc5v0_host0_s0>; }; + 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>; + }; + vcc5v0_typec: vcc5v0-typec-regulator { compatible = "regulator-fixed"; enable-active-high; @@ -104,16 +114,6 @@ vcc5v0_typec: vcc5v0-typec-regulator { vin-supply = <&vcc5v0_sys>; }; - vcc3v3_phy1: vcc3v3-phy1-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_phy1"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_3v3>; - }; - vdd_log: vdd-log-regulator { compatible = "regulator-fixed"; regulator-name = "vdd_log"; @@ -447,8 +447,8 @@ &i2s2 { }; &io_domains { - bt656-supply = <&vcc_3v0_s0>; audio-supply = <&vcc_1v8_s0>; + bt656-supply = <&vcc_3v0_s0>; gpio1830-supply = <&vcc_3v0_s0>; sdmmc-supply = <&vcc_sdio_s0>; status = "okay"; From patchwork Fri Sep 9 19:50:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 12972112 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 94574ECAAA1 for ; Fri, 9 Sep 2022 19:52: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=tPMW9siFzHMxHepWN8zWUFGNd+vxQiCwfrMxs/xUX3E=; b=WfMoVUKnHIBwLe 2X5tAqCK+2SnuqLLXdHQu4fc3zJWPSnDwHTJYx5DdO4961nx9cmR17fBxymzQKW8UN/sg1q0mShUN XVuXWtF7uvh9vnoOKLK+JUGLWcYD9+td4F9kSM+kZl2wvhTNvvQ9JfnRFojQ7JLIAkCkWwa86MlQj pwfHC5Z7rIk8T5YX6sSrFI9ndIs/o4UqwF882y80HPxDFnUyM3zuJcRVSbTqLbu8xAgqHWyAls9Gh eBAShE6L1+Y0t4jqJBqgRa3nWiM0IG4MWQlJPQF7Q0i+cDC0mGzDztcUfxcYTeoMrgYexdtsZXXx1 6vcmEOL1KNbH33N3JR9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk3G-002CqV-R3; Fri, 09 Sep 2022 19:52:34 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2l-002CO4-Km; Fri, 09 Sep 2022 19:52:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=7BHSZjHop+9HJ/9aV1BpN8oh93FjP5eLEzQbgHt/QW4=; b=k87kDKS1kGTw+fz/SQMUbnbjon DvqG/gUzpdxlpSRwhiBkLAprWSMozTjJKh2yj2f1zBm9Lqt5Sk6R1+y1UDWDu9/iqvlqEY2cbImDD Mll/U3zlpVP0KMYVxm1kLk891S09nbyLzdg4zYCenYW4Sgldcg6MfOW2UFSzpLPgxqvjtSDQkpBWV zpjAiXr461u1h2xRV14AD4A49Jc3+0b9q0rZrioyltlEe1MmhAbWRFy4Fbyp0hNvAWBdhO3sc3zM/ 8Sj3FdvNEjbkpxYTkl+yfGAHkPdabzUCWpdHlwMo06f2hJvuiJdOeG63pS4AHRDpYcK1Ds/qFPrVG qDYU4sIg==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2f-00DWYa-IE; Fri, 09 Sep 2022 19:52:04 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 289Joxel025079; Sat, 10 Sep 2022 04:51:00 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH 4/6] arm64: dts: rockchip: rk3399-rock-4: fix regulator name Date: Fri, 9 Sep 2022 19:50:04 +0000 Message-Id: <20220909195006.127957-4-naoki@radxa.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220909195006.127957-1-naoki@radxa.com> References: <20220909195006.127957-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220909_205158_137665_ACEFEEF0 X-CRM114-Status: UNSURE ( 7.01 ) 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 fix regulator name ref: https://dl.radxa.com/rockpi4/docs/hw/rockpi4/rockpi4_v13_sch_20181112.pdf Signed-off-by: FUKAUMI Naoki --- .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index 6464a6729729..bb1dcf319b02 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -136,24 +136,25 @@ vcc5v0_host: vcc5v0-host-regulator { vin-supply = <&vcc5v0_sys>; }; - vcc5v0_typec: vcc5v0-typec-regulator { + vbus_typec: vbus-typec-regulator { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_typec_en>; - regulator-name = "vcc5v0_typec"; + regulator-name = "vbus_typec"; regulator-always-on; vin-supply = <&vcc5v0_sys>; }; - vcc_lan: vcc3v3-phy-regulator { + vcc3v3_lan: vcc3v3-lan-regulator { compatible = "regulator-fixed"; - regulator-name = "vcc_lan"; + regulator-name = "vcc3v3_lan"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + vin-supply = <&vcc3v3_sys>; }; vdd_log: vdd-log { @@ -200,7 +201,7 @@ &gmac { assigned-clocks = <&cru SCLK_RMII_SRC>; assigned-clock-parents = <&clkin_gmac>; clock_in_out = "input"; - phy-supply = <&vcc_lan>; + phy-supply = <&vcc3v3_lan>; phy-mode = "rgmii"; pinctrl-names = "default"; pinctrl-0 = <&rgmii_pins>; @@ -305,8 +306,8 @@ regulator-state-mem { }; }; - vcc1v8_codec: LDO_REG1 { - regulator-name = "vcc1v8_codec"; + vcca1v8_codec: LDO_REG1 { + regulator-name = "vcca1v8_codec"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; @@ -316,8 +317,8 @@ regulator-state-mem { }; }; - vcc1v8_hdmi: LDO_REG2 { - regulator-name = "vcc1v8_hdmi"; + vcca1v8_hdmi: LDO_REG2 { + regulator-name = "vcca1v8_hdmi"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; @@ -374,8 +375,8 @@ regulator-state-mem { }; }; - vcc0v9_hdmi: LDO_REG7 { - regulator-name = "vcc0v9_hdmi"; + vcca0v9_hdmi: LDO_REG7 { + regulator-name = "vcca0v9_hdmi"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <900000>; @@ -517,7 +518,7 @@ &io_domains { status = "okay"; bt656-supply = <&vcc_3v0>; - audio-supply = <&vcc1v8_codec>; + audio-supply = <&vcca1v8_codec>; sdmmc-supply = <&vcc_sdio>; gpio1830-supply = <&vcc_3v0>; }; From patchwork Fri Sep 9 19:50:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 12972111 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 CC0B3ECAAA1 for ; Fri, 9 Sep 2022 19:52:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=waHaYnOO+2/069cLq+wqmmxRaxnqoqL5sPwlbBh6AqQ=; b=uHxPKwmzbBOQTi bdCfz8WgqYfkyWx0UH5gN90h24wHR1sNk1nNAzOkv98CNoFvLddCvccC1MtYlU0jhul/fg0DqktAF b9WLRSFga9+0ZF2O907OwW5/ebGmdH/eH4nQeLzrg7jlXcfcTScXGHE7MnSgO1MKyO45IhmJHZ4uv Vto9kem+Hsyoum4HBWSgIKkT+rQmke0EmhSMazb3rBZRTmqtbZj+ZbL2Wy5OXcfpCqz2V3zjh+4ae PG0yo+Sob64QTr6RolBo4b7kKmpuBaTrqYYxJkLmdW36GtBtPzFG7OkcKxuUowoaYfBkWyw+N12Xr Z0L16u2GYd5xCz4r/ZYA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk35-002CcR-Je; Fri, 09 Sep 2022 19:52:23 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2l-002CNg-ES; Fri, 09 Sep 2022 19:52:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=kwWDRTfihSCZ0EB0gNSau9tNGnsKm3aM+kACEZ7r1h0=; b=Wb7CaEQ9xymtmgC7pJdreURaji O+/8IXxlGVwix6VTXIZx6jodUrGlb/qL2xZjIrhnfTx22jo6fOIAotfoOdS7dp/w5pljL3EXBLI5I wjFUM0FkfR8qNdudEDSiArjNQ6IJMqtQkBOs08e5aOy1UxFQ6Ear8Vou4t8yl+z/pOyFJaGAHk7Zz WyPLUbAxURuQK1r/V/tdXKzDuPe47k0JLNhTekzCMrYhlqphBGTUpcGCvn56MCd5eANfMJQtxSSzi d1P355Mhtnu9RjBvqSEUfQDxuXc9zD86k4vs+vnmxeLoakHtkCQxU8uySn4IpKLjfwJnToH/IH2Sz 7g207oJA==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2f-00DWYw-Gp; Fri, 09 Sep 2022 19:52:03 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 289Joxem025079; Sat, 10 Sep 2022 04:51:00 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH 5/6] arm64: dts: rockchip: rk3399-rock-4: sort nodes/properties Date: Fri, 9 Sep 2022 19:50:05 +0000 Message-Id: <20220909195006.127957-5-naoki@radxa.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220909195006.127957-1-naoki@radxa.com> References: <20220909195006.127957-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220909_205158_060444_A48F882C X-CRM114-Status: UNSURE ( 7.46 ) 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 sort nodes/properties alphabetically Signed-off-by: FUKAUMI Naoki --- .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 124 +++++++++--------- 1 file changed, 61 insertions(+), 63 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index bb1dcf319b02..485277f7ed17 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -74,32 +74,33 @@ dit_p0_0: endpoint { }; }; - vcc12v_dcin: dc-12v { + vbus_typec: vbus-typec-regulator { compatible = "regulator-fixed"; - regulator-name = "vcc12v_dcin"; + enable-active-high; + gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_typec_en>; + regulator-name = "vbus_typec"; regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; + vin-supply = <&vcc5v0_sys>; }; - vcc5v0_sys: vcc-sys { + vcc12v_dcin: dc-12v { compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; + regulator-name = "vcc12v_dcin"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc12v_dcin>; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; }; - vcc_0v9: vcc-0v9 { + vcc3v3_lan: vcc3v3-lan-regulator { compatible = "regulator-fixed"; - regulator-name = "vcc_0v9"; + regulator-name = "vcc3v3_lan"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <900000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; vin-supply = <&vcc3v3_sys>; }; @@ -136,24 +137,23 @@ vcc5v0_host: vcc5v0-host-regulator { vin-supply = <&vcc5v0_sys>; }; - vbus_typec: vbus-typec-regulator { + vcc5v0_sys: vcc-sys { compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&vcc5v0_typec_en>; - regulator-name = "vbus_typec"; + regulator-name = "vcc5v0_sys"; regulator-always-on; - vin-supply = <&vcc5v0_sys>; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc12v_dcin>; }; - vcc3v3_lan: vcc3v3-lan-regulator { + vcc_0v9: vcc-0v9 { compatible = "regulator-fixed"; - regulator-name = "vcc3v3_lan"; + regulator-name = "vcc_0v9"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; vin-supply = <&vcc3v3_sys>; }; @@ -515,21 +515,10 @@ &i2s2 { }; &io_domains { - status = "okay"; - - bt656-supply = <&vcc_3v0>; audio-supply = <&vcca1v8_codec>; - sdmmc-supply = <&vcc_sdio>; + bt656-supply = <&vcc_3v0>; gpio1830-supply = <&vcc_3v0>; -}; - -&pmu_io_domains { - status = "okay"; - - pmu1830-supply = <&vcc_3v0>; -}; - -&pcie_phy { + sdmmc-supply = <&vcc_sdio>; status = "okay"; }; @@ -544,6 +533,10 @@ &pcie0 { status = "okay"; }; +&pcie_phy { + status = "okay"; +}; + &pinctrl { bt { bt_enable_h: bt-enable-h { @@ -581,6 +574,20 @@ pcie_pwr_en: pcie-pwr-en { }; }; + pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + vsel1_pin: vsel1-pin { + rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + vsel2_pin: vsel2-pin { + rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + sdio0 { sdio0_bus4: sdio0-bus4 { rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>, @@ -598,20 +605,6 @@ sdio0_clk: sdio0-clk { }; }; - pmic { - pmic_int_l: pmic-int-l { - rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - vsel1_pin: vsel1-pin { - rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; - }; - - vsel2_pin: vsel2-pin { - rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; - }; - }; - usb-typec { vcc5v0_typec_en: vcc5v0-typec-en { rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; @@ -635,6 +628,11 @@ wifi_host_wake_l: wifi-host-wake-l { }; }; +&pmu_io_domains { + pmu1830-supply = <&vcc_3v0>; + status = "okay"; +}; + &pwm2 { status = "okay"; }; @@ -645,6 +643,14 @@ &saradc { vref-supply = <&vcc_1v8>; }; +&sdhci { + bus-width = <8>; + mmc-hs400-1_8v; + mmc-hs400-enhanced-strobe; + non-removable; + status = "okay"; +}; + &sdio0 { #address-cells = <1>; #size-cells = <0>; @@ -672,14 +678,6 @@ &sdmmc { status = "okay"; }; -&sdhci { - bus-width = <8>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; - non-removable; - status = "okay"; -}; - &spdif { spdif_p0: port { @@ -761,13 +759,13 @@ &usbdrd3_0 { status = "okay"; }; -&usbdrd_dwc3_0 { +&usbdrd3_1 { status = "okay"; - dr_mode = "host"; }; -&usbdrd3_1 { +&usbdrd_dwc3_0 { status = "okay"; + dr_mode = "host"; }; &usbdrd_dwc3_1 { From patchwork Fri Sep 9 19:50:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUKAUMI Naoki X-Patchwork-Id: 12972110 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 903B9ECAAD3 for ; Fri, 9 Sep 2022 19:52:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KgBo7N9JBllYwLwRKLsZZX/Pf2RYdqNyDgqW+1A0qZ8=; b=HbIs2wY6X726bk HUDr5gAtHY+09MPsdsiDPdzV9sVCTsbEw22bwy92mXkS6TJjt1pm3Hdx/zWbfWYDXBO2YoxUPSib/ NQJJKkQWu8lgyb1ldoVowsyz462rYl6jP1PE5wNvHQS3H0j1OaHLMnVPm4W+DCXuZTCdauW20CqH/ tHGNetiKiNZMsACIbtkf+WzjCMvpBgYNCogPBrIErjhOLACf8O8bALbugImLa5AIyAksRfhbx3h35 oogz1GT8tDVNFF61+qohWgdcaFVs3zG4l+paXhjisqj34hn6wmoMg860VGkz3Gbr1BDZ5Qq+U7IHp XmMe12j3Fj1r2NAb9BeQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk35-002Cbt-26; Fri, 09 Sep 2022 19:52:23 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2l-002CNh-EZ; Fri, 09 Sep 2022 19:52:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=j3xtGKnJU9JHFkJh8elhuXTzqZp64s+wba+hJeN9Axo=; b=osEhHMpD3IEJJYb/VuTc9wppTx 0NEPsLClnaOUeNVuvjDtmXrG7YuadoMYIEb0zuo2qs+Ms7okr1pwk4+cjrsY4jzcj+0+O1zREIPBr ap8d/QNoReaF5yVl8cgYW1DDepHB++4PspQGZlbHYgb1Fwtx5b+Eanb9LyMjBK0ZLQt2VXth54phz dqqI+88L3fB08hpjxF4eAXuShsVs7kTr6MDz+jN6w5XwYotdQv++xxXR5hHrWyu16ULQH4fg2KLYH eaKaE8EuGPlblFyRMttCxN4yIMpGLKCi82fwtS5dc3WW2FS4IOtYdQzPbbJLL+ylzK+Jmron2Orzz SMdZxYnQ==; Received: from sakura.naobsd.org ([160.16.200.221] helo=mail.naobsd.org) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWk2f-00DWYv-Ej; Fri, 09 Sep 2022 19:52:03 +0000 Received: from secure.fukaumi.org ([10.0.0.2]) by mail.naobsd.org (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id 289Joxen025079; Sat, 10 Sep 2022 04:51:00 +0900 From: FUKAUMI Naoki To: heiko@sntech.de Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, FUKAUMI Naoki Subject: [PATCH 6/6] arm64: dts: rockchip: add avdd-0v9-supply and avdd-1v8-supply Date: Fri, 9 Sep 2022 19:50:06 +0000 Message-Id: <20220909195006.127957-6-naoki@radxa.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220909195006.127957-1-naoki@radxa.com> References: <20220909195006.127957-1-naoki@radxa.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220909_205157_998966_3C404751 X-CRM114-Status: UNSURE ( 7.46 ) 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 this patch adds avdd-0v9-supply and avdd-1v8-supply to hdmi node for Radxa ROCK 4 series. Signed-off-by: FUKAUMI Naoki --- arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts | 2 ++ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts index fdee9d7b2372..f9884902f874 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts @@ -175,6 +175,8 @@ &gpu { }; &hdmi { + avdd-0v9-supply = <&vcc_0v9_s0>; + avdd-1v8-supply = <&vcc_1v8_s0>; ddc-i2c-bus = <&i2c3>; pinctrl-names = "default"; pinctrl-0 = <&hdmi_cec>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index 485277f7ed17..645ced6617a6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -219,6 +219,8 @@ &gpu { }; &hdmi { + avdd-0v9-supply = <&vcca0v9_hdmi>; + avdd-1v8-supply = <&vcca1v8_hdmi>; ddc-i2c-bus = <&i2c3>; pinctrl-names = "default"; pinctrl-0 = <&hdmi_cec>;