From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84FAEC468BC for ; Mon, 10 Jun 2019 06:44:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50A63207E0 for ; Mon, 10 Jun 2019 06:44:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JUO0jDnb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387829AbfFJGoh (ORCPT ); Mon, 10 Jun 2019 02:44:37 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36836 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387718AbfFJGoe (ORCPT ); Mon, 10 Jun 2019 02:44:34 -0400 Received: by mail-wr1-f67.google.com with SMTP id n4so7934290wrs.3 for ; Sun, 09 Jun 2019 23:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=6v285XyrONVGX85JZPN2vEBoOamuC/TCwUgIuT1MYVI=; b=JUO0jDnbhpEfAJfOIn/mmbA+BYvZwYR3dpEtmWpv9PZIPu+703QoKa9lYvNN7XE01N AVuskQ8lgqYi+ReRHmxOrXd+3ZIitSv/af+yb//VqjPkALpRfqUZdL/uGfKplsJoFcGw dz7tWj7T0RpYSYQNTTZ1dnCBTeRYE4/Ss6EQ2RS+ITbVhrViYs2H0KPJims9t1QepBn6 fae6961ZZ0d1mcM/cSiHvZVl4tLZgujzYzWG9ouCPAuwDM1CzhtchbqGQkSuZ7/q8F20 tbp9aLC0U4YJItjQdYRh9Y8lOaSRcOuO4hKmsKR1J6jdVcvCG0XFPTTX4C383DwnePsf sP/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=6v285XyrONVGX85JZPN2vEBoOamuC/TCwUgIuT1MYVI=; b=JlhxCh+BUzBtE++49mIzTh1KB89yretlW6BK9Nmz247lAr5oYzLotcoDsx72VZdLjs 3CzEPFK1wd4womVjxYcRdpnwxGz03h42ppogoPFXNUkPMd6jPjzSYUjaHXE23XTfLvj+ V9/s60aXvPXk4OUwvh3vCfg4vCIc9hRvQjovEAcNxWVyGcKg9NlxlAMIPG0BWeX89ppq //pSA67CKQHaVf7LNBg6/cA3tvbNU4aooLBGMMuTvkAzs9F5uE6yU8rGMBVh5z33+TC3 ps3ZxhQfk9K2XvjU4HjfN0asG88Ij82z9F5o1Brq1UtmdpnQuSsTTR8CPHMRocJE+kNK JOMw== X-Gm-Message-State: APjAAAUYY7EAgpBMV6MQqSsS87IJ3jXDTKguVt9IaPjYgipOuS8Ltydd TRTdsZOtrFmNGCY669pz72v1Ew== X-Google-Smtp-Source: APXvYqy45tNcTtpg/c94lrABKtUPI2IloeMt1vo9EvaBBcW/D4raRflIRHWeOa3AYFf8Fefw5c/jrg== X-Received: by 2002:adf:a11d:: with SMTP id o29mr14522807wro.262.1560149071686; Sun, 09 Jun 2019 23:44:31 -0700 (PDT) Received: from dell ([2.31.167.229]) by smtp.gmail.com with ESMTPSA id a2sm5038333wmj.9.2019.06.09.23.44.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Jun 2019 23:44:30 -0700 (PDT) Date: Mon, 10 Jun 2019 07:44:28 +0100 From: Lee Jones To: Ard Biesheuvel Cc: alokc@codeaurora.org, Andy Gross , David Brown , wsa+renesas@sang-engineering.com, Bjorn Andersson , Linus Walleij , balbi@kernel.org, Greg Kroah-Hartman , linux-arm-msm , linux-usb , Linux Kernel Mailing List , "open list:GPIO SUBSYSTEM" , linux-i2c , Jeffrey Hugo , linux-arm-kernel Subject: Re: [PATCH v2 1/8] i2c: i2c-qcom-geni: Provide support for ACPI Message-ID: <20190610064428.GF4797@dell> References: <20190607082901.6491-1-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Fri, 07 Jun 2019, Ard Biesheuvel wrote: > On Fri, 7 Jun 2019 at 10:29, Lee Jones wrote: > > > > Add a match table to allow automatic probing of ACPI device > > QCOM0220. Ignore clock attainment errors. Set default clock > > frequency value. > > > > Signed-off-by: Lee Jones > > --- > > drivers/i2c/busses/i2c-qcom-geni.c | 19 +++++++++++++++++-- > > 1 file changed, 17 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c > > index db075bc0d952..0fa93b448e8d 100644 > > --- a/drivers/i2c/busses/i2c-qcom-geni.c > > +++ b/drivers/i2c/busses/i2c-qcom-geni.c > > @@ -1,6 +1,7 @@ > > // SPDX-License-Identifier: GPL-2.0 > > // Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. > > > > +#include > > #include > > #include > > #include > > @@ -483,6 +484,12 @@ static const struct i2c_algorithm geni_i2c_algo = { > > .functionality = geni_i2c_func, > > }; > > > > +static const struct acpi_device_id geni_i2c_acpi_match[] = { > > + { "QCOM0220"}, > > + { }, > > +}; > > +MODULE_DEVICE_TABLE(acpi, geni_i2c_acpi_match); > > + > > We usually put #ifdef CONFIG_ACPI/#endif around these, otherwise you > end up with acpi:XXXX modaliases even though ACPI is not compiled in. No problem. > > static int geni_i2c_probe(struct platform_device *pdev) > > { > > struct geni_i2c_dev *gi2c; > > @@ -502,7 +509,7 @@ static int geni_i2c_probe(struct platform_device *pdev) > > return PTR_ERR(gi2c->se.base); > > > > gi2c->se.clk = devm_clk_get(&pdev->dev, "se"); > > Can we avoid this call altogether in ACPI mode? Also, please use I'm trying not to place all non-ACPI specific callers into if () statements. The tabbing becomes ridiculous in some places. A great deal of these calls are requesting optional resources too, so it's better to simply ignore the returning error in the cases where non-optional resources (such as this one) are requested, since it has the least impact on the existing code. > 'has_acpi_companion()' to test whether we are probing via ACPI. Sure. > > - if (IS_ERR(gi2c->se.clk)) { > > + if (IS_ERR(gi2c->se.clk) && !ACPI_HANDLE(&pdev->dev)) { > > > > ret = PTR_ERR(gi2c->se.clk); > > dev_err(&pdev->dev, "Err getting SE Core clk %d\n", ret); > > return ret; > > @@ -510,12 +517,19 @@ static int geni_i2c_probe(struct platform_device *pdev) > > > > ret = device_property_read_u32(&pdev->dev, "clock-frequency", > > &gi2c->clk_freq_out); > > - if (ret) { > > + if (ret && !ACPI_HANDLE(&pdev->dev)) { > > dev_info(&pdev->dev, > > "Bus frequency not specified, default to 100kHz.\n"); > > gi2c->clk_freq_out = KHZ(100); > > } > > > > + if (ACPI_HANDLE(&pdev->dev)) { > > + ACPI_COMPANION_SET(&gi2c->adap.dev, ACPI_COMPANION(&pdev->dev)); > > + > > + /* Using default, same as the !ACPI case above */ > > + gi2c->clk_freq_out = KHZ(100); > > + } > > + > > You are overriding the speed to 100 kHz even if the ACPI device has a > "clock-frequency" property. Will look at this. Thanks Ard. -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog