From patchwork Wed Jul 15 08:34:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11664427 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B66C13B1 for ; Wed, 15 Jul 2020 08:35:31 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2494A206F4 for ; Wed, 15 Jul 2020 08:35:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HC3XsTeG"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="JhJWP2KI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2494A206F4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5V5cnA2jOOT1feDcHqJkyEbxwFeL52eEz0Hlu+bSqCo=; b=HC3XsTeGCY7lM6YML6DpVr/2e /Q7FNdguQYiwJuJ9D/5AGoOrp4emc99/EeFHC/6SyXlB+NHZ9DBb8oh1Q9kDcf6iR7rdeA1z0ENIw GqnabfNq1xo3X6gpw6qU6cKaeThyHmWkpFjCI5Yh2YhlADue/F4n81cexHV9qIo4OWqjjgHRrz7Up Bssv/SKQqTy0GzwxSP/p7ziWZiil8akELKN4UqttDbTEa1o7jtsBqw6aDQsGfOodx6He587qCwF/7 MlLvrJx55KtCMu3GAa/uPAUORRonbICFbwZzNrwlFHEml6g3vaREjo1X/hTTUj66FRPtp5xWqj6AA WoqpXCTgg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvcsu-0007j9-8W; Wed, 15 Jul 2020 08:35:24 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvcsO-0007UG-1D for linux-rockchip@lists.infradead.org; Wed, 15 Jul 2020 08:35:02 +0000 Received: by mail-pl1-x644.google.com with SMTP id l6so2093861plt.7 for ; Wed, 15 Jul 2020 01:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p5iXaht479GnGhX17VzhQEzhFfkqxgmW23gJMSjYcgI=; b=JhJWP2KIMyTazKOBVKdxv6a942aDAALi0JdTWyEIrAkKg26chQuO5fK00XKgqYkLjw lYkqvr9fFxnBIFNxlS7iUs2dGXWXeVZml2+4oRfgIVZGPtZ0XBKueuHg/7nkbkiBzAWg aZTOEDyv+dc7OG7QWqDfXQ1bfhC/pt4e9Aa20= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=p5iXaht479GnGhX17VzhQEzhFfkqxgmW23gJMSjYcgI=; b=jnDwtVbkoHS25B6Q349ajWz8geMoT6HFYz3y4upqAH5iQaB9T27dPYhw3aLRfAUorP ZU1g0uBZDf7sknkNIFMACL5pHXngRluHmr5nP/MjP8sghHqOzbQkoaeENwZ4vpQFEtTp 7ipyLimfo9RFnTSj8hLT6jf51ZyPHQf4YsV7OsGrk9H7C7SuAsukFi/Huo2tSFxk/jK1 +4lHsCi1oh5QHoxOQUhqMHrTdgOA23oPXGyvoeGPKAGfTh+QzV6J8Q7D78KyApylzPMM dZPKryuZcVrYjy3yMByJMw4lhumYWaBO8CZpuHwJcRz7/ugR9+ZLZy1N4d8pfmek9bCy vTjw== X-Gm-Message-State: AOAM531G3UD9B7YaAMMmPM7LUoUedb0aNFtSAZUvTaq7kAyBHlw9T9h6 je3xW3mXY1144eJDow/i8p+bGQ== X-Google-Smtp-Source: ABdhPJwUM/KOTmuZSRAHhXmTz7Hqdz2ADBYxx5P0O5G43ml9Ecief/OST/FVbAgERz6lKiYBLLVTaA== X-Received: by 2002:a17:902:b113:: with SMTP id q19mr7393133plr.170.1594802089528; Wed, 15 Jul 2020 01:34:49 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:9887:56a8:c916:cfdb]) by smtp.gmail.com with ESMTPSA id m92sm1467584pje.13.2020.07.15.01.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 01:34:48 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring Subject: [PATCH v6 2/7] arm64: dts: rk3399pro: vmarc-som: Fix sorting nodes, properties Date: Wed, 15 Jul 2020 14:04:13 +0530 Message-Id: <20200715083418.112003-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200715083418.112003-1-jagan@amarulasolutions.com> References: <20200715083418.112003-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200715_043452_152248_1C4E5493 X-CRM114-Status: GOOD ( 10.76 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:644 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Jagan Teki , Suniel Mahesh , Michael Trimarchi , linux-amarula , linux-arm-kernel@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Fix node, properties sorting on RockPI N10 board dts(i) files. Signed-off-by: Jagan Teki --- Changes for v6: - spilt of previous version Trivial patch .../dts/rockchip/rk3399pro-rock-pi-n10.dts | 2 +- .../dts/rockchip/rk3399pro-vmarc-som.dtsi | 35 +++++++++---------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts index a1783e7f769a..539f4005386d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts @@ -8,8 +8,8 @@ /dts-v1/; #include "rk3399.dtsi" #include "rk3399-opp.dtsi" -#include "rk3399pro-vmarc-som.dtsi" #include +#include "rk3399pro-vmarc-som.dtsi" / { model = "Radxa ROCK Pi N10"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi index e11538171e67..121a430d6a70 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi @@ -76,8 +76,8 @@ &gmac { &i2c0 { clock-frequency = <400000>; - i2c-scl-rising-time-ns = <180>; i2c-scl-falling-time-ns = <30>; + i2c-scl-rising-time-ns = <180>; status = "okay"; rk809: pmic@20 { @@ -323,8 +323,22 @@ hym8563: hym8563@51 { &io_domains { status = "okay"; bt656-supply = <&vcca_1v8>; - sdmmc-supply = <&vccio_sd>; gpio1830-supply = <&vccio_3v0>; + sdmmc-supply = <&vccio_sd>; +}; + +&pinctrl { + hym8563 { + hym8563_int: hym8563-int { + rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>; + }; + }; + + pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = <1 RK_PC2 0 &pcfg_pull_up>; + }; + }; }; &pmu_io_domains { @@ -341,22 +355,7 @@ &sdhci { }; &tsadc { - status = "okay"; rockchip,hw-tshut-mode = <1>; rockchip,hw-tshut-polarity = <1>; -}; - -&pinctrl { - hym8563 { - hym8563_int: hym8563-int { - rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>; - }; - }; - - pmic { - pmic_int_l: pmic-int-l { - rockchip,pins = - <1 RK_PC2 0 &pcfg_pull_up>; - }; - }; + status = "okay"; };