diff mbox

[2/9] ARM: multi_v7_defconfig: Enable max77802 regulator, rtc and clock drivers

Message ID 1431618016-2087-3-git-send-email-javier.martinez@collabora.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Javier Martinez Canillas May 14, 2015, 3:40 p.m. UTC
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(+)

Comments

Javier Martinez Canillas July 15, 2015, 3:38 p.m. UTC | #1
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.

Best regards,
Javier
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski July 16, 2015, 12:42 a.m. UTC | #2
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-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Javier Martinez Canillas July 16, 2015, 5:30 a.m. UTC | #3
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@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]
>

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,
Olof Johansson July 17, 2015, 4:49 p.m. UTC | #4
On Thu, Jul 16, 2015 at 09:42:47AM +0900, 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@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?

Seems odd. exynos_defconfig still enables it.

Javier or Krzysztof, please send an incremental fix to enable and I'll pick
it up as a fix.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Javier Martinez Canillas July 17, 2015, 6:47 p.m. UTC | #5
Hello Olof,

On Fri, Jul 17, 2015 at 6:49 PM, Olof Johansson <olof@lixom.net> wrote:
> On Thu, Jul 16, 2015 at 09:42:47AM +0900, 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@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?
>
> Seems odd. exynos_defconfig still enables it.
>

Yeah since it is needed for at least the Exynos5420 Peach Pit and
Exynos5800 Peach Pi Chromebooks that use this PMIC.

> Javier or Krzysztof, please send an incremental fix to enable and I'll pick
> it up as a fix.
>

I already posted an incremental patch [0] and Krzysztof is pushing it
through Kukjin for 4.3 [1].

I guess that's OK and there is no need to add it as a fix for the 4.2
-rc cycle since this is not really a regression. I mean, the max77802
regulator driver was never enabled for multi_v7_defconfig before.

>
> -Olof

[0]: https://lkml.org/lkml/2015/7/16/60
[1]: https://lkml.org/lkml/2015/7/17/93

Best regards,
Javier
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Olof Johansson July 17, 2015, 6:49 p.m. UTC | #6
Hi,


On Fri, Jul 17, 2015 at 11:47 AM, Javier Martinez Canillas
<javier@dowhile0.org> wrote:
> Hello Olof,
>
> On Fri, Jul 17, 2015 at 6:49 PM, Olof Johansson <olof@lixom.net> wrote:
>> On Thu, Jul 16, 2015 at 09:42:47AM +0900, 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@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?
>>
>> Seems odd. exynos_defconfig still enables it.
>>
>
> Yeah since it is needed for at least the Exynos5420 Peach Pit and
> Exynos5800 Peach Pi Chromebooks that use this PMIC.
>
>> Javier or Krzysztof, please send an incremental fix to enable and I'll pick
>> it up as a fix.
>>
>
> I already posted an incremental patch [0] and Krzysztof is pushing it
> through Kukjin for 4.3 [1].
>
> I guess that's OK and there is no need to add it as a fix for the 4.2
> -rc cycle since this is not really a regression. I mean, the max77802
> regulator driver was never enabled for multi_v7_defconfig before.

Yeah, I came across those emails a little further down. :-) It's all
good, we'll see it come in later.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
kgene@kernel.org July 25, 2015, 2:01 a.m. UTC | #7
Olof Johansson wrote:
> 
> Hi,
> 
Hi,

> On Fri, Jul 17, 2015 at 11:47 AM, Javier Martinez Canillas
> <javier@dowhile0.org> wrote:
> > Hello Olof,
> >
> > On Fri, Jul 17, 2015 at 6:49 PM, Olof Johansson <olof@lixom.net> wrote:
> >> On Thu, Jul 16, 2015 at 09:42:47AM +0900, 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@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?
> >>
> >> Seems odd. exynos_defconfig still enables it.
> >>
It has been removed when I did 'make savedefconfig' at that time maybe because
of dependency with other configs...

> > Yeah since it is needed for at least the Exynos5420 Peach Pit and
> > Exynos5800 Peach Pi Chromebooks that use this PMIC.
> >
> >> Javier or Krzysztof, please send an incremental fix to enable and I'll pick
> >> it up as a fix.
> >>
> >
> > I already posted an incremental patch [0] and Krzysztof is pushing it
> > through Kukjin for 4.3 [1].
> >
Yes. I'll send it out to arm-soc in this weekend.

> > I guess that's OK and there is no need to add it as a fix for the 4.2
> > -rc cycle since this is not really a regression. I mean, the max77802
> > regulator driver was never enabled for multi_v7_defconfig before.
> 
> Yeah, I came across those emails a little further down. :-) It's all
> good, we'll see it come in later.
> 
Thanks,
Kukjin

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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
 CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_S2MPS11=y
 CONFIG_REGULATOR_S5M8767=y
@@ -507,6 +508,7 @@  CONFIG_RTC_DRV_AS3722=y
 CONFIG_RTC_DRV_DS1307=y
 CONFIG_RTC_DRV_MAX8907=y
 CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_MAX77802=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_ST_LPC=y
@@ -548,6 +550,7 @@  CONFIG_NVEC_PAZ00=y
 CONFIG_QCOM_GSBI=y
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMMON_CLK_MAX77686=y
+CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_APQ_MMCC_8084=y
 CONFIG_MSM_GCC_8660=y
 CONFIG_MSM_MMCC_8960=y