From: shc_work@mail.ru (Alexander Shiyan)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/17] ARM clps711x: Cleanup: Rename ARCH_EP7211 and ARCH_EP7212 to SOC_xxx
Date: Sat, 21 Apr 2012 13:11:14 +0400 [thread overview]
Message-ID: <1334999490-27177-2-git-send-email-shc_work@mail.ru> (raw)
In-Reply-To: <1334999490-27177-1-git-send-email-shc_work@mail.ru>
In fact, these definitions indicate the CPU variant, so it is logically
correct to change the name of the definitions.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/mach-clps711x/Kconfig | 8 ++++----
arch/arm/mach-clps711x/include/mach/hardware.h | 4 ++--
drivers/net/irda/Kconfig | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
index eb34bd1..ec47ef4 100644
--- a/arch/arm/mach-clps711x/Kconfig
+++ b/arch/arm/mach-clps711x/Kconfig
@@ -47,24 +47,24 @@ config ARCH_FORTUNET
# XXX Maybe these should indicate register compatibility
# instead of being mutually exclusive.
-config ARCH_EP7211
+config SOC_EP7211
bool
depends on ARCH_EDB7211
default y
-config ARCH_EP7212
+config SOC_EP7212
bool
depends on ARCH_P720T || ARCH_CEIVA
default y
config EP72XX_ROM_BOOT
bool "EP72xx ROM boot"
- depends on ARCH_EP7211 || ARCH_EP7212
+ depends on SOC_EP7211 || SOC_EP7212
---help---
If you say Y here, your CLPS711x-based kernel will use the bootstrap
mode memory map instead of the normal memory map.
- Processors derived from the Cirrus CLPS-711X core support two boot
+ Processors derived from the Cirrus CLPS711X core support two boot
modes. Normal mode boots from the external memory device at CS0.
Bootstrap mode rearranges parts of the memory map, placing an
internal 128 byte bootstrap ROM at CS0. This option performs the
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index d0b7d87..99461f3 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -52,13 +52,13 @@
#define CS7_PHYS_BASE (0x00000000)
#endif
-#if defined (CONFIG_ARCH_EP7211)
+#if defined (CONFIG_SOC_EP7211)
#define EP7211_VIRT_BASE CLPS7111_VIRT_BASE
#define EP7211_BASE CLPS7111_VIRT_BASE
#include <asm/hardware/ep7211.h>
-#elif defined (CONFIG_ARCH_EP7212)
+#elif defined (CONFIG_SOC_EP7212)
#define EP7212_VIRT_BASE CLPS7111_VIRT_BASE
#define EP7212_BASE CLPS7111_VIRT_BASE
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 4680478..54d7723 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -212,7 +212,7 @@ config KINGSUN_DONGLE
config EP7211_DONGLE
tristate "EP7211 I/R support"
- depends on IRTTY_SIR && ARCH_EP7211 && IRDA && EXPERIMENTAL
+ depends on IRTTY_SIR && (SOC_EP7211 || SOC_EP7212) && IRDA && EXPERIMENTAL
help
Say Y here if you want to build support for the Cirrus logic
EP7211 chipset's infrared module.
--
1.7.3.4
next prev parent reply other threads:[~2012-04-21 9:11 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-21 9:11 clps711x patchset Alexander Shiyan
2012-04-21 9:11 ` Alexander Shiyan [this message]
2012-04-21 9:11 ` [PATCH 02/17] ARM clps711x: Added Cirrus Logic EP7312 CPU variant Alexander Shiyan
2012-04-21 11:21 ` Arnd Bergmann
2012-04-21 11:30 ` Re[2]: " Alexander Shiyan
2012-04-21 11:48 ` Russell King - ARM Linux
2012-04-21 12:11 ` Arnd Bergmann
2012-04-21 12:20 ` Russell King - ARM Linux
2012-04-22 13:58 ` Arnd Bergmann
2012-04-22 14:13 ` Russell King - ARM Linux
2012-04-22 14:24 ` Re[2]: " Alexander Shiyan
2012-04-21 9:11 ` [PATCH 03/17] ARM clps711x: Selecting CPU-variant automatically for clps711x targets Alexander Shiyan
2012-04-21 9:11 ` [PATCH 04/17] ARM clps711x: Using a single definition for virtual address register Alexander Shiyan
2012-04-21 9:11 ` [PATCH 05/17] ARM clps711x: Added missing definitions for PORT C Alexander Shiyan
2012-04-21 9:11 ` [PATCH 06/17] ARM clps711x: Remove now unused cs89712 board header Alexander Shiyan
2012-04-21 9:11 ` [PATCH 07/17] ARM clps711x: Remove unused includes Alexander Shiyan
2012-04-21 9:11 ` [PATCH 08/17] ARM clps711x: Cleanup: remove unused definitions for ep_readl/ep_writel Alexander Shiyan
2012-04-21 9:11 ` [PATCH 09/17] ARM clps711x: Using a single definition for physical address register Alexander Shiyan
2012-04-21 9:11 ` [PATCH 10/17] ARM clps711x: Address register renaming to reflect the fact that the name is the same for all arch Alexander Shiyan
2012-04-21 9:11 ` [PATCH 11/17] ARM clps711x: Move definitions of register address in one unit Alexander Shiyan
2012-04-21 9:11 ` [PATCH 12/17] ARM clps711x: Simple optimise debug_macro by removing one NOP Alexander Shiyan
2012-04-21 10:46 ` Russell King - ARM Linux
2012-04-21 10:50 ` Re[2]: " Alexander Shiyan
2012-04-21 11:18 ` Arnd Bergmann
2012-04-21 11:49 ` Arnd Bergmann
2012-04-21 9:11 ` [PATCH 13/17] ARM clps711x: Removed unused header mach/time.h Alexander Shiyan
2012-04-21 9:11 ` [PATCH 14/17] ARM clps711x: Do not mask interrupts in ack procedure Alexander Shiyan
2012-04-21 9:11 ` [PATCH 15/17] ARM clps711x: Removed unused definitions from mach/irqs.h Alexander Shiyan
2012-04-21 9:11 ` [PATCH 16/17] ARM clps711x: Replaced frequency settings to definition Alexander Shiyan
2012-04-21 9:11 ` [PATCH 17/17] ARM clps711x: Make select CPU spees as KConfig option Alexander Shiyan
2012-04-21 11:40 ` clps711x patchset Arnd Bergmann
2012-04-21 12:04 ` Re[2]: " Alexander Shiyan
2012-04-21 12:14 ` 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=1334999490-27177-2-git-send-email-shc_work@mail.ru \
--to=shc_work@mail.ru \
--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).