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: 1494 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C1F3F3F1D9 for ; Wed, 15 Jul 2020 10:34:51 +0200 (CEST) Received: by mail-pl1-f197.google.com with SMTP id bf1sf1946204plb.11 for ; Wed, 15 Jul 2020 01:34:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1594802090; cv=pass; d=google.com; s=arc-20160816; b=ENs3HAio1d7wcozL1NvzedY80j/2c/TstM2SVgxE17HU/6InS4+lNJ6Yq3O8El0SVu ziTKCm55g9tbwj9beHn1S7pfCJaMb0KOxTT3BXFGmjq2o1z91MFGaSyo7dODUz5aR7ug HEIpcrEl5AAXCcec41iRrsUBoBl2uQIsV19vHLsqhBQRTfNWUfU4ngkRw+ac+UwKUO0B VHwF8yd6Q/r8B8V0y+Whsyuw1yOsyCxg5BG0mPSgfv9faJrjk0Dc9EOIcakVVGQx0XpB ABPUH5QdoVDsfteA/saX/Ew94IBPtGKJ76gzX6fHZ5JJTQIv+XVfxJ0rLNUAJV7aI4Kk xPgA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=nf6z7EDfM0mLrbjQTGTsORz4vxV/QtpZNAYm6teITrM=; b=j8ygsC4VXQlD6THuwtmr94XVmE0FIAYkJlSqW2zg2D2OHC8nKNFJjWEu/woc6iw7iD RtAA1ANrsc91Gh2m/B+v93AfJYzb7KWYwaNAgLKBSdrc/whCzsFynx9dWs2P4QkbEPm0 QXhGrzrXsOimogQQc+D1Lh6QWavX46opYzJlsXqPfjGLuoA3OVD7WY4DpKFWdGqir72s A9SA/qbwMxb0EbF3MP832wHI2b2bwL61BAO4YIZZm/Qfjx7c/RgxxIvFy6AXl5jHSKwB H/eLahGYvY42JmdsZef8i/QwtNuxoks6ObF3Tw6IAS6Au31VSygX5XeK6l44eQHVo5G7 IzTQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JhJWP2KI; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=nf6z7EDfM0mLrbjQTGTsORz4vxV/QtpZNAYm6teITrM=; b=Skm8y+KVzNx6aDV55+mx+NGOwRJ2xlR2sByjBXv7QohwQXi9nD+IPL9ZJ4qrbCFTvp 6VAGrPvHbwOTPjm9+7b5mnat7vZoxKNcgqhs4IHbvaF/7z/neRn/zbi6RCc+cnRPK4UG uQO2RVtFno1xZ5hlICh3virWNMlcDMF44gdqI= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=nf6z7EDfM0mLrbjQTGTsORz4vxV/QtpZNAYm6teITrM=; b=Xw7j/ERCxtLuypmHVazs3vAfcxJF+pD81LF5UXvmBIN/47T2N5aq4CnrSZM6A0+wjD tLIug0sEqf98abvf2xabJENVXS+W+mqIQOuUyb+S8MtPwEqZrPMJAfBH3ilP/wugkLvK 6Wy7PAEQl0WF5TIAZcrT65Z4OXfZX5GVa1ERG7COWkgyJabkC1Dm+XmOIVnNdDzrG7Ug aFVmGUHyoMvsQSrmg7tLFQ/4OsB4AzHV4L+falpMpNjLjOuUi/NWyqlpVh79S6SN6q7w WZVJnMGon6rUgWxUrAJ5Ink6L8u3ZmC2khcVlJwUCEqIh4o7+zLUT8LjeAGIc5/X9RWI L5dQ== X-Gm-Message-State: AOAM531ttwiYCyYWbO9xqWf1uLFdCwjvYRQtEIouxoVATA3MWced6UdH B9klaK1LfKItfkMQvtGyCdQ13XsU X-Google-Smtp-Source: ABdhPJwbOnAZwyjINUgZ4mrgm9JS3cnLjRdSCr5qz/ahZb1ktq+03NVJNMxbzdkDnu8wmQ41zI1f6A== X-Received: by 2002:a17:90b:46d7:: with SMTP id jx23mr9601169pjb.191.1594802090303; Wed, 15 Jul 2020 01:34:50 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90b:380c:: with SMTP id mq12ls809278pjb.1.gmail; Wed, 15 Jul 2020 01:34:50 -0700 (PDT) X-Received: by 2002:a17:90a:2048:: with SMTP id n66mr9362757pjc.71.1594802089829; Wed, 15 Jul 2020 01:34:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594802089; cv=none; d=google.com; s=arc-20160816; b=pn0dezG5lXZX7Itbs0Tve2wRnV0AFY/1qVZR+TgPHWFX2vSy+ckf5u+ZllY5cAgXvx lnlm6Xijp1SloNrbcKcMt4nJToLoporpkzrvd2wc8QGbNVBTeLitN8CUSZfYwdYCBEnq j+1qQGBDI6ihmS4V8POvaSa13teWcrDisb3jLeCqU2U9r4iW1b75ynQhrDFihNcWPvjM XCPiRmxDy7k/U4UqShcc2wTn6WJ2uo56O95q4LBBhmA1u6flVehmZmbp7GlCfu8hTDa4 gu9DJb2zUZfT7FWTDSb7b7pQqVdXQZ9f17mTXe0Dr512Xha+1Kkz2Et9h22LBAOdrhS1 u6ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=p5iXaht479GnGhX17VzhQEzhFfkqxgmW23gJMSjYcgI=; b=nWoyAmB0x6JhA/5m2LAW4tlmCieLCaiE3le/CR2MKfayAEm1IQeIuvAovDYK0+hdTN zV09gr3Jv5IymGlLAxBjYiBDvUo2UnF51rH8ns+P1RUVE/xnooSQcBFEtcgn57rSzq06 vcen3LQ5oFe/K217ucnYs1Duu7M59l86+vXxnfZVpuu0wkidFssq4n6llYHs7YULT6Ip SB5+PXZWhbDEPvyPqVw3ddyYT6Fw+BzZyP4XtTQECfIva6ZfPKq+hNDrmFWq2NrNJbVY /yskN5u63ccSTcd5pugEGFbuqNi5wHa7etRGv5Q+2neEQ4QOwYdT1fsQAv+9RW/e2swQ szOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JhJWP2KI; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k23sor1770225pll.69.2020.07.15.01.34.49 for (Google Transport Security); Wed, 15 Jul 2020 01:34:49 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Suniel Mahesh , Michael Trimarchi , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amarula , Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JhJWP2KI; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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"; };