mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 01/10] ARM: i.MX: remove unused .mac_addr_base in iim
Date: Tue, 21 May 2013 11:57:38 +0200	[thread overview]
Message-ID: <1369130267-8094-2-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1369130267-8094-1-git-send-email-s.hauer@pengutronix.de>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-imx/iim.c              | 6 ------
 arch/arm/mach-imx/imx25.c            | 6 +-----
 arch/arm/mach-imx/include/mach/iim.h | 4 ----
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c
index ce2bbaf..bb806d7 100644
--- a/arch/arm/mach-imx/iim.c
+++ b/arch/arm/mach-imx/iim.c
@@ -31,8 +31,6 @@
 
 #define DRIVERNAME	"imx_iim"
 
-static unsigned long mac_addr_base;
-
 static int iim_write_enable;
 static int iim_sense_enable;
 
@@ -227,15 +225,11 @@ static int imx_iim_add_bank(struct device_d *dev, void __iomem *base, int num)
 
 static int imx_iim_probe(struct device_d *dev)
 {
-	struct imx_iim_platform_data *pdata = dev->platform_data;
 	int i;
 	void __iomem *base;
 
 	base = dev_request_mem_region(dev, 0);
 
-	if (pdata)
-		mac_addr_base = pdata->mac_addr_base;
-
 	for (i = 0; i < 8; i++) {
 		imx_iim_add_bank(dev, base, i);
 	}
diff --git a/arch/arm/mach-imx/imx25.c b/arch/arm/mach-imx/imx25.c
index 5011918..63e91a5 100644
--- a/arch/arm/mach-imx/imx25.c
+++ b/arch/arm/mach-imx/imx25.c
@@ -53,16 +53,12 @@ u64 imx_uid(void)
 	return uid;
 }
 
-static struct imx_iim_platform_data imx25_iim_pdata = {
-	.mac_addr_base	= IIM_MAC_ADDR,
-};
-
 static int imx25_init(void)
 {
 	imx25_boot_save_loc((void *)MX25_CCM_BASE_ADDR);
 
 	add_generic_device("imx_iim", 0, NULL, MX25_IIM_BASE_ADDR, SZ_4K,
-			IORESOURCE_MEM, &imx25_iim_pdata);
+			IORESOURCE_MEM, NULL);
 
 	add_generic_device("imx-iomuxv3", 0, NULL, MX25_IOMUXC_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
 	add_generic_device("imx25-ccm", 0, NULL, MX25_CCM_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL);
diff --git a/arch/arm/mach-imx/include/mach/iim.h b/arch/arm/mach-imx/include/mach/iim.h
index 713f0de..1d28149 100644
--- a/arch/arm/mach-imx/include/mach/iim.h
+++ b/arch/arm/mach-imx/include/mach/iim.h
@@ -38,10 +38,6 @@
 #define IIM_SCS2	0x0034
 #define IIM_SCS3	0x0038
 
-struct imx_iim_platform_data {
-	unsigned long	mac_addr_base;
-};
-
 #ifdef CONFIG_IMX_IIM
 int imx_iim_read(unsigned int bank, int offset, void *buf, int count);
 #else
-- 
1.8.2.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2013-05-21  9:58 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-21  9:57 [PATCH] move the first i.MX board over to devicetree Sascha Hauer
2013-05-21  9:57 ` Sascha Hauer [this message]
2013-05-21  9:57 ` [PATCH 02/10] ARM: i.MX: iim: Add devicetree probe support Sascha Hauer
2013-05-21  9:57 ` [PATCH 03/10] ARM: i.MX51: Add devicetree files Sascha Hauer
2013-05-21  9:57 ` [PATCH 04/10] ARM: i.MX51: Add IIM devicetree node Sascha Hauer
2013-05-21  9:57 ` [PATCH 05/10] ARM: i.MX51: Fixup fec pads in dts Sascha Hauer
2013-05-21  9:57 ` [PATCH 06/10] ARM: i.MX51: skip devices register when devicetree is present Sascha Hauer
2013-05-21  9:57 ` [PATCH 07/10] ARM: i.MX51 babbage: Add spi-cs-high property to pmic Sascha Hauer
2013-05-21  9:57 ` [PATCH 08/10] ARM: i.MX51 babbage: provide MAC adress in devicetree Sascha Hauer
2013-05-21 15:22   ` Alexander Shiyan
2013-05-21 17:53     ` Sascha Hauer
2013-05-21  9:57 ` [PATCH 09/10] ARM: i.MX51 babbage: Add phy reset gpio to dts Sascha Hauer
2013-05-21  9:57 ` [PATCH 10/10] ARM: i.MX51 babbage: switch to devicetree 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=1369130267-8094-2-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --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