From patchwork Mon Feb 19 20:21:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 10229037 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C81AF602B1 for ; Mon, 19 Feb 2018 20:40:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6BF52852D for ; Mon, 19 Feb 2018 20:40:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB433285FE; Mon, 19 Feb 2018 20:40:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3FD5E2852D for ; Mon, 19 Feb 2018 20:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=5mZrQHwX0abOBYTyaKA1dw9ELILLe4KY0KmHe7G4QOE=; b=TYAQooAM4Q5PAeGsI5IQcZ8Q6a LQEqZj+g3OmsQ5Z7b1VHHHZQJhfNXy93SXVkS4YjMTo68Hk8JII8mVUYtzvZ/649FfOihgHHmESIk b2oXjiMfOX3tjLHIsxoj5U6+6UsyaEwO+VOzYMUmT4yXotHzN5nyDHS1FNB8srkQZPa6mS6kk123o fLJ58WXWEGg5wnyUSn4SEKZlftr4NKtw4JlvkU8cYUZCQgt+ENkLhCjrkqu35IrgwVTy3DYW82j1j zs2xcQd5DUbLOoAXR/WChGr7gQk+OmNL9QXyeYrdiU4Psp3VEaqkPxnKXPrgqvgAjWCqILQMbbzj8 K4MbHITQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ensEi-00084A-IN; Mon, 19 Feb 2018 20:40:32 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1enryw-0003Ho-BW for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Feb 2018 20:24:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=w9fPp3N7oVv/PoXJ2YPP5sMyIJak3t4wKnrhwjBx/tI=; b=iuu8fzrAa5Id7l5CcNbXdtKIl aLdRnGWdHpKjagSfNKS6rROQnxHu6MI7Y+569n2NJMLqkM0fo/rumPNof5e0OviJAR06inIVXDEgR kyJFzRF2jq8w5s38CBCSYOpe9nXjQhpJim6MKAppDNK7A2TFCELCoy4Cqy9Tom+CTr6zFfVyS/hH2 6lTZEwclBQ+CZnaA3NKRzCCPX8JuiXrChaNDWUmKODyScwHvDilXKXV88KiMk7Kr5fo6zd9HXRlTL PC0CTm/JG6/sDhGvEFl5BjNg5V57cIklVTNC7ucLbtlDSIR84h2+Tczsw433dRtvCmXCOkwRW+lV1 NOwPLzPHg==; Received: from vern.gendns.com ([206.190.152.46]) by merlin.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1enryt-0006GE-Dm for linux-arm-kernel@lists.infradead.org; Mon, 19 Feb 2018 20:24:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lechnology.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject :Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=w9fPp3N7oVv/PoXJ2YPP5sMyIJak3t4wKnrhwjBx/tI=; b=HVlkpmqa91IrQqYAfmF0/aYbk t0BE2vzLCMUNysn/9TjI5cQm1ZYHRSV2K3J7D0wGd0vOrLP1UcY4IhYTffPmnuKx93xyhuhKcF+l7 GSHhxQy/Hxzv7p1BeS6GfmdZcbR+AvwXPNRs9Adkw2ya7ZxQ7Amos7LxvYoskdDaUj7LpOFQ7UXfq oBTJKZtNrWbIkO51vyfYkkleHIaif4vUN/RDyJMWgcqz3vEAbeKdz/ipCLczJzkpMeYw1Oes36nnm Nx0SzYRHOTRPAsN7YdqDr20/wm4cijWBHmBaQVSU06Gzvi7kUTiGpplUicK/Cpb88iyqrX3gXbzGm vP04+Ajzw==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:48842 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89_1) (envelope-from ) id 1enrwn-003xBV-60; Mon, 19 Feb 2018 15:22:01 -0500 From: David Lechner To: linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v7 29/42] ARM: davinci: remove CONFIG_DAVINCI_RESET_CLOCKS Date: Mon, 19 Feb 2018 14:21:50 -0600 Message-Id: <1519071723-31790-30-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519071723-31790-1-git-send-email-david@lechnology.com> References: <1519071723-31790-1-git-send-email-david@lechnology.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vern.gendns.com X-AntiAbuse: Original Domain - lists.infradead.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lechnology.com X-Get-Message-Sender-Via: vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed X-Authenticated-Sender: vern.gendns.com: davidmain@lechnology.com X-Source: X-Source-Args: X-Source-Dir: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180219_152411_587327_C1B425EF X-CRM114-Status: GOOD ( 12.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , David Lechner , Kevin Hilman , Stephen Boyd , Michael Turquette , Sekhar Nori , linux-kernel@vger.kernel.org, Bartosz Golaszewski , Rob Herring , Adam Ford MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The common clock framework will take care of disabling unused clocks when we switch from the legacy davinci clocks and having this enabled will cause compile errors after we switch, so remove it now. Signed-off-by: David Lechner Reviewed-by: Sekhar Nori --- v7 changes: - none v6 changes: - none arch/arm/mach-davinci/Kconfig | 12 ------------ arch/arm/mach-davinci/common.c | 1 - arch/arm/mach-davinci/include/mach/common.h | 6 ------ 3 files changed, 19 deletions(-) diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 05c3eecf..ba9912b 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -231,18 +231,6 @@ config DAVINCI_MUX_WARNINGS to change the pin multiplexing setup. When there are no warnings printed, it's safe to deselect DAVINCI_MUX for your product. -config DAVINCI_RESET_CLOCKS - bool "Reset unused clocks during boot" - depends on ARCH_DAVINCI - help - Say Y if you want to reset unused clocks during boot. - This option saves power, but assumes all drivers are - using the clock framework. Broken drivers that do not - yet use clock framework may not work with this option. - If you are booting from another operating system, you - probably do not want this option enabled until your - device drivers work properly. - endmenu endif diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index bcb6a7b..e03f95c 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -118,5 +118,4 @@ void __init davinci_common_init(const struct davinci_soc_info *soc_info) void __init davinci_init_late(void) { davinci_cpufreq_init(); - davinci_clk_disable_unused(); } diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 5f45d0a..ded8f5f 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -83,12 +83,6 @@ extern void davinci_common_init(const struct davinci_soc_info *soc_info); extern void davinci_init_ide(void); void davinci_init_late(void); -#ifdef CONFIG_DAVINCI_RESET_CLOCKS -int davinci_clk_disable_unused(void); -#else -static inline int davinci_clk_disable_unused(void) { return 0; } -#endif - #ifdef CONFIG_CPU_FREQ int davinci_cpufreq_init(void); #else