From patchwork Fri May 3 10:47:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 348 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 9A88D3F063 for ; Fri, 3 May 2019 12:48:14 +0200 (CEST) Received: by mail-pl1-f197.google.com with SMTP id x5sf2786315pll.2 for ; Fri, 03 May 2019 03:48:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556880492; cv=pass; d=google.com; s=arc-20160816; b=R9hqOsQ/rWZzi/SFpDj4TQ9A6Udrqyhd39/Pr4W9yGEQG//UI5nxbtMHSUqOUBFIhH TL17z1hSYXdB+pWrEMSHyTA82v9YKZBR0YXNLsx+WbTmW3lqP+EQkc2SoKWUCAE2JeHN h/QrDGOrJL305KOLdUjICpHNYSzx5jTOqitWJkaeFmkRyHZGvIw/kUKQsbV5vzvEPXv0 Q/TaH4CBCgCLE28KgxGqlMJooAJ0gX2ghGqT2Wv4ZW4t7bo8wVU2wcCbaEfLvl+9hzgB schRHlmJg4/GXpniT2HEBaUIb2/DE8zz6wx7M9kj11pmEW/MhE1fP0axiGdKxIq494Me UyVg== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=dJEjAhExLUVJ17W0B+pFbZZazjHZd3R4upvaxN6Gjk4=; b=d4O3M0xNpyfa0wFQ3Iy/A2kbaR1nPez25gsI+zj+eJjo0Vcc5nJAb2DQ7hljgisFBk g4lSYjRU4j50pN5Ox7MF1P10prJRsowbwDAGdgTRmqq9MlJE+gOJmi4/zkHcVEm9WX3M D4z9Uwx9XwXnar7Y2y6yRB5G7CLOI78Ap2wxa1ruYnzFaKCAO0eRsJ+N0sMUaYvweBqm vBrTK6KfNLhqiZlleeWD7XBhZt5YtggZFsLWPndbZu2EOz+kKNDmOYGgHuzrhN6vkwz9 nAhnjzOGqe0vdGqqErSKEG7FoaISuMy7lsz6U+Q1f95GLNrRyTgaXVhKdJvcfIrjF2UM tScw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="RJK/xJPi"; 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:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=dJEjAhExLUVJ17W0B+pFbZZazjHZd3R4upvaxN6Gjk4=; b=k6YM2z4XWVzpNJE1mnNj08ValpVLpTC4N4BxzXher/R1oX/ed/Kp62x9kMh/CIwCS/ glls5Xy5iLxJ3EAWGyZ+GkZPb/PeACZ8Y9nYKMWLuH7TF3T+6xBDAtpih1+wvp49/zVb r8QZg+LvOzagcJ0orMl9xazERHxJmyvZ7LJds= 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 :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=dJEjAhExLUVJ17W0B+pFbZZazjHZd3R4upvaxN6Gjk4=; b=CBuLoXPjTfWbvdCCCT0t1THITPejMpXHB8RR73LnEurZq4HPNAxP8S2DgrnfsJT3be Nau7sY7Kb1FQELQznAI1khSmagjm1ClfnVb1batWKTC9jijXhBx2PNjwUpcI5wii0uzD ipnu9RTfMPDXYuVbTeAslq2slg87z8w6mf50pGju9cu3Bk+cWURNlBrfOkf2bsTSXNgv 9GJ64IcrXnJ/sVU+M4eqgdP7wZ+d8ohj0ae/UA8AAcF1CdZw1ym76+h62Ha7rFA79m5o xDYy+eDaU7G8VGE6DccAxkwJF1Fw/zLTCrenO8lTIMCKZDmFmh8MmxIDXGoowOuygzFY HUHQ== X-Gm-Message-State: APjAAAWze6Yy+5gmoUPNt3H+JC4+g1YJYVNfc9xR7VLDdsGpsSG5POkg NM5Wirgx8iA3VxtohBxMFQ60g9kn X-Google-Smtp-Source: APXvYqyN/ydnlH83VYi/wJVSZIUkSxK24u/2Gdug0BItPoDGCU9y5z4atE/k3iUxJoU7zHJ5eLZuiw== X-Received: by 2002:a63:124b:: with SMTP id 11mr3232051pgs.115.1556880492180; Fri, 03 May 2019 03:48:12 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:b60a:: with SMTP id j10ls1355532pff.6.gmail; Fri, 03 May 2019 03:48:11 -0700 (PDT) X-Received: by 2002:a63:d512:: with SMTP id c18mr9636720pgg.252.1556880491796; Fri, 03 May 2019 03:48:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556880491; cv=none; d=google.com; s=arc-20160816; b=G4cY2wSWn5lJQHIWlEpmx3vsB+A1LjxJlGFRQq1hZEBWkpUm5jdHwIdQNGVkYnqLI6 09fT1rNs+lDYbGVfRa0MLPMPoxtA+/uR7Yjwc9T/ARQwDWbm1rrmjcrX6XkuNcmyQUhl v1vjkeAUC6p48l2N0QFnoZQtAooP3vXAg3Z02M4Qwg0Ph4o5rPz90jxxBFDGl4bxYyil mr5Q0NGCc5GaXfnh3P9aVnVTV1bkmwR81CTTABknzCi4g4inMcWkn0iOxOrkiSNzEE3M VfP5A6cZL3QiU04LirR5jffCTO1TSutLkoh1JviYFXesd6cbqMgMqaBa4t/2O0QraKdg 1kiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=CtRnF3C3SrPtDzWYrijbevMMvebx7nVoCcCzEGjiz+k=; b=RV2bQv+MyBIoJFXCB6aQDY8T6amnLRHbaIDKxyUHDHQIBLcxI6QGzuqc3N4hYTARCB lWSFFQufaGsP6e2p7+suSbpsYGH5s14Ffy7VFpnBS5x+r7HcIuoBIzWRpKFH3aMVis8U H5Gr32VT5db8SpoFN34rndcMsP36BMuIU0H4avV5Wt8dZbpWVsKjAkb7e1bbJxhhKCx4 LAPbkxytvRKYmqZwZ4CFMykYK53BahBUh+P1K+Il3T0ZpIB1mJiPH4lOVBGtRNINpJ/s MjWyReluD9meMopqt8s/3geo8pTI1ClClOUO9Ss9cf41OPbKIVtOcMk3xZ2Kmgvs5OXP 1b1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="RJK/xJPi"; 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 h11sor1575749pgs.70.2019.05.03.03.48.10 for (Google Transport Security); Fri, 03 May 2019 03:48:10 -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:a63:8f4b:: with SMTP id r11mr9441799pgn.271.1556880490220; Fri, 03 May 2019 03:48:10 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.165]) by smtp.gmail.com with ESMTPSA id k9sm1965479pga.22.2019.05.03.03.48.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 May 2019 03:48:09 -0700 (PDT) From: Jagan Teki To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Rutland Cc: Michael Trimarchi , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-amarula@amarulasolutions.com, linux-sunxi@googlegroups.com, Jagan Teki Subject: [PATCH v5 1/3] arm64: dts: allwinner: a64: move I2C pinctrl to dtsi Date: Fri, 3 May 2019 16:17:51 +0530 Message-Id: <20190503104753.27562-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 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="RJK/xJPi"; 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: , There is only one pinmuxing available for each I2C controller. So, move pinctrl for i2c0, i2c1 from board dts files into SoC dtsi. By moving these pinctrls the i2c1 node from Nanopi A64 just have a status, which is disabled already so remove the entire node from it. Signed-off-by: Jagan Teki --- Changes for v5: - drop the i2c1 node from nanopi-a64 Changes for v4: - new patch arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts | 2 -- arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 -- arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 6 ------ arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 -- arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 -- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 4 ++++ 6 files changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts index 019ae09ea0fd..c41131c03231 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts @@ -85,8 +85,6 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; sensor@48 { diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts index 0a56c0c23ba1..c2a6b73b17cf 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts @@ -145,8 +145,6 @@ }; &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts index f4e78531f639..9b9d9157128c 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts @@ -120,12 +120,6 @@ }; /* i2c1 connected with gpio headers like pine64, bananapi */ -&i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; - status = "disabled"; -}; - &i2c1_pins { bias-pull-up; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index b7ac6374b178..409523cb0950 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -122,8 +122,6 @@ }; &i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts index 0ec46b969a75..12afc52e169e 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -92,8 +92,6 @@ */ &i2c0 { clock-frequency = <100000>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 8c5b521e6389..b275c6d35420 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -842,6 +842,8 @@ interrupts = ; clocks = <&ccu CLK_BUS_I2C0>; resets = <&ccu RST_BUS_I2C0>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; @@ -853,6 +855,8 @@ interrupts = ; clocks = <&ccu CLK_BUS_I2C1>; resets = <&ccu RST_BUS_I2C1>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>;