From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752448AbbGPFav (ORCPT ); Thu, 16 Jul 2015 01:30:51 -0400 Received: from lists.s-osg.org ([54.187.51.154]:53172 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752150AbbGPFat (ORCPT ); Thu, 16 Jul 2015 01:30:49 -0400 Subject: Re: [PATCH 2/9] ARM: multi_v7_defconfig: Enable max77802 regulator, rtc and clock drivers To: Krzysztof Kozlowski , Javier Martinez Canillas References: <1431618016-2087-1-git-send-email-javier.martinez@collabora.co.uk> <1431618016-2087-3-git-send-email-javier.martinez@collabora.co.uk> <55A6FE07.7000604@samsung.com> Cc: arm@kernel.org, Arnd Bergmann , Olof Johansson , Kevin Hilman , Doug Anderson , Kukjin Kim , "linux-samsung-soc@vger.kernel.org" , Linux Kernel From: Javier Martinez Canillas Message-ID: <55A74184.5050900@osg.samsung.com> Date: Thu, 16 Jul 2015 07:30:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 In-Reply-To: <55A6FE07.7000604@samsung.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >> 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 >>> --- >>> 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, -- Javier Martinez Canillas Open Source Group Samsung Research America From mboxrd@z Thu Jan 1 00:00:00 1970 From: Javier Martinez Canillas Subject: Re: [PATCH 2/9] ARM: multi_v7_defconfig: Enable max77802 regulator, rtc and clock drivers Date: Thu, 16 Jul 2015 07:30:44 +0200 Message-ID: <55A74184.5050900@osg.samsung.com> References: <1431618016-2087-1-git-send-email-javier.martinez@collabora.co.uk> <1431618016-2087-3-git-send-email-javier.martinez@collabora.co.uk> <55A6FE07.7000604@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: Received: from lists.s-osg.org ([54.187.51.154]:53172 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752150AbbGPFat (ORCPT ); Thu, 16 Jul 2015 01:30:49 -0400 In-Reply-To: <55A6FE07.7000604@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org List-Id: linux-samsung-soc@vger.kernel.org To: Krzysztof Kozlowski , Javier Martinez Canillas Cc: arm@kernel.org, Arnd Bergmann , Olof Johansson , Kevin Hilman , Doug Anderson , Kukjin Kim , "linux-samsung-soc@vger.kernel.org" , Linux Kernel 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 >> 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 >>> --- >>> 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, -- Javier Martinez Canillas Open Source Group Samsung Research America