From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751608AbcBNFIR (ORCPT ); Sun, 14 Feb 2016 00:08:17 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35299 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750896AbcBNFIQ (ORCPT ); Sun, 14 Feb 2016 00:08:16 -0500 Subject: Re: [PATCH v3] arm64: defconfig: Enable samsung MFD and related configs To: Alim Akhtar , linux-arm-kernel@lists.infradead.org References: <1454652269-6100-1-git-send-email-alim.akhtar@samsung.com> Cc: k.kozlowski.k@gmail.com, catalin.marinas@arm.com, arnd@arndb.de, olof@lixom.net, linux-kernel@vger.kernel.org, Kevin Hilman From: Krzysztof Kozlowski Message-ID: <56C00BBB.4080807@samsung.com> Date: Sun, 14 Feb 2016 14:08:11 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1454652269-6100-1-git-send-email-alim.akhtar@samsung.com> Content-Type: text/plain; charset=iso-8859-2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org W dniu 05.02.2016 o 15:04, Alim Akhtar pisze: > Exynos7 based espresso board uses S2MPS15, a multifunction device. > This patch enables S2MPS1X regulator, pmic-clk and rtc drivers utilized by > the same. > > Signed-off-by: Alim Akhtar > Reviewed-by: Krzysztof Kozlowski > --- > Changes since v2: > * Added Reviewed-by from Krzysztof > * rebased on next-20160204 > > Changes since v1: > * updated the comment message to describe which platfrom uses it. > * enable COMMON_CLK_S2MPS11 which is needed to enable pmic-clk block. > > arch/arm64/configs/defconfig | 3 +++ > 1 file changed, 3 insertions(+) > Applying this to my tree would cause conflicts with commit efdda175c07f: arm64: defconfig: add spmi and usb related configs Conflicts are trivial (simple additions) but maybe it is better to avoid them. Olof/Arnd/Kevin, can you apply this directly to arm-soc? Best regards, Krzysztof > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > index 86581f7..2fd2264 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -151,9 +151,11 @@ CONFIG_GPIO_XGENE=y > CONFIG_POWER_RESET_XGENE=y > CONFIG_POWER_RESET_SYSCON=y > # CONFIG_HWMON is not set > +CONFIG_MFD_SEC_CORE=y > CONFIG_REGULATOR=y > CONFIG_REGULATOR_FIXED_VOLTAGE=y > CONFIG_REGULATOR_QCOM_SMD_RPM=y > +CONFIG_REGULATOR_S2MPS11=y > CONFIG_FB=y > CONFIG_FB_ARMCLCD=y > CONFIG_FRAMEBUFFER_CONSOLE=y > @@ -188,6 +190,7 @@ CONFIG_LEDS_TRIGGERS=y > CONFIG_LEDS_TRIGGER_HEARTBEAT=y > CONFIG_LEDS_TRIGGER_CPU=y > CONFIG_RTC_CLASS=y > +CONFIG_RTC_DRV_S5M=y > CONFIG_RTC_DRV_EFI=y > CONFIG_RTC_DRV_PL031=y > CONFIG_RTC_DRV_XGENE=y >