From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752624AbcCAI52 (ORCPT ); Tue, 1 Mar 2016 03:57:28 -0500 Received: from mail-oi0-f67.google.com ([209.85.218.67]:34015 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751881AbcCAI51 (ORCPT ); Tue, 1 Mar 2016 03:57:27 -0500 MIME-Version: 1.0 In-Reply-To: <56C00BBB.4080807@samsung.com> References: <1454652269-6100-1-git-send-email-alim.akhtar@samsung.com> <56C00BBB.4080807@samsung.com> Date: Tue, 1 Mar 2016 17:57:26 +0900 X-Google-Sender-Auth: _axgMxvSpPlI89stNiP7pzAXiHo Message-ID: Subject: Re: [PATCH v3] arm64: defconfig: Enable samsung MFD and related configs From: Krzysztof Kozlowski To: Alim Akhtar , linux-arm-kernel@lists.infradead.org Cc: Krzysztof Kozlowski , catalin.marinas@arm.com, arnd@arndb.de, olof@lixom.net, linux-kernel@vger.kernel.org, Kevin Hilman Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2016-02-14 14:08 GMT+09:00 Krzysztof Kozlowski : > 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? Never mind, applied because I have one more defconfig patch. The conflict will be still there but easy to solve. Best regards, Krzysztof