From patchwork Wed Jul 15 08:34:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11664425 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 5D3426C1 for ; Wed, 15 Jul 2020 08:35:28 +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 238E3206F4 for ; Wed, 15 Jul 2020 08:35:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="h/2JSsoF"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="YYbdkIb4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 238E3206F4 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=upXu2NbE8QyxrBPdSqE4wkasViQav2C2AOE9DibBg2g=; b=h/2JSsoF0Qn3rWpd1iDEJvvFL n9de05yZvA6VVllmVzIzGuFRiOKgl5T2brHboy92Oh/iS+fzj5AdIDXH6LVVrsiMzDyEcywFf39bJ laY8SV/lZhDB+1DKVzbWDdJ3euGOv5qRYh4nw9vP9CpYURhCfKUx3SFJOn/bvoueXzr7GRrlu9F4c R2JiuBMDu2xb4tpz+Fjw02fugmwNfuLLqPDVvOhCB1aGJyEQhHQ10Wnw2r6Y/QorEvcQwYZIYco/s c/RMD2cy9Axp4z1gzT7FYMYuRwFidkqUaKjCvdSScZpnxsNB4bPG53iOIEBV46h4+4/p6MYJ1a1gO Tc880e5hg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvcsr-0007hk-73; Wed, 15 Jul 2020 08:35:21 +0000 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvcsJ-0007Ro-LW for linux-rockchip@lists.infradead.org; Wed, 15 Jul 2020 08:34:57 +0000 Received: by mail-pg1-x52f.google.com with SMTP id o13so2741967pgf.0 for ; Wed, 15 Jul 2020 01:34:46 -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=kjN8zayeMZG2DU4GzukY5NcBfZcnl9ozMGccHHoLtc4=; b=YYbdkIb4NzCVM5ThpHJVKE+9NAsXOXJTj+D6B8nmH5lQdIEXveNyFBeVGCzWHF4Cae 7afdV4DglRasGGq/V++HxOQzigizkffo3+SKyy8UVaZ7uYW8vs24JXdcLBvn026paZPk UGv0PDNSEyd42/LE12glkZusDFK4hpCRLnFXI= 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=kjN8zayeMZG2DU4GzukY5NcBfZcnl9ozMGccHHoLtc4=; b=nGqUaLmwsF3FKSlu68p3JBAfm5wUwE+Yotq3zzeEWgTd/C251KWP/FnLELL8jFugJn Ox2yfYenJqoaA3tfpPg43DlYbLYYJ07TBHNKoDbzUJpiFH6OV26KcPixcrMoz9uG8OER hND6sznCbtrWzu5nL4Ug2dNSB2uDfK6QN3lyjKolwIk3E1vR4MgPHMpiyBdh7ljJeJb/ Zh+OfOrliv+1i4K0CuLaHmZVl+eT+0Vy66d5xJnE39UlqSzXuUqy3wibnJWXrSjHeEJW Rw4eIOBERt8iImHsfJd7FNwPYGWBipx8zoI3MJTyu9o6dUurux05HUPj0cmMe+ii4r9y 0z+A== X-Gm-Message-State: AOAM533XjP7Ah6m0tB7oVYNtEMFfCo4EjOyWGsiQzYW/L1o8pca436M4 B2FrPOyPzfhslImZWPOwYFvMDa8AZfM= X-Google-Smtp-Source: ABdhPJzY09Yixyw9mcn93UTId1G4FU8OwXFbvjOYbJonZQY2YfJnqUJgR/gCMvQikYHIyDgK1dR9fA== X-Received: by 2002:a62:1b4e:: with SMTP id b75mr7485926pfb.33.1594802085172; Wed, 15 Jul 2020 01:34:45 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 01:34:44 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring Subject: [PATCH v6 1/7] ARM: dts: rockchip: dalang-carrier: Move i2c nodes into SOM Date: Wed, 15 Jul 2020 14:04:12 +0530 Message-Id: <20200715083418.112003-2-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_043447_775731_23733239 X-CRM114-Status: GOOD ( 10.27 ) 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:52f 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 I2C nodes and associated slave devices defined in Carrier board are specific to rk3399pro vmrac SOM. So, move them into SOM dtsi. Signed-off-by: Jagan Teki --- Changes for v6: - spilt of previous version Trivial patch .../dts/rockchip-radxa-dalang-carrier.dtsi | 32 ------------------- .../dts/rockchip/rk3399pro-vmarc-som.dtsi | 29 +++++++++++++++++ 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi index df3712aedf8a..176b53b8e41a 100644 --- a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi +++ b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi @@ -17,29 +17,6 @@ &gmac { status = "okay"; }; -&i2c1 { - status = "okay"; - i2c-scl-rising-time-ns = <140>; - i2c-scl-falling-time-ns = <30>; -}; - -&i2c2 { - status = "okay"; - clock-frequency = <400000>; - - hym8563: hym8563@51 { - compatible = "haoyu,hym8563"; - reg = <0x51>; - #clock-cells = <0>; - clock-frequency = <32768>; - clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&hym8563_int>; - interrupt-parent = <&gpio4>; - interrupts = <30 IRQ_TYPE_LEVEL_LOW>; - }; -}; - &pwm0 { status = "okay"; }; @@ -70,12 +47,3 @@ &uart0 { &uart2 { status = "okay"; }; - -&pinctrl { - hym8563 { - hym8563_int: hym8563-int { - rockchip,pins = - <4 RK_PD6 0 &pcfg_pull_up>; - }; - }; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi index 0a516334f15f..e11538171e67 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi @@ -297,6 +297,29 @@ regulator-state-mem { }; }; +&i2c1 { + i2c-scl-falling-time-ns = <30>; + i2c-scl-rising-time-ns = <140>; + status = "okay"; +}; + +&i2c2 { + clock-frequency = <400000>; + status = "okay"; + + hym8563: hym8563@51 { + compatible = "haoyu,hym8563"; + reg = <0x51>; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "hym8563"; + pinctrl-names = "default"; + pinctrl-0 = <&hym8563_int>; + interrupt-parent = <&gpio4>; + interrupts = ; + }; +}; + &io_domains { status = "okay"; bt656-supply = <&vcca_1v8>; @@ -324,6 +347,12 @@ &tsadc { }; &pinctrl { + hym8563 { + hym8563_int: hym8563-int { + rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>; + }; + }; + pmic { pmic_int_l: pmic-int-l { rockchip,pins =