From patchwork Wed Dec 2 05:59:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 7742901 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C0F0C9F350 for ; Wed, 2 Dec 2015 05:59:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F37EC20459 for ; Wed, 2 Dec 2015 05:59:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CBDB20456 for ; Wed, 2 Dec 2015 05:59:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751503AbbLBF7S (ORCPT ); Wed, 2 Dec 2015 00:59:18 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:8257 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750884AbbLBF7Q (ORCPT ); Wed, 2 Dec 2015 00:59:16 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NYP009E9VAPUN80@mailout4.w1.samsung.com>; Wed, 02 Dec 2015 05:59:13 +0000 (GMT) X-AuditID: cbfec7f4-f79026d00000418a-d3-565e88b0f5fb Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id A5.E4.16778.0B88E565; Wed, 2 Dec 2015 05:59:12 +0000 (GMT) Received: from localhost.localdomain ([10.113.63.52]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NYP00EJTVAHTR10@eusync2.samsung.com>; Wed, 02 Dec 2015 05:59:12 +0000 (GMT) From: Krzysztof Kozlowski To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Pavel Fedin , Arnd Bergmann , Olof Johansson , Krzysztof Kozlowski Subject: [PATCH 1/2] power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them Date: Wed, 02 Dec 2015 14:59:06 +0900 Message-id: <1449035947-16758-1-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLLMWRmVeSWpSXmKPExsVy+t/xK7obOuLCDKZs1Lb4O+kYu8WkJ++Z LSaunMxs0bx4PZvF6xeGFpd3zWGz+Nx7hNFixvl9TBanrn9ms3h1aRWbxendJQ7cHr9/TWL0 2DnrLrvH5hVaHptWdbJ57J+7ht3jyokmVo++LasYPT5vkgvgiOKySUnNySxLLdK3S+DKaP6+ maVgh1DFpIP/WBoYn/B3MXJySAiYSKz+948dwhaTuHBvPVsXIxeHkMBSRomrC/azQDj/GSXe vtvKBlLFJmAssXn5EjBbRGAik8Tcl9UgRcwC0xgl3t9YzwqSEBZIkbj6ZjcjiM0ioCrx8ex/ sDivgLvEgql3mSHWyUmcPDaZdQIj9wJGhlWMoqmlyQXFSem5hnrFibnFpXnpesn5uZsYIYH2 ZQfj4mNWhxgFOBiVeHhX8MSFCbEmlhVX5h5ilOBgVhLh9ZIBCvGmJFZWpRblxxeV5qQWH2KU 5mBREuedu+t9iJBAemJJanZqakFqEUyWiYNTqoHRhYnl87eZM/YHHLoxVVvVuMluhrvDf71+ tZcK89znTFhiPbn+5s1jbM+fBzCZRXrpRl0O6Tj2zvNed+MO6z3fj1lZV6k45F4TPKt0Itx9 z6NN2/2PNjKe75kU6BKxMPTE5JscK/b98xTLrP13LkN1akXu6/m6578+XrlQcd6/P5+tPh92 fsaersRSnJFoqMVcVJwIABgnM/8wAgAA Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Actually reset/power off handlers do not really depend on power supply. Move the power reset out of power supply block so it will appear in main drivers section. This fixes following build warning (encountered on ARM exynos defconfig when POWER_SUPPLY is disabled manually): warning: (ARCH_HISI && ARCH_INTEGRATOR && ARCH_EXYNOS && ARCH_VEXPRESS && REALVIEW_DT) selects POWER_RESET which has unmet direct dependencies (POWER_SUPPLY) warning: (ARCH_EXYNOS) selects POWER_RESET_SYSCON which has unmet direct dependencies (POWER_SUPPLY && POWER_RESET && OF) warning: (ARCH_EXYNOS) selects POWER_RESET_SYSCON_POWEROFF which has unmet direct dependencies (POWER_SUPPLY && POWER_RESET && OF) Reported-by: Pavel Fedin Signed-off-by: Krzysztof Kozlowski --- drivers/Makefile | 1 + drivers/power/Kconfig | 3 +-- drivers/power/Makefile | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/Makefile b/drivers/Makefile index 795d0ca714bf..0ebb49d0e57e 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -106,6 +106,7 @@ obj-y += i2c/ media/ obj-$(CONFIG_PPS) += pps/ obj-$(CONFIG_PTP_1588_CLOCK) += ptp/ obj-$(CONFIG_W1) += w1/ +obj-$(CONFIG_POWER_RESET) += power/reset/ obj-$(CONFIG_POWER_SUPPLY) += power/ obj-$(CONFIG_HWMON) += hwmon/ obj-$(CONFIG_THERMAL) += thermal/ diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 2f944d742ed4..c031f901b497 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -509,8 +509,7 @@ config AXP20X_POWER This driver provides support for the power supply features of AXP20x PMIC. -source "drivers/power/reset/Kconfig" - endif # POWER_SUPPLY +source "drivers/power/reset/Kconfig" source "drivers/power/avs/Kconfig" diff --git a/drivers/power/Makefile b/drivers/power/Makefile index b656638f8b39..ac430b373f84 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -69,6 +69,5 @@ obj-$(CONFIG_POWER_AVS) += avs/ obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o obj-$(CONFIG_CHARGER_TPS65217) += tps65217_charger.o -obj-$(CONFIG_POWER_RESET) += reset/ obj-$(CONFIG_AXP288_FUEL_GAUGE) += axp288_fuel_gauge.o obj-$(CONFIG_AXP288_CHARGER) += axp288_charger.o