* [PATCH 0/3] kconfig selection fixes
@ 2014-02-01 22:35 Rob Herring
2014-02-01 22:35 ` [PATCH 1/3] ARM: hisi: fix kconfig warning on HAVE_ARM_TWD Rob Herring
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Rob Herring @ 2014-02-01 22:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <robh@kernel.org>
Olof,
Here are a few kconfig select fixes. The first one can be squashed into
my previous patch for HiSilicon removing SMP select if you want to.
I'm still looking into the cpufreq select issue with highbank. I'll
follow-up with Viresh on that.
Rob
Rob Herring (3):
ARM: hisi: fix kconfig warning on HAVE_ARM_TWD
ARM: moxart: move DMA_OF selection to driver
ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile
arch/arm/mach-hisi/Kconfig | 2 +-
arch/arm/mach-moxart/Kconfig | 1 -
arch/arm/mach-omap2/Kconfig | 2 +-
arch/arm/mach-shmobile/Kconfig | 2 +-
drivers/dma/Kconfig | 1 +
5 files changed, 4 insertions(+), 4 deletions(-)
--
1.8.3.2
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] ARM: hisi: fix kconfig warning on HAVE_ARM_TWD
2014-02-01 22:35 [PATCH 0/3] kconfig selection fixes Rob Herring
@ 2014-02-01 22:35 ` Rob Herring
2014-02-01 22:35 ` [PATCH 2/3] ARM: moxart: move DMA_OF selection to driver Rob Herring
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2014-02-01 22:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <robh@kernel.org>
Commit "ARM: hisi: don't select SMP" introduced a kconfig warning:
warning: (ARCH_HI3xxx) selects HAVE_ARM_TWD which has unmet direct dependencies (SMP)
Fix HAVE_ARM_TWD to depend on SMP.
Signed-off-by: Rob Herring <robh@kernel.org>
---
arch/arm/mach-hisi/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
index 8f4649b..1abae5f 100644
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
@@ -8,7 +8,7 @@ config ARCH_HI3xxx
select CLKSRC_OF
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU
- select HAVE_ARM_TWD
+ select HAVE_ARM_TWD if SMP
select HAVE_SMP
select PINCTRL
select PINCTRL_SINGLE
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] ARM: moxart: move DMA_OF selection to driver
2014-02-01 22:35 [PATCH 0/3] kconfig selection fixes Rob Herring
2014-02-01 22:35 ` [PATCH 1/3] ARM: hisi: fix kconfig warning on HAVE_ARM_TWD Rob Herring
@ 2014-02-01 22:35 ` Rob Herring
2014-02-01 22:35 ` [PATCH 3/3] ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile Rob Herring
2014-02-03 3:59 ` [PATCH 0/3] kconfig selection fixes Olof Johansson
3 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2014-02-01 22:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <robh@kernel.org>
Move the DMA_OF selection to the DMA driver to fix kconfig warning:
warning: (ARCH_MOXART) selects DMA_OF which has unmet direct dependencies (DMADEVICES && OF)
Signed-off-by: Rob Herring <robh@kernel.org>
---
arch/arm/mach-moxart/Kconfig | 1 -
drivers/dma/Kconfig | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-moxart/Kconfig b/arch/arm/mach-moxart/Kconfig
index ba470d6..3795ae2 100644
--- a/arch/arm/mach-moxart/Kconfig
+++ b/arch/arm/mach-moxart/Kconfig
@@ -2,7 +2,6 @@ config ARCH_MOXART
bool "MOXA ART SoC" if ARCH_MULTI_V4T
select CPU_FA526
select ARM_DMA_MEM_BUFFERABLE
- select DMA_OF
select USE_OF
select CLKSRC_OF
select CLKSRC_MMIO
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 9bed1a2..605b016 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -346,6 +346,7 @@ config MOXART_DMA
tristate "MOXART DMA support"
depends on ARCH_MOXART
select DMA_ENGINE
+ select DMA_OF
select DMA_VIRTUAL_CHANNELS
help
Enable support for the MOXA ART SoC DMA controller.
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile
2014-02-01 22:35 [PATCH 0/3] kconfig selection fixes Rob Herring
2014-02-01 22:35 ` [PATCH 1/3] ARM: hisi: fix kconfig warning on HAVE_ARM_TWD Rob Herring
2014-02-01 22:35 ` [PATCH 2/3] ARM: moxart: move DMA_OF selection to driver Rob Herring
@ 2014-02-01 22:35 ` Rob Herring
2014-02-03 6:31 ` Simon Horman
2014-02-03 3:59 ` [PATCH 0/3] kconfig selection fixes Olof Johansson
3 siblings, 1 reply; 6+ messages in thread
From: Rob Herring @ 2014-02-01 22:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Rob Herring <robh@kernel.org>
The selection of HAVE_ARM_TWD for OMAP and shmobile depend on LOCAL_TIMER
which no longer exists. They should depend on SMP instead.
Cc: Tony Lindgren <tony@atomide.com>
Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---
arch/arm/mach-omap2/Kconfig | 2 +-
arch/arm/mach-shmobile/Kconfig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 653b489..e2ce4f8 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -54,7 +54,7 @@ config SOC_OMAP5
select ARM_GIC
select CPU_V7
select HAVE_ARM_SCU if SMP
- select HAVE_ARM_TWD if LOCAL_TIMERS
+ select HAVE_ARM_TWD if SMP
select HAVE_SMP
select HAVE_ARM_ARCH_TIMER
select ARM_ERRATA_798181 if SMP
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 3386406..05fa505 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -8,7 +8,7 @@ config ARCH_SHMOBILE_MULTI
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP
- select HAVE_ARM_TWD if LOCAL_TIMERS
+ select HAVE_ARM_TWD if SMP
select HAVE_SMP
select ARM_GIC
select MIGHT_HAVE_CACHE_L2X0
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile
2014-02-01 22:35 ` [PATCH 3/3] ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile Rob Herring
@ 2014-02-03 6:31 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-02-03 6:31 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
could you split the shmobile portion out into a separate patch
so that I can take it through my tree?
Thanks
On Sat, Feb 01, 2014 at 04:35:44PM -0600, Rob Herring wrote:
> From: Rob Herring <robh@kernel.org>
>
> The selection of HAVE_ARM_TWD for OMAP and shmobile depend on LOCAL_TIMER
> which no longer exists. They should depend on SMP instead.
>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Simon Horman <horms@verge.net.au>
> Cc: Magnus Damm <magnus.damm@gmail.com>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> arch/arm/mach-omap2/Kconfig | 2 +-
> arch/arm/mach-shmobile/Kconfig | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 653b489..e2ce4f8 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -54,7 +54,7 @@ config SOC_OMAP5
> select ARM_GIC
> select CPU_V7
> select HAVE_ARM_SCU if SMP
> - select HAVE_ARM_TWD if LOCAL_TIMERS
> + select HAVE_ARM_TWD if SMP
> select HAVE_SMP
> select HAVE_ARM_ARCH_TIMER
> select ARM_ERRATA_798181 if SMP
> diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
> index 3386406..05fa505 100644
> --- a/arch/arm/mach-shmobile/Kconfig
> +++ b/arch/arm/mach-shmobile/Kconfig
> @@ -8,7 +8,7 @@ config ARCH_SHMOBILE_MULTI
> select CPU_V7
> select GENERIC_CLOCKEVENTS
> select HAVE_ARM_SCU if SMP
> - select HAVE_ARM_TWD if LOCAL_TIMERS
> + select HAVE_ARM_TWD if SMP
> select HAVE_SMP
> select ARM_GIC
> select MIGHT_HAVE_CACHE_L2X0
> --
> 1.8.3.2
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 0/3] kconfig selection fixes
2014-02-01 22:35 [PATCH 0/3] kconfig selection fixes Rob Herring
` (2 preceding siblings ...)
2014-02-01 22:35 ` [PATCH 3/3] ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile Rob Herring
@ 2014-02-03 3:59 ` Olof Johansson
3 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2014-02-03 3:59 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Feb 01, 2014 at 04:35:41PM -0600, Rob Herring wrote:
> From: Rob Herring <robh@kernel.org>
>
> Olof,
>
> Here are a few kconfig select fixes. The first one can be squashed into
> my previous patch for HiSilicon removing SMP select if you want to.
>
> I'm still looking into the cpufreq select issue with highbank. I'll
> follow-up with Viresh on that.
Since I had already applied the first version of the hisi patch (and sent the
pull request for it), I held this off until -rc1. I've applied it to fixes now,
so it'll be in the next batch we send up.
Thanks!
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-03 6:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-01 22:35 [PATCH 0/3] kconfig selection fixes Rob Herring
2014-02-01 22:35 ` [PATCH 1/3] ARM: hisi: fix kconfig warning on HAVE_ARM_TWD Rob Herring
2014-02-01 22:35 ` [PATCH 2/3] ARM: moxart: move DMA_OF selection to driver Rob Herring
2014-02-01 22:35 ` [PATCH 3/3] ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile Rob Herring
2014-02-03 6:31 ` Simon Horman
2014-02-03 3:59 ` [PATCH 0/3] kconfig selection fixes Olof Johansson
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).