mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>
Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	Ludovic Desroches <ludovic.desroches@atmel.com>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
	Nicolas Ferre <nicolas.ferre@atmel.com>
Subject: [PATCH 04/11] ARM: at91/Kconfig: remove ARCH_AT91RM9200 option for drivers
Date: Thu, 27 Nov 2014 17:06:32 +0100	[thread overview]
Message-ID: <c7dbeffc8a6a4ec88b64e76da01c770526bf4358.1417103399.git.nicolas.ferre@atmel.com> (raw)
In-Reply-To: <cover.1417103399.git.nicolas.ferre@atmel.com>

The precise selection is useless, so we simply remove these dependencies.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 drivers/net/ethernet/cadence/Kconfig | 2 +-
 drivers/rtc/Kconfig                  | 2 +-
 drivers/watchdog/Kconfig             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig
index 9e089d24466e..3564fe9d3f69 100644
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@ -22,7 +22,7 @@ if NET_CADENCE
 
 config ARM_AT91_ETHER
 	tristate "AT91RM9200 Ethernet support"
-	depends on HAS_DMA && (ARCH_AT91RM9200 || COMPILE_TEST)
+	depends on HAS_DMA && (ARCH_AT91 || COMPILE_TEST)
 	select MACB
 	---help---
 	  If you wish to compile a kernel for the AT91RM9200 and enable
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index aa96e375915d..0b704889bf91 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1110,7 +1110,7 @@ config RTC_DRV_AT91RM9200
 
 config RTC_DRV_AT91SAM9
 	tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
-	depends on ARCH_AT91 && !ARCH_AT91RM9200
+	depends on ARCH_AT91
 	help
 	  RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
 	  (Real Time Timer). These timers are powered by the backup power
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index d0107d424ee4..08f41add1461 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -154,14 +154,14 @@ config ARM_SP805_WATCHDOG
 
 config AT91RM9200_WATCHDOG
 	tristate "AT91RM9200 watchdog"
-	depends on ARCH_AT91RM9200
+	depends on SOC_AT91RM9200
 	help
 	  Watchdog timer embedded into AT91RM9200 chips. This will reboot your
 	  system when the timeout is reached.
 
 config AT91SAM9X_WATCHDOG
 	tristate "AT91SAM9X / AT91CAP9 watchdog"
-	depends on ARCH_AT91 && !ARCH_AT91RM9200
+	depends on ARCH_AT91
 	select WATCHDOG_CORE
 	help
 	  Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
-- 
2.1.3


  parent reply	other threads:[~2014-11-27 16:08 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-27 16:06 [PATCH 00/11] ARM: at91: remove !DT support for at91rm9200 Nicolas Ferre
2014-11-27 16:06 ` [PATCH 01/11] ARM: at91: remove at91rm9200 legacy boards files Nicolas Ferre
2014-11-27 16:06 ` [PATCH 02/11] ARM: at91: remove at91rm9200 legacy board support Nicolas Ferre
2014-11-27 16:06 ` [PATCH 03/11] ARM: at91: switch configuration option to SOC_AT91RM9200 Nicolas Ferre
2014-11-27 16:06 ` Nicolas Ferre [this message]
2014-11-27 16:06 ` [PATCH 05/11] ARM: at91: always USE_OF from now on Nicolas Ferre
2014-11-27 16:06 ` [PATCH 06/11] ARM: at91/trivial: update Kconfig comment to mention SAMA5 Nicolas Ferre
2014-11-27 16:06 ` [PATCH 07/11] ARM: at91: remove all !DT related configuration options Nicolas Ferre
2014-11-27 16:06 ` [PATCH 08/11] ARM: at91: remove clock data in at91sam9n12.c and at91sam9x5.c files Nicolas Ferre
2014-11-27 16:06 ` [PATCH 09/11] ARM: at91: remove old at91-specific clock driver Nicolas Ferre
2014-11-27 16:06 ` [PATCH 10/11] ARM: at91: remove legacy IRQ driver and related code Nicolas Ferre
2014-11-27 16:20   ` Julia Lawall
2014-11-27 16:06 ` [PATCH 11/11] ARM: at91: remove unused IRQ function declarations Nicolas Ferre
2014-11-27 16:49 ` [PATCH 00/11] ARM: at91: remove !DT support for at91rm9200 Arnd Bergmann
2014-11-27 17:12   ` Alexandre Belloni
2014-11-27 17:38     ` Arnd Bergmann
2014-11-28  9:36       ` Nicolas Ferre
2014-11-28 10:25         ` Arnd Bergmann
2014-11-28 10:48           ` Nicolas Ferre
2014-11-27 23:12     ` Arnd Bergmann
2014-11-27 23:39       ` Boris Brezillon
2014-11-27 23:41         ` Arnd Bergmann
2014-11-28  0:28       ` Alexandre Belloni
2014-11-28  8:27         ` Alexander Stein
2014-11-28  8:49           ` Arnd Bergmann
2014-11-28 11:31             ` Alexandre Belloni
2014-11-28 12:06               ` Arnd Bergmann
2014-11-28 11:13 ` Boris Brezillon

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=c7dbeffc8a6a4ec88b64e76da01c770526bf4358.1417103399.git.nicolas.ferre@atmel.com \
    --to=nicolas.ferre@atmel.com \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=boris.brezillon@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ludovic.desroches@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    /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

all inboxes | Powered by JetHome®