diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-24 10:38:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-24 10:38:23 +0200 |
| commit | ba361ee78f915aa9e26acbbdf6f57712c69506d2 (patch) | |
| tree | 60fb18386ba11f4b8653133abbf630e98aa2f8f6 /include | |
| parent | b108afa01ac0ceb72db750fefd32a67c0247c9ca (diff) | |
| parent | fd9c7d412ee7ff7b351be35afa01ccfc48404080 (diff) | |
| download | barebox-ba361ee78f915aa9e26acbbdf6f57712c69506d2.tar.gz barebox-ba361ee78f915aa9e26acbbdf6f57712c69506d2.tar.xz | |
Merge branch 'pu/mx6-v2' into next
Conflicts:
arch/arm/Makefile
arch/arm/mach-imx/Kconfig
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/barebox.lds.h | 7 | ||||
| -rw-r--r-- | include/fec.h | 1 | ||||
| -rw-r--r-- | include/miidev.h | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h index 3c0be96787..e853ca1ca3 100644 --- a/include/asm-generic/barebox.lds.h +++ b/include/asm-generic/barebox.lds.h @@ -1,5 +1,10 @@ -#if defined CONFIG_ARCH_IMX25 || defined CONFIG_ARCH_IMX35 || defined CONFIG_ARCH_IMX51 || defined CONFIG_ARCH_IMX53 || defined CONFIG_X86 +#if defined CONFIG_ARCH_IMX25 || \ + defined CONFIG_ARCH_IMX35 || \ + defined CONFIG_ARCH_IMX51 || \ + defined CONFIG_ARCH_IMX53 || \ + defined CONFIG_ARCH_IMX6 || \ + defined CONFIG_X86 #include <mach/barebox.lds.h> #endif diff --git a/include/fec.h b/include/fec.h index 85691b6854..f56b02309d 100644 --- a/include/fec.h +++ b/include/fec.h @@ -33,6 +33,7 @@ typedef enum { MII10, MII100, RMII, + RGMII, } xceiver_type; /* diff --git a/include/miidev.h b/include/miidev.h index 8cd4c45000..622784f681 100644 --- a/include/miidev.h +++ b/include/miidev.h @@ -43,6 +43,7 @@ struct mii_device { struct eth_device *edev; struct cdev cdev; + struct list_head list; }; int mii_register(struct mii_device *dev); @@ -65,4 +66,8 @@ static int inline mii_read(struct mii_device *dev, int addr, int reg) { return dev->read(dev, addr, reg); } + +struct mii_device *mii_open(const char *name); +void mii_close(struct mii_device *mdev); + #endif /* __MIIDEV_H__ */ |