From patchwork Thu Jul 1 07:17:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaobo Tian X-Patchwork-Id: 1499407 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=q+B+nMlr; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 ozlabs.org (Postfix) with ESMTPS id 4GFqLn2x3Gz9sVb for ; Thu, 1 Jul 2021 17:18:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E4EC982C1B; Thu, 1 Jul 2021 09:18:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q+B+nMlr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5661C83121; Thu, 1 Jul 2021 09:18: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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 24B4882C19 for ; Thu, 1 Jul 2021 09:18:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peterwillcn@gmail.com Received: by mail-pg1-x532.google.com with SMTP id g22so5265418pgl.7 for ; Thu, 01 Jul 2021 00:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FMI0WKNIatrD61VFEk29M+5eEXrl2F5h81F/GEhoU6I=; b=q+B+nMlr8mPg3Q46OJE/6h4uiPAUzuoQICINjh8gD99+/GA74+EOz/8A4e3hR0wOky bjYE60j/W4me40/Qh2cRoDnZpEcSMpNQPKqdSJIuKMhZn3pAZFO5eAL3pggM/zi42Nqe aBX0gawlNZt/KdPi2WOWDPPNdEvZVa+R3cW9eXk6J6xEoDSR11i9KWATNHDJS7OPS4L1 rqQsvn+89iarEEkxlq9UWjE3a8aRv/YLhUm/i366UNEHb6+wDgq+GzKqEjFA9niYh+BA dWhk7rxu3npNUI+XcPOGwLda7k9SMv1gbpkFNfloUTgKrxhl2GcFG5/a8RvZCSAXgLVZ 1RgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FMI0WKNIatrD61VFEk29M+5eEXrl2F5h81F/GEhoU6I=; b=Lo7Q4BCpldn13k4uzO+bLm0bwQh+pxTwiDdvHL+EUG/vtWE4AP4rVo3zDLzijCah6Y vmhZ7nguMXZDZ6S+5rhx22fyQsjN9BZqNky04Y3KisWkAx+KGJKhdJtevUjItAUHj59z mnHmwNPyWhjHsJHp/7otftfp9yLbacGQW93KLXYJBSGrR/oaYJIhUWHfYzfxwmIQqmHK njo9cikSGjmk9+oDDousTJUvJHCVdl+/Aek/BZHwixHjjVLzLKddyqo01jcj3QSzY61F o8stJvdYYK9aMtFIK/NqrfK64m7TUzBJyVve5RFRST0VpMiSR+RjHyv2HgLk6lRvEzrx muKA== X-Gm-Message-State: AOAM530JoE3wsQIogImL+TD7Nn+GZwd56UjjRsCRAO+iCGxecmk0SibG glbCRxCx6cAVuV+SIkhSz4oIQupg4uXqHdPs X-Google-Smtp-Source: ABdhPJzyJb1QE1/pEBTpVTicD1pVuvUq8aINru4NJ8S5QFpnNMfjM1I+3LA78YNxBk3QvUZKwEeuCQ== X-Received: by 2002:a63:180c:: with SMTP id y12mr38918213pgl.180.1625123882391; Thu, 01 Jul 2021 00:18:02 -0700 (PDT) Received: from localhost.localdomain (li1891-139.members.linode.com. [172.105.237.139]) by smtp.gmail.com with ESMTPSA id d1sm13230881pju.16.2021.07.01.00.18.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Jul 2021 00:18:02 -0700 (PDT) From: xiaobo To: u-boot@lists.denx.de, kever.yang@rock-chips.com Cc: xiaobo Subject: [PATCH] arm64: rk3399: adjust vdd power layout Date: Thu, 1 Jul 2021 15:17:52 +0800 Message-Id: <20210701071752.24419-1-peterwillcn@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean 1. R4S passive silent heat dissipation based on metal housing, no active heat dissipation by fan, so PWM-Fan and CPU_Thermal are removed 2. Modify Ethernet1 interface of PCIE0 3. Modify the VCC VDD power layout Signed-off-by: xiaobo --- arch/arm/dts/rk3399-nanopi-r4s.dts | 79 +++++++++--------------------- 1 file changed, 23 insertions(+), 56 deletions(-) diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 6f2cf17bf1..e341e498cd 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -17,51 +17,23 @@ model = "FriendlyElec NanoPi R4S"; compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; - aliases { - ethernet1 = &r8169; + chosen { + stdout-path = "serial2:1500000n8"; }; - vdd_5v: vdd-5v { + vcc5v0_core: vcc5v0-core { compatible = "regulator-fixed"; - regulator-name = "vdd_5v"; regulator-always-on; regulator-boot-on; + regulator-name = "vcc5v0_core"; + vin-supply = <&vdd_5v>; }; - fan: pwm-fan { - compatible = "pwm-fan"; - cooling-levels = <0 12 18 255>; - #cooling-cells = <2>; - fan-supply = <&vdd_5v>; - pwms = <&pwm1 0 50000 0>; - }; -}; - -&cpu_thermal { - trips { - cpu_warm: cpu_warm { - temperature = <55000>; - hysteresis = <2000>; - type = "active"; - }; - - cpu_hot: cpu_hot { - temperature = <65000>; - hysteresis = <2000>; - type = "active"; - }; - }; - - cooling-maps { - map2 { - trip = <&cpu_warm>; - cooling-device = <&fan THERMAL_NO_LIMIT 1>; - }; - - map3 { - trip = <&cpu_hot>; - cooling-device = <&fan 2 THERMAL_NO_LIMIT>; - }; + vdd_5v: vdd-5v { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-name = "vdd_5v"; }; }; @@ -76,37 +48,32 @@ &leds { lan_led: led-1 { gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:lan"; + label = "green:lan"; + }; + + sys_led: led-sys { + default-state = "on"; + gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; + label = "red:sys"; }; wan_led: led-2 { gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:wan"; + label = "green:wan"; }; }; &leds_gpio { rockchip,pins = - <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, - <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; }; &pcie0 { max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>; - - pcie@0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - r8169: pcie@0,0 { - reg = <0x000000 0 0 0 0>; - local-mac-address = [ 00 00 00 00 00 00 ]; - }; - }; }; &sdhci { @@ -122,11 +89,11 @@ }; &u2phy0_host { - phy-supply = <&vdd_5v>; + phy-supply = <&vcc5v0_core>; }; &u2phy1_host { - status = "disabled"; + phy-supply = <&vcc5v0_core>; }; &usbdrd_dwc3_0 { @@ -134,5 +101,5 @@ }; &vcc3v3_sys { - vin-supply = <&vcc5v0_sys>; + vin-supply = <&vcc5v0_core>; };