From patchwork Wed Apr 26 11:53:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9701277 X-Patchwork-Delegate: sboyd@codeaurora.org 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 81F26603F4 for ; Wed, 26 Apr 2017 11:55:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6ED8B284EA for ; Wed, 26 Apr 2017 11:55:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63E272857F; Wed, 26 Apr 2017 11:55:34 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0066B284EA for ; Wed, 26 Apr 2017 11:55:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1954328AbdDZLzd (ORCPT ); Wed, 26 Apr 2017 07:55:33 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35881 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1949789AbdDZLzc (ORCPT ); Wed, 26 Apr 2017 07:55:32 -0400 Received: by mail-wm0-f67.google.com with SMTP id u65so418403wmu.3; Wed, 26 Apr 2017 04:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mnTkH5MJ29BUTkqWMfUhWQP6XOuh+PZ1QVIWuz5gJXo=; b=T0wTHaq4AT1vj7eVKeucX6UqUdzFtjcAbUmo3DGWu7/ALLaIjj+CpqipFscPOzi8n+ HHbLH645fVspGaoafo+SZ3lfMYoKz4w5RKqVMGiP0DQKp20+rSgQloR5PIG8KatSQagl 5BqXyLVmOvzyHCE0vJhoPRLvn2G+bnFgs4zONx4ITGbX15jNXrJ23jTbw5hAVJK+P8GG gB03ArdHgs6t9p/kMGXbq20ne67Zj9AQOS9V28b4MboN41ncPfubjwEn4s7FL1YGKq/b gK9aioLqliGUUXb1f6JGn+SOCSWJcfQnHJ40JMU9qr3x0nxvTxNyxgtBwuS4wIbGrDIh F1tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mnTkH5MJ29BUTkqWMfUhWQP6XOuh+PZ1QVIWuz5gJXo=; b=HNQOYnnmT5c/2PW/lLZD08qGUjr0RdQp6FhurzfsAithV7efPGcd0u6c719rX3pCBn SvJFTryM/H63Y8f6oVCmfEm/pYUZrAq3XXWkU7B4vFJTM+8HgEcjRgaZAYUagSZPTdDN pLIpWIxZhIzZ/e0XLf8vBcDAqbQWqKQQ2rpH5dluMBjLj45gQTquKneDLMl3bDh/7Y2U POyL3jFCO4eymOoTfy1DNcLWATlGZtwPT8FufDCxPPBFGZBud8I3u+zrgjY+BNdb+FKB 7fVDoLYSukZt0N6pvoowD6J7TwZR037a1XpnqdvLdz0X47PGY+2h5/xHDvTNte9ZlX/J EubQ== X-Gm-Message-State: AN3rC/6a84IMO1sfTQghCu8aYYyS3OC3gapZ3LRxZUzoSA1NL09QR1QP siEoE14ccUc8sg== X-Received: by 10.28.238.213 with SMTP id j82mr559966wmi.43.1493207729734; Wed, 26 Apr 2017 04:55:29 -0700 (PDT) Received: from Red.local (LFbn-1-7035-57.w90-116.abo.wanadoo.fr. [90.116.208.57]) by smtp.googlemail.com with ESMTPSA id t24sm29415104wra.44.2017.04.26.04.55.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Apr 2017 04:55:29 -0700 (PDT) From: Corentin Labbe To: maxime.ripard@free-electrons.com, wens@csie.org, mturquette@baylibre.com, sboyd@codeaurora.org Cc: linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH v2] clk: sunxi-ng: Fix dependency on SUNXI_CCU_GATE Date: Wed, 26 Apr 2017 13:53:19 +0200 Message-Id: <20170426115319.30951-1-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.10.2 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_SUNXI_CCU is set but no other SUNXI_CCU is selected i got the following build error: drivers/built-in.o: In function `ccu_pll_notifier_cb': drivers/clk/sunxi-ng/ccu_common.c:71: undefined reference to `ccu_gate_helper_disable' drivers/clk/sunxi-ng/ccu_common.c:73: undefined reference to `ccu_gate_helper_enable' The problem is the function ccu_pll_notifier_cb in ccu_common.c need some function from ccu_gate.c which is not compiled since SUNXI_CCU_GATE is not selected. This patch remove SUNXI_CCU_GATE and compile ccu_gate.c unconditionnaly since all other combination of options select SUNXI_CCU_GATE finally. Fixes: 02ae2bc6febd ("clk: sunxi-ng: Add clk notifier to gate then ungate PLL clocks") Signed-off-by: Corentin Labbe --- Changes since v1: - fix subject drivers/clk/sunxi-ng/Kconfig | 11 ----------- drivers/clk/sunxi-ng/Makefile | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig index 8bee225..d7842f9 100644 --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig @@ -15,9 +15,6 @@ config SUNXI_CCU_DIV config SUNXI_CCU_FRAC bool -config SUNXI_CCU_GATE - bool - config SUNXI_CCU_MUX bool @@ -32,24 +29,19 @@ config SUNXI_CCU_PHASE config SUNXI_CCU_NK bool - select SUNXI_CCU_GATE config SUNXI_CCU_NKM bool - select SUNXI_CCU_GATE config SUNXI_CCU_NKMP bool - select SUNXI_CCU_GATE config SUNXI_CCU_NM bool select SUNXI_CCU_FRAC - select SUNXI_CCU_GATE config SUNXI_CCU_MP bool - select SUNXI_CCU_GATE select SUNXI_CCU_MUX # SoC Drivers @@ -119,7 +111,6 @@ config SUN8I_A33_CCU config SUN8I_A83T_CCU bool "Support for the Allwinner A83T CCU" select SUNXI_CCU_DIV - select SUNXI_CCU_GATE select SUNXI_CCU_NKMP select SUNXI_CCU_NM select SUNXI_CCU_MP @@ -154,7 +145,6 @@ config SUN9I_A80_CCU bool "Support for the Allwinner A80 CCU" select SUNXI_CCU_DIV select SUNXI_CCU_MULT - select SUNXI_CCU_GATE select SUNXI_CCU_NKMP select SUNXI_CCU_NM select SUNXI_CCU_MP @@ -165,7 +155,6 @@ config SUN9I_A80_CCU config SUN8I_R_CCU bool "Support for Allwinner SoCs' PRCM CCUs" select SUNXI_CCU_DIV - select SUNXI_CCU_GATE default MACH_SUN8I || (ARCH_SUNXI && ARM64) endif diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile index 78028c8..52aab41 100644 --- a/drivers/clk/sunxi-ng/Makefile +++ b/drivers/clk/sunxi-ng/Makefile @@ -1,11 +1,11 @@ # Common objects obj-$(CONFIG_SUNXI_CCU) += ccu_common.o obj-$(CONFIG_SUNXI_CCU) += ccu_reset.o +obj-$(CONFIG_SUNXI_CCU) += ccu_gate.o # Base clock types obj-$(CONFIG_SUNXI_CCU_DIV) += ccu_div.o obj-$(CONFIG_SUNXI_CCU_FRAC) += ccu_frac.o -obj-$(CONFIG_SUNXI_CCU_GATE) += ccu_gate.o obj-$(CONFIG_SUNXI_CCU_MUX) += ccu_mux.o obj-$(CONFIG_SUNXI_CCU_MULT) += ccu_mult.o obj-$(CONFIG_SUNXI_CCU_PHASE) += ccu_phase.o