From patchwork Tue Jun 23 19:51:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191624 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1376868ecs; Tue, 23 Jun 2020 14:42:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDxZGGMCG54m+1KJVoh4scfcOb3mrVLl6OAM+txdtpAWZo+oa+XQ9gcgbWTox1SKGBIU6J X-Received: by 2002:a17:906:1cd3:: with SMTP id i19mr21323048ejh.321.1592948570383; Tue, 23 Jun 2020 14:42:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592948570; cv=none; d=google.com; s=arc-20160816; b=b2ngC9Uc+4Shi0IiNE0QFFsnITjHcTXgGGE9rsW5BBkg7T5H19kPmuA/yMcND/1J+4 HijWyyFq9kwKASKBwpcxjotydTKH3wosIPRiDjnxxet48uykSSKNgsGNtDXHXCIXrXf6 6/4GJum3pGVdvriedRLNnFIsHIttjxh4HBYkihVPWaHag0erneLiZx+4txkh2U0Cp6mT POQIQ9oBBzjO4pwsM/Od/MM3bQFKQcsTbkhRLWxZeBXkUkfLMSqFg0ASCvubOarYBZ/C 1GEKoHKH1y1F8IkYpKdPM0SZjx169PCMU1qtXa9XqRCUh4c5iwbE0Av5UJXfSLcWaDTj tERg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=f5dGPt2S/YP5ZI1C6GAlianktUPVzpJdo+am62ngkQI=; b=z60J2JcMCreLNmQaGm493Bvk7TwpW13qrZHlMvy0CClpeAGqUiiN+uS5Up7yM+TOjq bYXiCMusLHPcURTQ3N9RvOceBwZT3wokN6oHzfwevn+J8yWuivjNIcYecrDfV/oyO2jx 3yzZPbcPWqvOJLdxzhUN1eM5NiWIv6Qq8dCgB8UvXMB7eeX6Rpyp0rWA2L5QrBk+RgOB ArXUXhokmxfCgvn+Wb/JydLIYspJwozqwFpdYeyxnQBY4Mz6h3Nolg/9O7YeEGMGHW/W +6AbsZ5GLlxzZPUUC5YEkpzxEO3A4eipVJeXJpeE5abrRyGU3FK1zf9DUi1iSHD2ByPy UNNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="aPS/pUn1"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t16si11105760eju.162.2020.06.23.14.42.50; Tue, 23 Jun 2020 14:42:50 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="aPS/pUn1"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388215AbgFWUEb (ORCPT + 15 others); Tue, 23 Jun 2020 16:04:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:43042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388212AbgFWUE3 (ORCPT ); Tue, 23 Jun 2020 16:04:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7C1062100A; Tue, 23 Jun 2020 20:04:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942668; bh=77Tl72WMtI3IpF05TktpihT66X2/HwQy1kbxN2Bfq/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aPS/pUn12t6nMT1x0/MS1pbZaPK8UPIqmTG2BlZLsBSVekfRXr+qczR4zkNnHz5Em QpdTKPJFCI135GHP293iaCQ+lxboxDhxhw5x24zKA7yrhO/MfO60FoIlvLxgrWxc2g ybhC0XcHa3fTNoYD3B6MIMqR6fwgClOlV1ZCcxWc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chunyan Zhang , Arnd Bergmann , Sasha Levin Subject: [PATCH 5.7 088/477] clk: sprd: fix compile-testing Date: Tue, 23 Jun 2020 21:51:25 +0200 Message-Id: <20200623195411.771820647@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit b5f73d47f34b238221ac771b5fe4907df621d7cb ] I got a build failure with CONFIG_ARCH_SPRD=m when the main portion of the clock driver failed to get linked into the kernel: ERROR: modpost: "sprd_pll_sc_gate_ops" [drivers/clk/sprd/sc9863a-clk.ko] undefined! ERROR: modpost: "sprd_pll_ops" [drivers/clk/sprd/sc9863a-clk.ko] undefined! ERROR: modpost: "sprd_div_ops" [drivers/clk/sprd/sc9863a-clk.ko] undefined! ERROR: modpost: "sprd_comp_ops" [drivers/clk/sprd/sc9863a-clk.ko] undefined! ERROR: modpost: "sprd_mux_ops" [drivers/clk/sprd/sc9863a-clk.ko] undefined! ERROR: modpost: "sprd_gate_ops" [drivers/clk/sprd/sc9863a-clk.ko] undefined! ERROR: modpost: "sprd_sc_gate_ops" [drivers/clk/sprd/sc9863a-clk.ko] undefined! ERROR: modpost: "sprd_clk_probe" [drivers/clk/sprd/sc9863a-clk.ko] undefined! ERROR: modpost: "sprd_clk_regmap_init" [drivers/clk/sprd/sc9863a-clk.ko] undefined! ERROR: modpost: "sprd_pll_ops" [drivers/clk/sprd/sc9860-clk.ko] undefined! ERROR: modpost: "sprd_div_ops" [drivers/clk/sprd/sc9860-clk.ko] undefined! ERROR: modpost: "sprd_mux_ops" [drivers/clk/sprd/sc9860-clk.ko] undefined! This is a combination of two trivial bugs: - A platform should not be 'tristate', it should be a 'bool' symbol like the other platforms, if only for consistency, and to avoid surprises like this one. - The clk Makefile does not traverse into the sprd subdirectory if the platform is disabled but the drivers are enabled for compile-testing. Fixing either of the two would be sufficient to address the link failure, but for correctness, both need to be changed. Fixes: 2b1b799d7630 ("arm64: change ARCH_SPRD Kconfig to tristate") Fixes: d41f59fd92f2 ("clk: sprd: Add common infrastructure") Acked-by: Chunyan Zhang Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm64/Kconfig.platforms | 2 +- drivers/clk/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 55d70cfe0f9e1..3c7e310fd8bfa 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -248,7 +248,7 @@ config ARCH_TEGRA This enables support for the NVIDIA Tegra SoC family. config ARCH_SPRD - tristate "Spreadtrum SoC platform" + bool "Spreadtrum SoC platform" help Support for Spreadtrum ARM based SoCs diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index f4169cc2fd318..60e811d3f226d 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -105,7 +105,7 @@ obj-$(CONFIG_CLK_SIFIVE) += sifive/ obj-$(CONFIG_ARCH_SIRF) += sirf/ obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/ obj-$(CONFIG_PLAT_SPEAR) += spear/ -obj-$(CONFIG_ARCH_SPRD) += sprd/ +obj-y += sprd/ obj-$(CONFIG_ARCH_STI) += st/ obj-$(CONFIG_ARCH_STRATIX10) += socfpga/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/