Message-id: <55A6FE07.7000604@samsung.com>
Date: Thu, 16 Jul 2015 09:42:47 +0900
From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101
 Thunderbird/31.7.0
MIME-version: 1.0
To: Javier Martinez Canillas <javier@dowhile0.org>
Cc: arm@kernel.org, Arnd Bergmann <arnd@arndb.de>,
        Olof Johansson <olof@lixom.net>, Kevin Hilman <khilman@linaro.org>,
        Doug Anderson <dianders@chromium.org>, Kukjin Kim <kgene@kernel.org>,
        "linux-samsung-soc@vger.kernel.org" 
	<linux-samsung-soc@vger.kernel.org>,
        Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/9] ARM: multi_v7_defconfig: Enable max77802 regulator,
 rtc and clock drivers
References: <1431618016-2087-1-git-send-email-javier.martinez@collabora.co.uk>
 <1431618016-2087-3-git-send-email-javier.martinez@collabora.co.uk>
 <CABxcv=maAMu=+JcRfkErBHUdz+Y6CWg5S1qCg=YnRJc6TqPsVg@mail.gmail.com>
In-reply-to: <CABxcv=maAMu=+JcRfkErBHUdz+Y6CWg5S1qCg=YnRJc6TqPsVg@mail.gmail.com>
Content-type: text/plain; charset=utf-8
Content-transfer-encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1741
Lines: 45

On 16.07.2015 00:38, Javier Martinez Canillas wrote:
> Hello,
> 
> On Thu, May 14, 2015 at 5:40 PM, Javier Martinez Canillas
> <javier.martinez@collabora.co.uk> wrote:
>> The Maxim max77802 Power Management IC is used on many Exynos machines.
>> Besides a bunch of regulators, this chip has a Real-Time-Clock (RTC)
>> and 2-channel 32kHz clock outputs.
>>
>> Enable the kernel config options to have the drivers for these devices
>> built as a module.
>>
>> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
>> ---
>>  arch/arm/configs/multi_v7_defconfig | 3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
>> index 2349584b6e08..080120fe5580 100644
>> --- a/arch/arm/configs/multi_v7_defconfig
>> +++ b/arch/arm/configs/multi_v7_defconfig
>> @@ -373,6 +373,7 @@ CONFIG_POWER_RESET_SYSCON=y
>>  CONFIG_REGULATOR_MAX8907=y
>>  CONFIG_REGULATOR_MAX8973=y
>>  CONFIG_REGULATOR_MAX77686=y
>> +CONFIG_REGULATOR_MAX77802=m
> 
> I noticed that the version that landed in 4.2-rc1 as commit
> f3caa529c6f5 ("ARM: multi_v7_defconfig: Enable max77802 regulator, rtc
> and clock drivers") doesn't include this symbol. I guess it was caused
> by a wrong resolved conflict? I'll post a patch to enable the
> regulator again.

As you can see in mentioned mainline commit Kukjin removed it manually:
[kgene@kernel.org: removing useless REGULATOR_MAX77802 config]

I wonder why?

Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/