From patchwork Mon Mar 1 16:11:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 388673 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3554586jap; Mon, 1 Mar 2021 09:44:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2JnQQYS7vV6LITBfk4aKuMCFR/UXL3FtHCpEEF4qj8+v6FbNoLioWWMh3fLkxJ2mvUVek X-Received: by 2002:a05:6402:304b:: with SMTP id bu11mr16927709edb.157.1614620672370; Mon, 01 Mar 2021 09:44:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614620672; cv=none; d=google.com; s=arc-20160816; b=blUcNghc3yoql9TUWGtFjzo94yfzJqynrevSyGZojeFia8MoQyoq4F/unm3/hb9rjX BRhTDlMiFw15r8xchXJox/s2Ze6JutzLsdiTLIS4KLuFGbOJmdS55Gkf0Th0whnctho6 BlBC+tsFC1mFOU2/y3p4L1d62HqzUC6Qp90edfRemG4UgbzN++ty1PsxHCQvt9z0Fzzt kFXaYcOHldnIQQ1b+WCbj2cYI1Av2rrl6cVyTuYGYt03JXqSDs8I+NkZZb8o+3J+QA78 nMBTasD/0/x5F14mwTRTBBp6otl57JV07soe8pGk76MdFLq3qs7hCkuAQ8JSdYDUyuvT reKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fR7LtO19KsCR3GVzBwb5jYZtYY50MbpGiw6CJQ9Yxas=; b=PPUmTObmQsFtsInF3YSjEInr7uPAPkrmecuJHt+rTtfxoXoJqjNEruf4tV4H9i1sy4 5DGh5y/vHR/ChB0lsY1ZjL6q0Rf5+/R0TvRD0ytc7POMtGwDu9t5EmR79NMqZ3M65dQE 54W8vWb/p2yGq9pCakvzUF87/6yZ3a2FYcjH/VkPkWXn5yOd/w2xfCsciyJ5cYAdzubt NVyKoaDuWPB9iQz5u1+BnbI5b44/ezrOd7PP3P1LH1HdLcZb/7Y4NA4/wXzIw/4r+Hjk NEVMmtY1f1G8GVrophDN8uN1TyhRlGn/K2e0xfefQVihNic07WsKg5BoX+j4z7hbQkGt GKNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JLQf7FMj; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x21si12103263ejv.446.2021.03.01.09.44.32; Mon, 01 Mar 2021 09:44:32 -0800 (PST) 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=@linuxfoundation.org header.s=korg header.b=JLQf7FMj; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238480AbhCARmq (ORCPT + 13 others); Mon, 1 Mar 2021 12:42:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:56430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238644AbhCAReg (ORCPT ); Mon, 1 Mar 2021 12:34:36 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A9D9564F35; Mon, 1 Mar 2021 16:54:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614617652; bh=u22aOlnTLiKDhSIJY60eBG3c2QT+NcV/9D96rE3tLwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JLQf7FMj1bVirSSX3ih1SkUQUTKIdJXo+JCr8IcpKNm3nsXjs7o4ZUV09MtNC2Yci 1BTWnmwceptZ3+eTXrRxGENDfEpV38M9N7bkwN2gf23Q5OmtyfYV3vsPy7ZVfoSvzr 0Ox0xdjz1Zo//P1xewRzlESrL9tbIqSFuqfo95OA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Linus Walleij , Daniel Lezcano , Sasha Levin Subject: [PATCH 5.4 148/340] clocksource/drivers/ixp4xx: Select TIMER_OF when needed Date: Mon, 1 Mar 2021 17:11:32 +0100 Message-Id: <20210301161055.599195431@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161048.294656001@linuxfoundation.org> References: <20210301161048.294656001@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 7a3b8758bd6e45f7b671723b5c9fa2b69d0787ae ] Compile-testing the ixp4xx timer with CONFIG_OF enabled but CONFIG_TIMER_OF disabled leads to a harmless warning: arm-linux-gnueabi-ld: warning: orphan section `__timer_of_table' from `drivers/clocksource/timer-ixp4xx.o' being placed in section `__timer_of_table' Move the select statement from the platform code into the driver so it always gets enabled in configurations that rely on it. Fixes: 40df14cc5cc0 ("clocksource/drivers/ixp4xx: Add OF initialization support") Signed-off-by: Arnd Bergmann Reviewed-by: Linus Walleij Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20210103135955.3808976-1-arnd@kernel.org Signed-off-by: Sasha Levin --- arch/arm/mach-ixp4xx/Kconfig | 1 - drivers/clocksource/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index f7211b57b1e78..165c184801e19 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig @@ -13,7 +13,6 @@ config MACH_IXP4XX_OF select I2C select I2C_IOP3XX select PCI - select TIMER_OF select USE_OF help Say 'Y' here to support Device Tree-based IXP4xx platforms. diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index f35a53ce8988a..3bb5625504e2f 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -79,6 +79,7 @@ config IXP4XX_TIMER bool "Intel XScale IXP4xx timer driver" if COMPILE_TEST depends on HAS_IOMEM select CLKSRC_MMIO + select TIMER_OF if OF help Enables support for the Intel XScale IXP4xx SoC timer.