From patchwork Mon Jul 5 14:52:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaobo Tian X-Patchwork-Id: 1500805 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=85.214.62.61; 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=VigQNsNB; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GJTFB4N5dz9sX1 for ; Tue, 6 Jul 2021 00:52:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F0ABA82A29; Mon, 5 Jul 2021 16:52:38 +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="VigQNsNB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4BCBF82B66; Mon, 5 Jul 2021 16:52:37 +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-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) (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 422938009C for ; Mon, 5 Jul 2021 16:52:34 +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-pf1-x42c.google.com with SMTP id j199so16402498pfd.7 for ; Mon, 05 Jul 2021 07:52:34 -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=djZ1TMNwASP5ewOggFlWBbD1yrSdDpDVOrMhoSfyeUI=; b=VigQNsNBnv2qe351q+eF1wRSog5T5gG2c5qnR2Qef5hk7eap/6eFxehQCGvOzr48LE E2jF7OwylTLSMSzgOl6VPAQHceZ9CCZWFgty+I7q5Z42iOFmhi4FbiIGJ2mFszVJEwYa Hkih+bkFmwaO6ORCBpmS6+urgme4xQS14d7iCmQTdoYsO+23DYwZ7EJKkfz1z011TuRc a0VItq4dhmbQrWVRuhjXK2/jN8/4eldPZjVWkBZYusEhaqudaFEqLn+fv3t54JeEJeHT ICrQ97HwD3a1TpFa3jk3eCW0pLu4GYy/J2wwg4win8PGpEaqC3zWZCy6mRj3IxjMnuqb eWpg== 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=djZ1TMNwASP5ewOggFlWBbD1yrSdDpDVOrMhoSfyeUI=; b=diIxQ0AxDK3jG1P1mSoRtz/kGs9eVjaRd3H391i/QMtjEkO4bDSksHQzSJIINiDPmZ H5ssLKQqlHSJDxYUtt29up6ZuXXCtTxQg7OoJwazpmJ5BFvZ4nBOxe0Yn8JB7iU0lFe7 y4QPg/p0A6NBXDgZv24QHZ89aGnN6icwZmDYn4xSnCzpKhBXPL1+LdouoApU7Ic5tZL8 jU50K5eDJyOlJrHlznD374j67uF1X+0U6JNGfFc90OU45rCUrYaTsQdDWry3pfevMlaa WwkKcKbT6a6ky8uoiLeCXSOk1DFwNer86yrmZs3lXrb14TtGplqfPKGDXSiayG/BUf8U EOcg== X-Gm-Message-State: AOAM532PPnZPUtokL1bArjWhgMXXTFOotn7nlEJBz3ZWGzAEuPjM2qp5 iThiq45MPDPOnkGVk8OcQ0OT9B94pR2NauaYQ2o= X-Google-Smtp-Source: ABdhPJyn+6TVUJNGBOSa5Xyt3rAqGllVnQBE8vvXSLDxHpAK0GUHLxo1WW+iMLtnCtmKnoTBsL5UEQ== X-Received: by 2002:a63:d305:: with SMTP id b5mr16426040pgg.67.1625496752459; Mon, 05 Jul 2021 07:52:32 -0700 (PDT) Received: from MacBook-Pro.lan (li1891-139.members.linode.com. [172.105.237.139]) by smtp.gmail.com with ESMTPSA id c12sm12727555pfl.27.2021.07.05.07.52.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jul 2021 07:52:32 -0700 (PDT) From: Xiaobo Tian To: u-boot@lists.denx.de Cc: Xiaobo Tian Subject: [PATCH] arm64: rk3399: Optimize performance and cleanup Date: Mon, 5 Jul 2021 22:52:21 +0800 Message-Id: <20210705145221.85841-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. Delete unused Ethernet aliases 2. Modify the label of the LEDS lamp 3. Inherit the definition of the system status lamp in DSTI 4. Removed error 3.3V incorrect use of 5V supply Signed-off-by: Xiaobo Tian --- arch/arm/dts/rk3399-nanopi-r4s.dts | 40 +++++++++--------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 6f2cf17bf1..a85f4bf491 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -17,10 +17,6 @@ model = "FriendlyElec NanoPi R4S"; compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; - aliases { - ethernet1 = &r8169; - }; - vdd_5v: vdd-5v { compatible = "regulator-fixed"; regulator-name = "vdd_5v"; @@ -30,6 +26,10 @@ fan: pwm-fan { compatible = "pwm-fan"; + /* + * With 20KHz PWM and an EVERCOOL EC4007H12SA fan, these levels + * work out to 0, ~1200, ~3000, and 5000RPM respectively. + */ cooling-levels = <0 12 18 255>; #cooling-cells = <2>; fan-supply = <&vdd_5v>; @@ -73,40 +73,32 @@ status = "disabled"; }; +&i2c4 { + status = "disabled"; +}; + &leds { lan_led: led-1 { gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:lan"; + label = "green:lan"; }; 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>, + <1 RK_PA0 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 { @@ -117,10 +109,6 @@ status = "disabled"; }; -&sdmmc { - host-index-min = <1>; -}; - &u2phy0_host { phy-supply = <&vdd_5v>; }; @@ -132,7 +120,3 @@ &usbdrd_dwc3_0 { dr_mode = "host"; }; - -&vcc3v3_sys { - vin-supply = <&vcc5v0_sys>; -};