From patchwork Mon Mar 25 13:52:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 10869229 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 72E771575 for ; Mon, 25 Mar 2019 13:58:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5ADFC29323 for ; Mon, 25 Mar 2019 13:58:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F27029325; Mon, 25 Mar 2019 13:58:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9FB2129323 for ; Mon, 25 Mar 2019 13:58:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=M7fgqszS+CB884nbXe01XD2jo5WiiAHjI2FPlJ5b+1A=; b=ccXmx7kBZ/+9CJ 7TAfbIGwKYhgK4FcH11HC67x9YIfk4kMJLRXOARHzRwG/CqOvpgfMNZI/nzVr/PcCU/JCJ9qGsYfn fp35C1D4V1OjqnmEEhDvJ+e0PT9sqyK9suMhjhd/r1gGPhSWOR/aLDh3QSWMs+tMHCQ2RRxAwXUfD 22gvMdC/YFEAv2ZmxI8Wn04dT2W4JwToHAQ73+gu6pKTNar4bQLZLSq7tjwAEE0p6WJUEO/er8D6W Q2eMRZe4Fwa8k9bPKbee5U9StVNj6ShV2mBz4OiNn4ei92m5WtfPVkRYoh9XQpxKgU5DZ8pe2rIPR wmeIQYu6zHtBmIWvZLpw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Q78-0004NQ-Fh; Mon, 25 Mar 2019 13:58:10 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Q2z-000738-Q3 for linux-arm-kernel@bombadil.infradead.org; Mon, 25 Mar 2019 13:53:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=S6N3YBwtJvS47HKc1Drwzx1nPd1CDjwIOW+R4SpbGUQ=; b=LOawDsOI8N280yTx4TwU8/rn6P psp844oYvljp0RaNdCvIm3nzDKfgWcgkkYZSYpY+/O4C92/Ihxhqn+zyx4nC0oUdsYNsHieRr5lJ8 VZ3dnkNm4SUrdj6LE+74cR9Y8DEMqwRHgKPTIeFilXhz+Rj+j+Gw/Cgkok6WTGa9hrg29VNeAROz6 5yAxCaHXZ5NxaRtGeDqBh4GYOaITGD4vtO4HL2YR6Zn1XVMBL2wKKsXEoZsOoNtuEcpxLIsc6lV9s MOfUWOic4dgnGe3RwpaPwy12atb0/uz90lP0NqnzPtwfxJSEUD/tTQmSco0Hj6Y9lmTMSbs3z/3wG ERvLP9Mw==; Received: from relay8-d.mail.gandi.net ([217.70.183.201]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Q2v-0004yJ-OY for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2019 13:53:50 +0000 X-Originating-IP: 90.88.33.153 Received: from localhost (aaubervilliers-681-1-92-153.w90-88.abo.wanadoo.fr [90.88.33.153]) (Authenticated sender: maxime.ripard@bootlin.com) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 989671BF205; Mon, 25 Mar 2019 13:53:18 +0000 (UTC) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard Subject: [PATCH 06/28] ARM: dts: sunxi: Switch to new GPIOs properties for i2c-gpio Date: Mon, 25 Mar 2019 14:52:38 +0100 Message-Id: <20190325135300.6440-6-maxime.ripard@bootlin.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325135300.6440-1-maxime.ripard@bootlin.com> References: <20190325135300.6440-1-maxime.ripard@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_095349_919003_C6108C62 X-CRM114-Status: GOOD ( 11.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The i2c-gpio driver uses named gpios now and the array of GPIOs is deprecated. Switch to the new binding. Signed-off-by: Maxime Ripard Acked-by: Chen-Yu Tsai --- arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 6 +++--- arch/arm/boot/dts/sun6i-a31-colombus.dts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts index 732873cbeedc..379d530ea2a7 100644 --- a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts +++ b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts @@ -58,13 +58,13 @@ /delete-property/stdout-path; }; - i2c_lcd: i2c-gpio { + i2c_lcd: i2c { /* The lcd panel i2c interface is hooked up via gpios */ compatible = "i2c-gpio"; pinctrl-names = "default"; pinctrl-0 = <&i2c_lcd_pins>; - gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>, /* PG12, sda */ - <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10, scl */ + sda-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ + scl-gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */ i2c-gpio,delay-us = <5>; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts index 0b7bedf85fb9..0e62b4042100 100644 --- a/arch/arm/boot/dts/sun6i-a31-colombus.dts +++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts @@ -65,8 +65,8 @@ compatible = "i2c-gpio"; pinctrl-names = "default"; pinctrl-0 = <&i2c_lcd_pins>; - gpios = <&pio 0 23 GPIO_ACTIVE_HIGH>, /* PA23, sda */ - <&pio 0 24 GPIO_ACTIVE_HIGH>; /* PA24, scl */ + sda-gpios = <&pio 0 23 GPIO_ACTIVE_HIGH>; /* PA23 */ + scl-gpios = <&pio 0 24 GPIO_ACTIVE_HIGH>; /* PA24 */ i2c-gpio,delay-us = <5>; }; };