From: Alexander Shiyan <shc_work@mail.ru>
To: barebox@lists.infradead.org
Subject: [PATCH 2/3] ARM: ccmx51: Replace ifdefs with IS_ENABLED
Date: Fri, 8 Feb 2013 16:28:27 +0400 [thread overview]
Message-ID: <1360326508-30214-2-git-send-email-shc_work@mail.ru> (raw)
In-Reply-To: <1360326508-30214-1-git-send-email-shc_work@mail.ru>
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/boards/ccxmx51/ccxmx51.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c
index 5ec304b..01e0204 100644
--- a/arch/arm/boards/ccxmx51/ccxmx51.c
+++ b/arch/arm/boards/ccxmx51/ccxmx51.c
@@ -80,12 +80,10 @@ struct imx_nand_platform_data nand_info = {
.flash_bbt = 1,
};
-#ifdef CONFIG_DRIVER_NET_FEC_IMX
static struct fec_platform_data fec_info = {
.xcv_type = MII100,
.phy_addr = 7,
};
-#endif
static iomux_v3_cfg_t ccxmx51_pads[] = {
/* UART1 */
@@ -431,15 +429,12 @@ static int ccxmx51_devices_init(void)
devfs_add_partition("nand0", 0x80000, 0x40000, DEVFS_PARTITION_FIXED, "env_raw");
dev_add_bb_dev("env_raw", "env0");
-#ifdef CONFIG_DRIVER_NET_FEC_IMX
- if (ccxmx51_id->eth0 && !pwr) {
+ if (IS_ENABLED(CONFIG_DRIVER_NET_FEC_IMX) && ccxmx51_id->eth0 && !pwr) {
eth_register_ethaddr(0, hwid);
imx51_add_fec(&fec_info);
}
-#endif
-#ifdef CONFIG_DRIVER_NET_SMC911X
- if (ccxmx51_id->eth1 && !pwr) {
+ if (IS_ENABLED(CONFIG_DRIVER_NET_SMC911X) && ccxmx51_id->eth1 && !pwr) {
/* Configure the WEIM CS5 timming, bus width, etc */
/* 16 bit on DATA[31..16], not multiplexed, async */
writel(0x00420081, MX51_WEIM_BASE_ADDR + WEIM_CSxGCR1(5));
@@ -455,7 +450,6 @@ static int ccxmx51_devices_init(void)
/* LAN9221 network controller */
add_generic_device("smc911x", 1, NULL, MX51_CS5_BASE_ADDR, SZ_4K, IORESOURCE_MEM, NULL);
}
-#endif
ccxmx51_otghost_init();
--
1.7.3.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-02-08 12:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-08 12:28 [PATCH 1/3] ARM: ccmx51: Fix printing board HW-revision Alexander Shiyan
2013-02-08 12:28 ` Alexander Shiyan [this message]
2013-02-08 12:28 ` [PATCH 3/3] ARM: ccmx51: Add powerup delay for LAN9221 Alexander Shiyan
2013-02-11 9:51 ` [PATCH 1/3] ARM: ccmx51: Fix printing board HW-revision Sascha Hauer
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=1360326508-30214-2-git-send-email-shc_work@mail.ru \
--to=shc_work@mail.ru \
--cc=barebox@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