From patchwork Thu Oct 17 20:00:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 836155 Delivered-To: patch@linaro.org Received: by 2002:a5d:50c9:0:b0:37d:45d0:187 with SMTP id f9csp503124wrt; Thu, 17 Oct 2024 13:01:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVEoscKA1TzcUMuYFCVLqq42HZImaRQFJ6ffN8gWqHQL0OMldUtS7xXFB5DlVkxVZIXhgEeKA==@linaro.org X-Google-Smtp-Source: AGHT+IHZLthbsnsmI8+Yb6OPpc30c/TY7BsTMLEWWE4f9NFSiVlC+MUY6Zs1JGZuGmLweS2Ia8B7 X-Received: by 2002:a05:6602:2b13:b0:7f6:8303:ba80 with SMTP id ca18e2360f4ac-83a64d50245mr2235327639f.11.1729195288543; Thu, 17 Oct 2024 13:01:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729195288; cv=none; d=google.com; s=arc-20240605; b=gSB8KBfe5kX/zA8CT/ES5OBGIHFJ4nLyODfryr6XxdTR3N4efo1nxRc8T7iNxjWRPA rmykY/2mMAmcy//RodgukncfljLXlFQmyxyUOaLnZqLiYQPltIMvqNFpzaDC4MUjzgyu ffRZajt26Kblu55Rl90dBy4Gl2kNVFeTY/HVwtiq0faWJCW4Dxl+mvCh1u5/BxfDOi0Q YXJsvBLhG0WZysxplVcOLZw0HG2rDOrxuQo9XkAzTl2vQcyNGim6QDN/s6mQ1llD4o3A Md4ItzfhEFDUXUFcF0eW8TT9LZgR8dFRaOeX5ZU/7lae4rQc0zZelcwJgO70xzP+0ihO FIWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bcmJyWG+2xaL+/AZRtDjUmJ6AYfcqpU3tVl0BuzCnxs=; fh=HIg4dYSQDj+PWlm5eDH87PNdarxIn5KutKC2ibKLJ08=; b=FVwSQvy6pktNb4rt/FUjigRzWaa2uiiuov2vTR08L8JFrscBwF6gwRY7NnPrttSs/z qiYnc8F2o1pg6PgRbHCCvhkomnZ1HKfoELtMCoBGx+yrxN1NxJiiNovw4ABaL+Fd3pzN GCkW9kJOj17CPvf5noYWFyzP7HwaIEIN2TEP5uddgS4RA+1Jn13hWSHrOkqNZJwXL399 hGP5DYZmTs6jIB/DltASRIltluONt7Zw9GlXTWfUybuAppiwOTZXb6R6oQjmH88bAH1V 7niEZ2Udchf2Zy4CyfPRtMRSozt7au/Sor2e/iTxNNlQn0Yh5/XqG0VTzvRWXEbeUAyQ Qb6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kwiboo.se header.s=fe-e1b5cab7be header.b=D7BVFOBf; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kwiboo.se Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id 8926c6da1cb9f-4dc10b5b3d7si63107173.9.2024.10.17.13.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2024 13:01:28 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@kwiboo.se header.s=fe-e1b5cab7be header.b=D7BVFOBf; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kwiboo.se Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8CEA7890AE; Thu, 17 Oct 2024 22:01:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=kwiboo.se header.i=@kwiboo.se header.b="D7BVFOBf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2809D89093; Thu, 17 Oct 2024 22:01:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from smtp.forwardemail.net (smtp.forwardemail.net [149.28.215.223]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 90E6D89078 for ; Thu, 17 Oct 2024 22:01:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=SRS0=a54c=RO=kwiboo.se=jonas@fe-bounces.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1729195253; bh=bcmJyWG+2xaL+/AZRtDjUmJ6AYfcqpU3tVl0BuzCnxs=; b=D7BVFOBfxZvNJfUICL5sU2A/CqNxhqZmtryAqQEX54TA+47aRsNbDT8HznHL+PzZLB76mtq8J N35M38dZ2EzkC8ijDU52J0KnoH2QSd83/XJd9yJY1gSm7yB19p2xtDX0zCYD3M3A2BL4d6BE3Ki uR9BpqM0PRKeE7U88AUkzKVd11YC/aXsnDGZVO40PZs9gaeFDbvZRFl7syXDdwywwmVf+jiWZtm df5NA/FudWYik4mK5qp2hrUC0ubybJIcRk5gt4UnMUp/irl4j2YSFW5AADMbh0ZCFSCBNHNJ6da TLGqLsjHiokzj0rgpCfiBhQJjjrLVDBlfsVB4bVJUCzg== From: Jonas Karlman To: Kever Yang , Simon Glass , Philipp Tomsich , John Clark , Tom Rini , Sumit Garg Cc: Marcin Juszkiewicz , u-boot@lists.denx.de, Jonas Karlman , Heiko Stuebner Subject: [PATCH 2/8] arm64: dts: rockchip: move NanoPC-T6 parts to DTS Date: Thu, 17 Oct 2024 20:00:21 +0000 Message-ID: <20241017200039.1235524-3-jonas@kwiboo.se> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241017200039.1235524-1-jonas@kwiboo.se> References: <20241017200039.1235524-1-jonas@kwiboo.se> MIME-Version: 1.0 X-Report-Abuse-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Complaints-To: abuse@forwardemail.net X-ForwardEmail-Version: 0.4.40 X-ForwardEmail-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-ForwardEmail-ID: 67116cf46385e073f5ab13b5 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Marcin Juszkiewicz MiniPCIe slot is present only in first version of NanoPC-T6 (2301). Signed-off-by: Marcin Juszkiewicz Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-3-edff247e8c02@linaro.org Signed-off-by: Heiko Stuebner [ upstream commit: aea8d84070fe0846961deb23228d9dd3f8caefb3 ] (cherry picked from commit 697963b1c22336a44ac2e33536c652aae1671b3d) Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- .../src/arm64/rockchip/rk3588-nanopc-t6.dts | 23 +++++++++++++++++++ .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 17 -------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts index 3f8fbec65098..92321c1d3ff1 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts @@ -14,4 +14,27 @@ model = "FriendlyElec NanoPC-T6"; compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588"; + vdd_4g_3v3: vdd-4g-3v3-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pin_4g_lte_pwren>; + regulator-name = "vdd_4g_3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&pinctrl { + usb { + pin_4g_lte_pwren: 4g-lte-pwren { + rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&u2phy2_host { + phy-supply = <&vdd_4g_3v3>; }; diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi index ad8e36a339dc..d199f51a220c 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi @@ -170,18 +170,6 @@ regulator-name = "vcc3v3_sd_s0"; vin-supply = <&vcc_3v3_s3>; }; - - vdd_4g_3v3: vdd-4g-3v3-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pin_4g_lte_pwren>; - regulator-name = "vdd_4g_3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc5v0_sys>; - }; }; &combphy0_ps { @@ -527,10 +515,6 @@ }; usb { - pin_4g_lte_pwren: 4g-lte-pwren { - rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - typec5v_pwren: typec5v-pwren { rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -912,7 +896,6 @@ }; &u2phy2_host { - phy-supply = <&vdd_4g_3v3>; status = "okay"; };