diff mbox

ARM: multi_v7_defconfig: Enable CROS_EC_PROTO for ChromeOS EC mfd driver

Message ID 1439881827-22613-1-git-send-email-javier@osg.samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Javier Martinez Canillas Aug. 18, 2015, 7:10 a.m. UTC
The ChromeOS mfd driver (MFD_CROS_EC) select the CROS_EC_PROTO config
symbol because the driver uses some communication helper functions in
drivers/platform/chrome/cros_ec_proto.c but other drivers depends on
CROS_EC_PROTO instead. Mixing select and depends can lead to circular
Kconfig dependencies so the MFD_CROS_EC select should be changed to a
depends on CROS_EC_PROTO instead.

But doing so will break git bisect-ability since MFD_CROS_EC will not
be enabled anymore unless the default configs first explicitly enable
the CROS_EC_PROTO dependency.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Olof Johansson Aug. 18, 2015, 9:46 p.m. UTC | #1
On Tue, Aug 18, 2015 at 09:10:27AM +0200, Javier Martinez Canillas wrote:
> The ChromeOS mfd driver (MFD_CROS_EC) select the CROS_EC_PROTO config
> symbol because the driver uses some communication helper functions in
> drivers/platform/chrome/cros_ec_proto.c but other drivers depends on
> CROS_EC_PROTO instead. Mixing select and depends can lead to circular
> Kconfig dependencies so the MFD_CROS_EC select should be changed to a
> depends on CROS_EC_PROTO instead.
> 
> But doing so will break git bisect-ability since MFD_CROS_EC will not
> be enabled anymore unless the default configs first explicitly enable
> the CROS_EC_PROTO dependency.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

Applied to cros/ec-config in arm-soc, which will stay stable in case others
need to bring in as a prereq.


-Olof
Javier Martinez Canillas Aug. 18, 2015, 10:28 p.m. UTC | #2
Hello Olof,

On 08/18/2015 11:46 PM, Olof Johansson wrote:
> On Tue, Aug 18, 2015 at 09:10:27AM +0200, Javier Martinez Canillas wrote:
>> The ChromeOS mfd driver (MFD_CROS_EC) select the CROS_EC_PROTO config
>> symbol because the driver uses some communication helper functions in
>> drivers/platform/chrome/cros_ec_proto.c but other drivers depends on
>> CROS_EC_PROTO instead. Mixing select and depends can lead to circular
>> Kconfig dependencies so the MFD_CROS_EC select should be changed to a
>> depends on CROS_EC_PROTO instead.
>>
>> But doing so will break git bisect-ability since MFD_CROS_EC will not
>> be enabled anymore unless the default configs first explicitly enable
>> the CROS_EC_PROTO dependency.
>>
>> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> 
> Applied to cros/ec-config in arm-soc, which will stay stable in case others
> need to bring in as a prereq.
>

Thanks but Bartolomiej's feedback [0] on my patch that made CROS_EC_PROTO
a user selectable option was to leave it as a non-visible option and instead
change the other Kconfig symbols to select CROS_EC_PROTO consistently.

So tomorrow I'll post a new patch series along those lines that will make
this patch obsolete since no defconfig changes will be needed.

IOW, please drop this patch and sorry for the inconvenience.

> 
> -Olof
> 

[0]: https://lkml.org/lkml/2015/8/18/231

Best regards,
Olof Johansson Aug. 19, 2015, 4:18 p.m. UTC | #3
On Wed, Aug 19, 2015 at 12:28:37AM +0200, Javier Martinez Canillas wrote:
> Hello Olof,
> 
> On 08/18/2015 11:46 PM, Olof Johansson wrote:
> > On Tue, Aug 18, 2015 at 09:10:27AM +0200, Javier Martinez Canillas wrote:
> >> The ChromeOS mfd driver (MFD_CROS_EC) select the CROS_EC_PROTO config
> >> symbol because the driver uses some communication helper functions in
> >> drivers/platform/chrome/cros_ec_proto.c but other drivers depends on
> >> CROS_EC_PROTO instead. Mixing select and depends can lead to circular
> >> Kconfig dependencies so the MFD_CROS_EC select should be changed to a
> >> depends on CROS_EC_PROTO instead.
> >>
> >> But doing so will break git bisect-ability since MFD_CROS_EC will not
> >> be enabled anymore unless the default configs first explicitly enable
> >> the CROS_EC_PROTO dependency.
> >>
> >> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> > 
> > Applied to cros/ec-config in arm-soc, which will stay stable in case others
> > need to bring in as a prereq.
> >
> 
> Thanks but Bartolomiej's feedback [0] on my patch that made CROS_EC_PROTO
> a user selectable option was to leave it as a non-visible option and instead
> change the other Kconfig symbols to select CROS_EC_PROTO consistently.
> 
> So tomorrow I'll post a new patch series along those lines that will make
> this patch obsolete since no defconfig changes will be needed.
> 
> IOW, please drop this patch and sorry for the inconvenience.

Done.


-Olof
diff mbox

Patch

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index b2facab87399..bd406f660ffe 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -619,6 +619,7 @@  CONFIG_QCOM_PM=y
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_PROTO=y
 CONFIG_COMMON_CLK_MAX77686=y
 CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_S2MPS11=m