diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-18 13:35:01 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-23 09:19:27 +0200 |
| commit | d79515b91f195f074083f2acb57e0fa327403130 (patch) | |
| tree | c568e1b4bc668e7ddd2a0240446ef05d972e01c4 /arch | |
| parent | ab02b5a68d64a626e0d4ff071222121ca87121c0 (diff) | |
| download | barebox-d79515b91f195f074083f2acb57e0fa327403130.tar.gz barebox-d79515b91f195f074083f2acb57e0fa327403130.tar.xz | |
ARM: i.MX: remove unused .mac_addr_base in iim
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/iim.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx25.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/iim.h | 4 |
3 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c index ce2bbafc90..bb806d78fc 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 501191874f..63e91a51f0 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 713f0de057..1d2814919b 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 |