[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <55A74184.5050900@osg.samsung.com>
Date: Thu, 16 Jul 2015 07:30:44 +0200
From: Javier Martinez Canillas <javier@....samsung.com>
To: Krzysztof Kozlowski <k.kozlowski@...sung.com>,
Javier Martinez Canillas <javier@...hile0.org>
Cc: arm@...nel.org, Arnd Bergmann <arnd@...db.de>,
Olof Johansson <olof@...om.net>,
Kevin Hilman <khilman@...aro.org>,
Doug Anderson <dianders@...omium.org>,
Kukjin Kim <kgene@...nel.org>,
"linux-samsung-soc@...r.kernel.org"
<linux-samsung-soc@...r.kernel.org>,
Linux Kernel <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 2/9] ARM: multi_v7_defconfig: Enable max77802 regulator,
rtc and clock drivers
Hello Krzysztof,
On 07/16/2015 02:42 AM, Krzysztof Kozlowski wrote:
> 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@...labora.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@...labora.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@...nel.org: removing useless REGULATOR_MAX77802 config]
>
Oh, I missed that in the commit message. I thought it was a merge / conflict
error, not something done on purpose.
> I wonder why?
>
Me too.
> Best regards,
> Krzysztof
> --
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists