Skip to contentSkip to conversation

Fixing ethernet driver compilation error for i.MX31 ADS board

PATCH New Ian Lartey 2 participants 3 messages Sep 30, 2010

Subsystems (3)
lore
Share & tools
lore

Ian Lartey

author
#0 lore raw

PATCH 1/1 Fixing ethernet driver compilation error for i.MX31 ADS board

This is only a partial revert of "ARM: mx3/mx31ads: fold board header in its only user" [commit ccfa7c269843001077df02d98918c6c9bde91395)]

As some of the the board defines are also used in the cs89x0 ethernet driver by the i.MX31 ADS.

---
 arch/arm/mach-mx3/mach-mx31ads.c               |   43 +++---------------
 arch/arm/plat-mxc/include/mach/board-mx31ads.h |   57 ++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 36 deletions(-)
 create mode 100644 arch/arm/plat-mxc/include/mach/board-mx31ads.h
arch/arm/mach-mx3/mach-mx31ads.c +7 -36
index 94b3e7c..7d13e99 100644
@@ -29,6 +29,7 @@
 #include <asm/memory.h>
 #include <asm/mach/map.h>
 #include <mach/common.h>
+#include <mach/board-mx31ads.h>
 #include <mach/iomux-mx3.h>
 
 #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
@@ -40,42 +41,12 @@
 #include "devices-imx31.h"
 #include "devices.h"
 
-/* Base address of PBC controller */
-#define PBC_BASE_ADDRESS        MX31_CS4_BASE_ADDR_VIRT
-/* Offsets for the PBC Controller register */
-
-/* PBC Board interrupt status register */
-#define PBC_INTSTATUS           0x000016
-
-/* PBC Board interrupt current status register */
-#define PBC_INTCURR_STATUS      0x000018
-
-/* PBC Interrupt mask register set address */
-#define PBC_INTMASK_SET         0x00001A
-
-/* PBC Interrupt mask register clear address */
-#define PBC_INTMASK_CLEAR       0x00001C
-
-/* External UART A */
-#define PBC_SC16C652_UARTA      0x010000
-
-/* External UART B */
-#define PBC_SC16C652_UARTB      0x010010
-
-#define PBC_INTSTATUS_REG	(PBC_INTSTATUS + PBC_BASE_ADDRESS)
-#define PBC_INTMASK_SET_REG	(PBC_INTMASK_SET + PBC_BASE_ADDRESS)
-#define PBC_INTMASK_CLEAR_REG	(PBC_INTMASK_CLEAR + PBC_BASE_ADDRESS)
-#define EXPIO_PARENT_INT	IOMUX_TO_IRQ(MX31_PIN_GPIO1_4)
-
-#define MXC_EXP_IO_BASE		(MXC_BOARD_IRQ_START)
-#define MXC_IRQ_TO_EXPIO(irq)	((irq) - MXC_EXP_IO_BASE)
-
-#define EXPIO_INT_XUART_INTA	(MXC_EXP_IO_BASE + 10)
-#define EXPIO_INT_XUART_INTB	(MXC_EXP_IO_BASE + 11)
-
-#define MXC_MAX_EXP_IO_LINES	16
-/*
- * This file contains the board-specific initialization routines.
+/*!
+ * @file mx31ads.c
+ *
+ * @brief This file contains the board-specific initialization routines.
+ *
+ * @ingroup System
  */
 
 #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
arch/arm/plat-mxc/include/mach/board-mx31ads.h new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 Fixing ethernet driver compilation error for i.MX31 ADS board

Hi Ian,

Quoted 4 lines · Ian Lartey

This is only a partial revert of "ARM: mx3/mx31ads: fold board header in its only user" [commit ccfa7c269843001077df02d98918c6c9bde91395)]

As some of the the board defines are also used in the cs89x0 ethernet driver by the i.MX31 ADS.

Can you please line break the commit log. AFAIK up to 76 chars are usual for the kernel.

Hmmm, I took a look into drivers/net/cs89x0.c. This driver definitly needs a cleanup, e.g. should start to provide a platform driver. Maybe it can even be merged with drivers/net/mac89x0.c?

I think the best for know would be the following:

- reintroduce mach/board-mx31ads.h but only defining the symbols used by cs89x0 together with a comment saying that the constants are needed for the cs89x0 ethernet driver.

- In a second patch add CS89x0 to mx31_defconfig

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
author
#2 lore raw

PATCH 1/1 Fixing ethernet driver compilation error for i.MX31 ADS board

Quoted 9 lines · Uwe Kleine-K?nig

Hi Ian,

Quoted 4 lines · Ian Lartey

This is only a partial revert of "ARM: mx3/mx31ads: fold board header in its only user" [commit ccfa7c269843001077df02d98918c6c9bde91395)]

As some of the the board defines are also used in the cs89x0 ethernet driver by the i.MX31 ADS.

Can you please line break the commit log. AFAIK up to 76 chars are usual for the kernel.

Ah, sorry about that, I'll reformat the lines.

Quoted 10 lines

Hmmm, I took a look into drivers/net/cs89x0.c. This driver definitly needs a cleanup, e.g. should start to provide a platform driver. Maybe it can even be merged with drivers/net/mac89x0.c?

I think the best for know would be the following:

- reintroduce mach/board-mx31ads.h but only defining the symbols used by cs89x0 together with a comment saying that the constants are needed for the cs89x0 ethernet driver.

This time round I have just added the defines needed for the cs89x0 to the ones that were moved back into mach-mx31ads.h from mach-mx31ads.c . I think this is what you mean, yes ?

Quoted 2 lines

- In a second patch add CS89x0 to mx31_defconfig

Will do.

Quoted 4 lines

Best regards
Uwe

Regards,
Ian.