From patchwork Wed Oct 19 08:28:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5518 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp337067wrs; Wed, 19 Oct 2022 06:48:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7+l/ZMToR3JsRdqxNPeS6JqpCfT1wZ4l+CASwY1FAf4BcJOnaI+JK6LTMDKSBK0E3X7qSW X-Received: by 2002:a17:903:110f:b0:178:a07e:e643 with SMTP id n15-20020a170903110f00b00178a07ee643mr8341660plh.41.1666187303655; Wed, 19 Oct 2022 06:48:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666187303; cv=none; d=google.com; s=arc-20160816; b=nLpEp4SvfrE7Usaal2d0kQTyyUJoGhZLF9HReImaSgdYIhqBy158A3CeResnQdcT2I U1+yuopJEavKNdPSkaEkXwTaZDPIsgrp0pgsFSLjd4+uvd32F6nYgkfwteKASTigcjZH seIQrbIIcCOpNJGeokNM5C6Repl8XvB8UU3nAY/xrUDp9cNNgLm7M/tWcpJwswfS3KOx r6+YO8OQphr8JrIDORTwMdKEkkcSyAFv5pSBwwpIRRHY6+vTLLY9S4Kzc5ivjfOulU5j X5P7CHPSfXi/DjBaYHiFGz0SihbgCLrL+K3q8WdIEATQGBMZ2lVYQp1vrTgJnahrTIik WP0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SlBkhGpRba6TMwXcLRazv9gVKrhVY015jiIAxYeTUWs=; b=p5+VZVl+tfFDpVJntK0d7nUR5zQ6NZypXjMOj1UyWPBtIC0nsGLZ1/lCTZsxZw8r6G sZjsGzDq02F4+V8oOAOVAm97XAc3lPaXGkMDVQQrpvcnCs25vCCaXpVqXKd6FuKQtKmT xplfueofRjaY7e60bPfUHG4S2lpTbI6UBOztzNakNhtqr03cebEJuOT7XMZR/RNNEUv5 5Lnp7c71o0X3t0/NRIXz/jZ44Rv6bGdkWzcvS9ilPGSgvezLamYsKRiVQfmB5UJKPmmq 4MIQSgalqsshspVBslyk1uRgbhfDEYGp4Zzq/MVusRpzGSSkrWKCi8vP4m0reQ9h0VNB 09yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rfazNRBn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v9-20020a63b949000000b0045a2b6e1192si18665980pgo.233.2022.10.19.06.48.09; Wed, 19 Oct 2022 06:48:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rfazNRBn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233548AbiJSNrm (ORCPT + 99 others); Wed, 19 Oct 2022 09:47:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233032AbiJSNqS (ORCPT ); Wed, 19 Oct 2022 09:46:18 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF44113D7F; Wed, 19 Oct 2022 06:32:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id EE0E8B82432; Wed, 19 Oct 2022 08:57:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6508DC433D6; Wed, 19 Oct 2022 08:57:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169863; bh=3xApLsiBrtBLdrTTC/e7moWt4ozJ/XaI6HBikH3qPtI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rfazNRBnjV7mIAOs7QkD8sgANFpmJtDsQXB0utz/NdlKaw6B5qiqysaIWtPQD96yl bRwxHf51kLeFpUUl1yIaEbHrZfixi+fmXP7V/tvY9iNobB7XfFSOsraVlVpO7G8/bv PR9QYevtcFg7DYWM37bY/PGsdUCxdIJgJ2xnO2GY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Packham , Gregory CLEMENT , Sasha Levin Subject: [PATCH 6.0 437/862] arm64: dts: marvell: 98dx25xx: use correct property for i2c gpios Date: Wed, 19 Oct 2022 10:28:44 +0200 Message-Id: <20221019083309.295930262@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747124018185979479?= X-GMAIL-MSGID: =?utf-8?q?1747124018185979479?= From: Chris Packham [ Upstream commit 2b14d382ec97ca5b420239ee6e16da390fab476c ] Use the correct names for scl-gpios and sda-gpios so that the generic i2c recovery code will find them. While we're here set the GPIO_OPEN_DRAIN flag on the gpios. Fixes: b795fadfc46b ("arm64: dts: marvell: Add Armada 98DX2530 SoC and RD-AC5X board") Signed-off-by: Chris Packham Signed-off-by: Gregory CLEMENT Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi index 80b44c7df56a..881bf948d1df 100644 --- a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi +++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi @@ -117,8 +117,8 @@ pinctrl-names = "default", "gpio"; pinctrl-0 = <&i2c0_pins>; pinctrl-1 = <&i2c0_gpio>; - scl_gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>; - sda_gpio = <&gpio0 27 GPIO_ACTIVE_HIGH>; + scl-gpios = <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio0 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; }; @@ -136,8 +136,8 @@ pinctrl-names = "default", "gpio"; pinctrl-0 = <&i2c1_pins>; pinctrl-1 = <&i2c1_gpio>; - scl_gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>; - sda_gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>; + scl-gpios = <&gpio0 20 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; };