linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 18/23] drivers: Enable building of Kirkwood drivers for mach-mvebu
Date: Sat, 15 Feb 2014 11:20:16 +0100	[thread overview]
Message-ID: <1392459621-24003-19-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1392459621-24003-1-git-send-email-andrew@lunn.ch>

With the move to mach-mvebu, drivers Kconfig need tweeking to allow
the kirkwood specific drivers to be built.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
v2
Simplify cpufreq/Kconfig.arm
---
 drivers/cpufreq/Kconfig.arm | 2 +-
 drivers/cpuidle/Kconfig.arm | 2 +-
 drivers/leds/Kconfig        | 4 ++--
 drivers/phy/Kconfig         | 2 +-
 drivers/thermal/Kconfig     | 2 +-
 sound/soc/kirkwood/Kconfig  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 31297499a60a..077db3aa985b 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -113,7 +113,7 @@ config ARM_INTEGRATOR
 	  If in doubt, say Y.
 
 config ARM_KIRKWOOD_CPUFREQ
-	def_bool ARCH_KIRKWOOD && OF
+	def_bool MACH_KIRKWOOD
 	help
 	  This adds the CPUFreq driver for Marvell Kirkwood
 	  SoCs.
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
index d988948a89a0..97ccc31dbdd8 100644
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@ -22,7 +22,7 @@ config ARM_HIGHBANK_CPUIDLE
 
 config ARM_KIRKWOOD_CPUIDLE
 	bool "CPU Idle Driver for Marvell Kirkwood SoCs"
-	depends on ARCH_KIRKWOOD
+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
 	help
 	  This adds the CPU Idle driver for Marvell Kirkwood SoCs.
 
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 72156c123033..44c358ecf5a1 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -421,7 +421,7 @@ config LEDS_MC13783
 config LEDS_NS2
 	tristate "LED support for Network Space v2 GPIO LEDs"
 	depends on LEDS_CLASS
-	depends on ARCH_KIRKWOOD
+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
 	default y
 	help
 	  This option enable support for the dual-GPIO LED found on the
@@ -431,7 +431,7 @@ config LEDS_NS2
 config LEDS_NETXBIG
 	tristate "LED support for Big Network series LEDs"
 	depends on LEDS_CLASS
-	depends on ARCH_KIRKWOOD
+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
 	default y
 	help
 	  This option enable support for LEDs found on the LaCie 2Big
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index afa2354f6600..5e6b33f9c294 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -24,7 +24,7 @@ config PHY_EXYNOS_MIPI_VIDEO
 
 config PHY_MVEBU_SATA
 	def_bool y
-	depends on ARCH_KIRKWOOD || ARCH_DOVE
+	depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD
 	depends on OF
 	select GENERIC_PHY
 
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 35c066489a19..1bc9cbc4f1b8 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -142,7 +142,7 @@ config RCAR_THERMAL
 
 config KIRKWOOD_THERMAL
 	tristate "Temperature sensor on Marvell Kirkwood SoCs"
-	depends on ARCH_KIRKWOOD
+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
 	depends on OF
 	help
 	  Support for the Kirkwood thermal sensor driver into the Linux thermal
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 78ed4a42ad21..106e2e22fed2 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -1,6 +1,6 @@
 config SND_KIRKWOOD_SOC
 	tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
-	depends on ARCH_KIRKWOOD || ARCH_DOVE || COMPILE_TEST
+	depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST
 	help
 	  Say Y or M if you want to add support for codecs attached to
 	  the Kirkwood I2S interface. You will also need to select the
-- 
1.8.5.3

  parent reply	other threads:[~2014-02-15 10:20 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-15 10:19 [PATCH v2 00/23] Move DT kirkwood into mach-mvebu Andrew Lunn
2014-02-15 10:19 ` [PATCH v2 01/23] ARM: Kirkwood: Give pm.c its own header file Andrew Lunn
2014-02-16  2:34   ` Ezequiel Garcia
2014-02-15 10:20 ` [PATCH v2 02/23] IRQ: Orion: Fix getting generic chip pointer Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 03/23] ARM: Kirkwood: Convert mv88f6281gtw_ge switch setup to DT Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 04/23] ARM: Kirkwood: Drop printing the SoC type and revision Andrew Lunn
2014-02-16  2:22   ` Ezequiel Garcia
2014-02-15 10:20 ` [PATCH v2 05/23] ARM: Kirkwood: Seperate board-dt from common and pcie code Andrew Lunn
2014-02-15 13:18   ` Arnd Bergmann
2014-02-15 14:05     ` Andrew Lunn
2014-02-18 18:37       ` Jason Gunthorpe
2014-02-18 18:42         ` Andrew Lunn
2014-02-18 18:43         ` Arnd Bergmann
2014-02-15 10:20 ` [PATCH v2 06/23] ARM: Kirkwood: ioremap the cpu_config register before using it Andrew Lunn
2014-02-16  2:17   ` Ezequiel Garcia
2014-02-15 10:20 ` [PATCH v2 07/23] ARM: Kirkwood: ioremap memory control register Andrew Lunn
2014-02-16  2:35   ` Ezequiel Garcia
2014-02-15 10:20 ` [PATCH v2 08/23] ARM: MVEBU: Add ARCH_MULTI_V7 to SoCs Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 09/23] ARM: Orion: Move cache-feroceon-l2.h out of plat-orion Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 10/23] ARM: MM: Add DT binding for Feroceon L2 cache Andrew Lunn
2014-02-15 13:23   ` Arnd Bergmann
2014-02-15 13:59     ` Andrew Lunn
2014-02-15 21:12       ` Arnd Bergmann
2014-02-15 22:39         ` Nicolas Pitre
2014-02-17 23:38   ` Jason Cooper
2014-02-18  9:31     ` Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 11/23] ARM: Kirkwood: Instantiate L2 cache from DT Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 12/23] ARM: Fix default CPU selection for ARCH_MULTI_V5 Andrew Lunn
2014-02-15 20:14   ` Arnd Bergmann
2014-02-17 23:57   ` Jason Cooper
2014-02-15 10:20 ` [PATCH v2 13/23] ARM: Fix MULTI_TLB for feroceon Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 14/23] ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 15/23] ARM: Move kirkwood DT boards into mach-mvebu Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 16/23] ARM: MVEBU: Let kirkwood use the system controller for restart Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 17/23] ARM: MVEBU: Instantiate system controller in kirkwood.dtsi Andrew Lunn
2014-02-15 10:20 ` Andrew Lunn [this message]
2014-02-17 23:43   ` [PATCH v2 18/23] drivers: Enable building of Kirkwood drivers for mach-mvebu Jason Cooper
2014-02-15 10:20 ` [PATCH v2 19/23] ARM: MVEBU: Enable mvebu-soc-id on Kirkwood Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 20/23] ARM: config: Add a multi_v5_defconfig Andrew Lunn
2014-02-15 14:03   ` Arnd Bergmann
2014-02-17 23:46     ` Jason Cooper
2014-02-15 10:20 ` [PATCH v2 21/23] ARM: MVEBU: Simplifiy headers and make local Andrew Lunn
2014-02-15 10:20 ` [PATCH v2 22/23] ARM: config: Add mvebu_v5_defconfig Andrew Lunn
2014-02-21  1:19   ` Ezequiel Garcia
2014-02-15 10:20 ` [PATCH v2 23/23] ARM: Kirkwood: Remove DT support Andrew Lunn
2014-02-15 10:22 ` [PATCH v2 00/23] Move DT kirkwood into mach-mvebu Andrew Lunn
2014-02-15 14:06 ` Arnd Bergmann
2014-02-18 18:57 ` Jason Gunthorpe
2014-02-18 19:02   ` Jason Cooper
2014-02-19 22:21     ` Jason Gunthorpe
2014-02-20  9:45       ` Andrew Lunn
2014-02-20 18:18         ` Jason Gunthorpe
2014-02-20 15:04       ` Ezequiel Garcia
2014-02-21  3:19       ` Ezequiel Garcia
2014-02-21  9:37         ` Andrew Lunn
2014-02-21 17:57         ` Jason Gunthorpe
2014-02-22  1:51           ` Ezequiel Garcia
2014-02-22  3:47             ` Jason Cooper

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=1392459621-24003-19-git-send-email-andrew@lunn.ch \
    --to=andrew@lunn.ch \
    --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).