From patchwork Thu Feb 29 10:58:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 208306 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp311052dyb; Thu, 29 Feb 2024 02:59:34 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWGhaUSNV5gjZUnLUteUiFQ5XVXwNHDoGcwuu+iyup37dJWP/qTVhC7TqpL7qbLALN2FgX7XAUqBoeSXCQ3ZuUK5EqUSA== X-Google-Smtp-Source: AGHT+IHrNRSHZFIeKSTKnukSmFI1RQVHXsrh0QXJ5UkUhxgg62pG+PPPQgBs+Vp15uEaFyY9nl8W X-Received: by 2002:a05:6402:2227:b0:566:ef9:a499 with SMTP id cr7-20020a056402222700b005660ef9a499mr1228255edb.1.1709204374394; Thu, 29 Feb 2024 02:59:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709204374; cv=pass; d=google.com; s=arc-20160816; b=cAAI0gJCzm6Bq1bfsna/BKYF6vyww3gP6w5gK3pESx4FVXfSDh1CnWE42c/r7HB6FA /r9cZQgAYGPuhpXt/IcbRWnoBgyxqG20cSCyZR7t9jEdOZ0jCEdYgLgprrlKhke2l9yJ xLmfdqyop+tHLXtj0nvpBnNrQjhWZQNueZ6MFQ0Gtuuwc/61bV0Aw3EUPcpXf6siO7Ge 7yCAWyrV4w41i0Cbbc5r127lUXB39mqdmfyq/zk0MTihTLY4GqmuJHRDzZXIP3KJlcxv cObvrqLbicU9K1UYy8l7cLux6MmuoUjzJYyGZXSnhe/Qq8ANHB/2a9Pf83cQCRg1bgPE 7bgw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=/y+V+1tDgCSb4ph0B2hx85t2I6GTJ/+BzAqonnhqTB8=; fh=VfhsHdI/Eb088J3tzGeWQ5NjURcM3nm+UYhlURhCooI=; b=pDshugB2yl5M60OT0yiV4i3qSG5keENGK2flRdRoatg076ghyoL9lIsOanqMzQlpsr +deY4lLuhhxbFNDtx9iPy1icW5SFzXVpFslhiSLqsHrrG4r2O02ul+PlD+9nrj1zTh8J vG+8bFjznaQIZFivqc7YYX6I1q4vW9iyilbJnqe0fTyadJkbCJfwO6QWTPsfAjgCOVw8 QUEhii2jSAtv4QtOs7cwVBxh9vE4TfBG68WDrE23+v8J7FvQ0EbScVPJ+P0H5qUjktuN C0DoGcf2vCCKSDk7bVn3i8K/jHV2fVhmbjGebuuHth0ksl5+2f+Pr44EPUi2zpNNJez9 Ynhg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@sang-engineering.com header.s=k1 header.b=YdJSz+rp; arc=pass (i=1 spf=pass spfdomain=sang-engineering.com dkim=pass dkdomain=sang-engineering.com); spf=pass (google.com: domain of linux-kernel+bounces-86595-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86595-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id n12-20020aa7c68c000000b005647c582612si485484edq.456.2024.02.29.02.59.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 02:59:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-86595-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@sang-engineering.com header.s=k1 header.b=YdJSz+rp; arc=pass (i=1 spf=pass spfdomain=sang-engineering.com dkim=pass dkdomain=sang-engineering.com); spf=pass (google.com: domain of linux-kernel+bounces-86595-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86595-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 0A76D1F2485A for ; Thu, 29 Feb 2024 10:59:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 675427C0A5; Thu, 29 Feb 2024 10:58:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="YdJSz+rp" Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 603437A72A for ; Thu, 29 Feb 2024 10:58:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709204326; cv=none; b=lgSr/0euoQaRBnY/2nSMtp+CbFoQ01G7SfNFuIxdnMqykRZge9ehn7bcVWX0kQLCZc2gyWT6CsBQBL+dlVPAtz2+4DcwWYAXEDRajN9VnQO0sIHq9FYVxLOYj11TWcT/rSmUK9ccqquQkICdD8Purlli3kfaXHZN6DclzW3h518= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709204326; c=relaxed/simple; bh=4sd9fX38+0z52dugV8+bmNK8bTTLEY/RwiQhB+Ew+3o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K925ZWOH1GqNoupxcuyvPXGg0T9e2SqGvaAWDSAnUsXFKLlWPVtL7YTyFnGKNEAgTigVN79pUeA1OJh2yhlhd1XPdRA1zAw1usXPnqJLhXixDI1rTGryqgORGLWioHIcpPHJQsXLkWNx4vo4rIrZ4jSeTbCUFFturF+bXO9qcOw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=YdJSz+rp; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=/y+V+1tDgCSb4ph0B2hx85t2I6GTJ/+BzAqonnhqTB8=; b=YdJSz+ rpcAmXCgqbn1v1cUEbTTDDpOgjF7pnjkR8hkIsu5mNBTXNXUYRpf5s5wM9QK5L5D deKqAOGQj7PrasgO0ICEidD8sNay1Jg9vrUK8A6JinY2ztncHFzIJsM0PR98u8V1 Se0qT9pJyX8jYhxYRNaxLvHalG/guPXYlvLhLwxnXzhQjtRGXqIV/IDw0d35Zr5f F2s5sdfGw4n3kb+hY4XryMu2spb+G1uetsmT2ndWEALt/1mHxX7MM3vqSX1MGtYD 4kpIlhGX8CdXIx3fknrmoksOlKyAUe+6rszMxZ5s66MAgldFV0CuqMuNNvvy1yzo 8B+n54pmGeXUcowQ== Received: (qmail 2278070 invoked from network); 29 Feb 2024 11:58:42 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 29 Feb 2024 11:58:42 +0100 X-UD-Smtp-Session: l3s3148p1@8KB2JIMSfDttKPFZ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Chris Packham , Rob Herring , Wolfram Sang , Andi Shyti , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RFT 2/3] i2c: mpc: use proper binding for transfer timeouts Date: Thu, 29 Feb 2024 11:58:12 +0100 Message-ID: <20240229105810.29220-7-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240229105810.29220-5-wsa+renesas@sang-engineering.com> References: <20240229105810.29220-5-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792230686169948612 X-GMAIL-MSGID: 1792230686169948612 "i2c-scl-clk-low-timeout-us" is wrongly used here because it describes maximum clock stretching not maximum transfer time. Additionally, it is deprecated because of issues. Move this driver to the correct binding. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-mpc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index e4e4995ab224..0b4de9e569ba 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -844,14 +844,14 @@ static int fsl_i2c_probe(struct platform_device *op) mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock); } - /* - * "fsl,timeout" has been marked as deprecated and, to maintain - * backward compatibility, we will only look for it if - * "i2c-scl-clk-low-timeout-us" is not present. - */ + /* Sadly, we have to support two deprecated bindings here */ result = of_property_read_u32(op->dev.of_node, - "i2c-scl-clk-low-timeout-us", + "i2c-transfer-timeout-us", &mpc_ops.timeout); + if (result == -EINVAL) + result = of_property_read_u32(op->dev.of_node, + "i2c-scl-clk-low-timeout-us", + &mpc_ops.timeout); if (result == -EINVAL) result = of_property_read_u32(op->dev.of_node, "fsl,timeout", &mpc_ops.timeout);