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=DKIMWL_WL_HIGH,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_SANE_1 autolearn=ham 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 42322C433DF for ; Mon, 18 May 2020 12:17:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1421220671 for ; Mon, 18 May 2020 12:17:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KxlIN4WS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726872AbgERMRN (ORCPT ); Mon, 18 May 2020 08:17:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40831 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726709AbgERMRM (ORCPT ); Mon, 18 May 2020 08:17:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589804230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Yh5vO2Gg5dFji06v+emn/jnRvsnOOQXkDj34BrphO1M=; b=KxlIN4WSvIrtNCBrNKqlZNr+DR9gTcgb3C0x/bBrBnVVlYvWG5TS9QErOBZknUnavEtWCA m3QysZW2jMYxO5WHQCMDIFWHe0uxg5cu802koC4D/xgL4yNTG/fBZbL+NmN4eE/L+Ekrgf A6+idDDaci4PYbfORbcilATGUfCJxeQ= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-222-U8ela5pTNP6xJkGlIJoCwA-1; Mon, 18 May 2020 08:17:09 -0400 X-MC-Unique: U8ela5pTNP6xJkGlIJoCwA-1 Received: by mail-wm1-f72.google.com with SMTP id a67so5730466wme.6 for ; Mon, 18 May 2020 05:17:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Yh5vO2Gg5dFji06v+emn/jnRvsnOOQXkDj34BrphO1M=; b=E8oE9a1NpDf9eMpr5AasDMNgGeoFwyCCm/6U+FRVKucYH7QDFlgEndPmnaUCLw+zfd YscPawGMg83KPs51RfsI9/pV/0QY2ZY7VUp+AXpCcg135dBbs0YX0PgadNW+aH2vDcST g66rfk3wohCLem3AXj0Jgb2W09fSuUsOhy84cYc8ITwpC7DsiQg2Idni/QMWNmjr4BHu DZzr4tA3IWRchcJbamZZ5F04u7MXCxkffWSciOduEdnxrrybVm6PBLXmtfV+Tqmj5eFK EU5EPmmoNSgUYRrJ7MFAtJE5e1Zz2smruoZKHBfbfUtbhPpNFDxH7GQCGZUHfCFQDxzZ BM/w== X-Gm-Message-State: AOAM533tc/Pnmry8V59FNuMCVpz9aZsPmqprUYXMaBZwmPt/c2bOSR+W 1eYtuM5VPURS4UGxYIU+XHnj5tmely8JmSQ/N5VSDyuebEsD59n7JNuYQHl6JRUkkHkUcZp/9a5 tfHCRYNqTivpPcYouEb0ZKw== X-Received: by 2002:a1c:740e:: with SMTP id p14mr19802615wmc.102.1589804228224; Mon, 18 May 2020 05:17:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZrSaW2VgPzMxopUFFxgNCFG8RAtoZX09dfcU6tGBhfVESSetsYttNxtEHg6rCsmAFH0DODg== X-Received: by 2002:a1c:740e:: with SMTP id p14mr19802593wmc.102.1589804227911; Mon, 18 May 2020 05:17:07 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c0c-fe00-d2ea-f29d-118b-24dc.cable.dynamic.v6.ziggo.nl. [2001:1c00:c0c:fe00:d2ea:f29d:118b:24dc]) by smtp.gmail.com with ESMTPSA id f127sm16989995wmf.17.2020.05.18.05.17.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 May 2020 05:17:07 -0700 (PDT) Subject: Re: [PATCH v3 3/3] mfd: ensure that AXP20X_I2C will have the right deps on X86 To: Mauro Carvalho Chehab Cc: "Rafael J. Wysocki" , Len Brown , Lee Jones , Wolfram Sang , Jean Delvare , Jarkko Nikula , Krzysztof Kozlowski , Alexandre Belloni , Max Staudt , Stefan Roese , linux-acpi@vger.kernel.org, linux-i2c@vger.kernel.org References: From: Hans de Goede Message-ID: Date: Mon, 18 May 2020 14:17:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Hi, On 5/18/20 1:42 PM, Mauro Carvalho Chehab wrote: > The axp20x I2C driver can be used on X86, but also on ARM > platforms. > > Yet, for X86, it has to be builtin and need ACPI OpRegion > support enabled. > > So, the dependency chain is diferent for X86 and for other > archs. > > Change the dependency chain to take this into consideration, > ensuring that everything will be set as it should. > > Signed-off-by: Mauro Carvalho Chehab Hmm, last time we tried something like this (it was tried before, but in a bit different way) we ran into all kind of dependency / select cycles / issues. With that said I'm fine with giving this another try, maybe let the test builders / rand config builds play with it for a while and see what happens? Regards, Hans > --- > drivers/acpi/Kconfig | 3 ++- > drivers/i2c/busses/Kconfig | 4 ++-- > drivers/mfd/Kconfig | 21 ++++++++++++++++----- > drivers/mfd/Makefile | 8 +++++--- > 4 files changed, 25 insertions(+), 11 deletions(-) > > diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig > index ce2730d61a8f..4490200ef134 100644 > --- a/drivers/acpi/Kconfig > +++ b/drivers/acpi/Kconfig > @@ -547,7 +547,8 @@ config CHTCRC_PMIC_OPREGION > > config XPOWER_PMIC_OPREGION > bool "ACPI operation region support for XPower AXP288 PMIC" > - depends on MFD_AXP20X_I2C && IOSF_MBI=y > + depends on MFD_AXP20X_I2C > + select IOSF_MBI > help > This config adds ACPI operation region support for XPower AXP288 PMIC. > > diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig > index 2ddca08f8a76..202e743c8e3e 100644 > --- a/drivers/i2c/busses/Kconfig > +++ b/drivers/i2c/busses/Kconfig > @@ -563,8 +563,8 @@ config I2C_DESIGNWARE_PCI > config I2C_DESIGNWARE_BAYTRAIL > bool "Intel Baytrail I2C semaphore support" > depends on ACPI > - depends on (I2C_DESIGNWARE_PLATFORM=m && IOSF_MBI) || \ > - (I2C_DESIGNWARE_PLATFORM=y && IOSF_MBI=y) > + depends on I2C_DESIGNWARE_PLATFORM=y > + select IOSF_MBI > help > This driver enables managed host access to the PMIC I2C bus on select > Intel BayTrail platforms using the X-Powers AXP288 PMIC. It allows > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index 167f117ff015..11bbbed30098 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -187,7 +187,7 @@ config MFD_AXP20X_I2C > tristate "X-Powers AXP series PMICs with I2C" > select MFD_AXP20X > select REGMAP_I2C > - depends on I2C > + depends on !X86 || (X86 && I2C_DESIGNWARE_PLATFORM=y && I2C_DESIGNWARE_BAYTRAIL=y && ACPI_I2C_OPREGION) > help > If you say Y here you get support for the X-Powers AXP series power > management ICs (PMICs) controlled with I2C. > @@ -195,10 +195,21 @@ config MFD_AXP20X_I2C > components like regulators or the PEK (Power Enable Key) under the > corresponding menus. > > - Note on x86 this provides an ACPI OpRegion, so this must be 'y' > - (builtin) and not a module, as the OpRegion must be available as > - soon as possible. For the same reason the I2C bus driver options > - I2C_DESIGNWARE_PLATFORM and I2C_DESIGNWARE_BAYTRAIL must be 'y' too. > + Note on x86 this provides an ACPI OpRegion, so enabling it > + requires that I2C_DESIGNWARE_PLATFORM and I2C_DESIGNWARE_BAYTRAIL > + to be set as 'y'. On such architecture, the driver, if enabled, > + will always be (builtin) and not a module, as the OpRegion must be > + available as soon as possible. > + > +config MFD_AXP20X_X86 > + bool > + depends on X86 > + default MFD_AXP20X_I2C > + > +config MFD_AXP20X_NOT_X86 > + tristate > + depends on !X86 > + default MFD_AXP20X_I2C > > config MFD_AXP20X_RSB > tristate "X-Powers AXP series PMICs with RSB" > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > index f935d10cbf0f..dd902b5c31ff 100644 > --- a/drivers/mfd/Makefile > +++ b/drivers/mfd/Makefile > @@ -142,9 +142,11 @@ obj-$(CONFIG_MFD_DA9052_SPI) += da9052-spi.o > obj-$(CONFIG_MFD_DA9052_I2C) += da9052-i2c.o > > obj-$(CONFIG_MFD_AC100) += ac100.o > -obj-$(CONFIG_MFD_AXP20X) += axp20x.o > -obj-$(CONFIG_MFD_AXP20X_I2C) += axp20x-i2c.o > -obj-$(CONFIG_MFD_AXP20X_RSB) += axp20x-rsb.o > + > +obj-$(CONFIG_MFD_AXP20X) += axp20x.o > +obj-$(CONFIG_MFD_AXP20X_I2C_X86) += axp20x-i2c.o > +obj-$(CONFIG_MFD_AXP20X_I2C_NOT_X86) += axp20x-i2c.o > +obj-$(CONFIG_MFD_AXP20X_RSB) += axp20x-rsb.o > > obj-$(CONFIG_MFD_LP3943) += lp3943.o > obj-$(CONFIG_MFD_LP8788) += lp8788.o lp8788-irq.o >