git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
board-mx53_evk.c
diff --git
a/arch/arm/mach-mx5/board-mx53_evk.c
b/arch/arm/mach-mx5/board-mx53_evk.c
index
7b5735c
..
f87d571
100644
(file)
--- a/
arch/arm/mach-mx5/board-mx53_evk.c
+++ b/
arch/arm/mach-mx5/board-mx53_evk.c
@@
-21,7
+21,6
@@
#include <linux/init.h>
#include <linux/clk.h>
#include <linux/init.h>
#include <linux/clk.h>
-#include <linux/fec.h>
#include <linux/delay.h>
#include <linux/gpio.h>
#include <linux/spi/flash.h>
#include <linux/delay.h>
#include <linux/gpio.h>
#include <linux/spi/flash.h>
@@
-31,10
+30,9
@@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
-#include <mach/imx-uart.h>
#include <mach/iomux-mx53.h>
#include <mach/iomux-mx53.h>
-#define
SMD_FEC_PHY_RST
IMX_GPIO_NR(7, 6)
+#define
MX53_EVK_FEC_PHY_RST
IMX_GPIO_NR(7, 6)
#define EVK_ECSPI1_CS0 IMX_GPIO_NR(2, 30)
#define EVK_ECSPI1_CS1 IMX_GPIO_NR(3, 19)
#define EVK_ECSPI1_CS0 IMX_GPIO_NR(2, 30)
#define EVK_ECSPI1_CS1 IMX_GPIO_NR(3, 19)
@@
-82,15
+80,14
@@
static inline void mx53_evk_fec_reset(void)
int ret;
/* reset FEC PHY */
int ret;
/* reset FEC PHY */
- ret = gpio_request(SMD_FEC_PHY_RST, "fec-phy-reset");
+ ret = gpio_request_one(MX53_EVK_FEC_PHY_RST, GPIOF_OUT_INIT_LOW,
+ "fec-phy-reset");
if (ret) {
printk(KERN_ERR"failed to get GPIO_FEC_PHY_RESET: %d\n", ret);
return;
}
if (ret) {
printk(KERN_ERR"failed to get GPIO_FEC_PHY_RESET: %d\n", ret);
return;
}
- gpio_direction_output(SMD_FEC_PHY_RST, 0);
- gpio_set_value(SMD_FEC_PHY_RST, 0);
msleep(1);
msleep(1);
- gpio_set_value(
SMD
_FEC_PHY_RST, 1);
+ gpio_set_value(
MX53_EVK
_FEC_PHY_RST, 1);
}
static struct fec_platform_data mx53_evk_fec_pdata = {
}
static struct fec_platform_data mx53_evk_fec_pdata = {