From: mturquette@linaro.org (Mike Turquette)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v1] clk: pxa clocks build system fix
Date: Sun, 05 Oct 2014 13:43:58 -0700 [thread overview]
Message-ID: <20141005204358.4379.67145@quantum> (raw)
In-Reply-To: <1412199569-27958-1-git-send-email-robert.jarzmik@free.fr>
Quoting Robert Jarzmik (2014-10-01 14:39:29)
> Fix the building of pxa clock drivers so that the files are actually
> compiled if and only if COMMON_CLK was selected by the architecture.
>
> This prevents conflicts with mach-pxa clock legacy implementation.
>
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Applied.
Thanks,
Mike
> ---
> drivers/clk/Kconfig | 5 +++++
> drivers/clk/Makefile | 2 +-
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
> index cfd3af7..b110f33 100644
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@ -109,6 +109,11 @@ config COMMON_CLK_PALMAS
> This driver supports TI Palmas devices 32KHz output KG and KG_AUDIO
> using common clock framework.
>
> +config COMMON_CLK_PXA
> + def_bool COMMON_CLK && ARCH_PXA
> + ---help---
> + Sypport for the Marvell PXA SoC.
> +
> source "drivers/clk/qcom/Kconfig"
>
> endmenu
> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> index 7891e4e..b3a1da0 100644
> --- a/drivers/clk/Makefile
> +++ b/drivers/clk/Makefile
> @@ -48,7 +48,7 @@ obj-$(CONFIG_ARCH_MMP) += mmp/
> endif
> obj-$(CONFIG_PLAT_ORION) += mvebu/
> obj-$(CONFIG_ARCH_MXS) += mxs/
> -obj-$(CONFIG_ARCH_PXA) += pxa/
> +obj-$(CONFIG_COMMON_CLK_PXA) += pxa/
> obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/
> obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
> obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/
> --
> 2.1.0
>
next prev parent reply other threads:[~2014-10-05 20:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-01 21:39 [PATCH v1] clk: pxa clocks build system fix Robert Jarzmik
2014-10-05 20:43 ` Mike Turquette [this message]
2014-10-06 20:35 ` Arnd Bergmann
2014-10-06 21:25 ` Robert Jarzmik
2014-10-06 21:36 ` Arnd Bergmann
2014-10-06 22:15 ` Mike Turquette
2014-10-07 9:12 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141005204358.4379.67145@quantum \
--to=mturquette@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).