projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omap: Devkit8000: Remove unnecessary include file
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
board-devkit8000.c
diff --git
a/arch/arm/mach-omap2/board-devkit8000.c
b/arch/arm/mach-omap2/board-devkit8000.c
index 5bfc13b3176c9fad46a686bf0954fb24dcddee44..d605e0558a545c2a240d3ad698fc1ca3d8bcbdd6 100644
(file)
--- a/
arch/arm/mach-omap2/board-devkit8000.c
+++ b/
arch/arm/mach-omap2/board-devkit8000.c
@@
-50,7
+50,6
@@
#include <linux/input/matrix_keypad.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/input/matrix_keypad.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
-#include <linux/usb/otg.h>
#include <linux/dm9000.h>
#include <linux/interrupt.h>
#include <linux/dm9000.h>
#include <linux/interrupt.h>
@@
-303,7
+302,7
@@
static struct regulator_consumer_supply devkit8000_vpll2_supplies[] = {
.dev = &devkit8000_lcd_device.dev,
},
{
.dev = &devkit8000_lcd_device.dev,
},
{
- .supply = "vd
s
s_dsi",
+ .supply = "vd
d
s_dsi",
.dev = &devkit8000_dss_device.dev,
}
};
.dev = &devkit8000_dss_device.dev,
}
};
@@
-639,12
+638,12
@@
static struct omap_musb_board_data musb_board_data = {
static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
- .port_mode[1] = EHCI_HCD_OMAP_MODE_
PHY
,
+ .port_mode[1] = EHCI_HCD_OMAP_MODE_
UNKNOWN
,
.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
.phy_reset = true,
.reset_gpio_port[0] = -EINVAL,
.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
.phy_reset = true,
.reset_gpio_port[0] = -EINVAL,
- .reset_gpio_port[1] =
147
,
+ .reset_gpio_port[1] =
-EINVAL
,
.reset_gpio_port[2] = -EINVAL
};
.reset_gpio_port[2] = -EINVAL
};
@@
-676,8
+675,8
@@
static void __init devkit8000_init(void)
devkit8000_flash_init();
/* Ensure SDRC pins are mux'd for self-refresh */
devkit8000_flash_init();
/* Ensure SDRC pins are mux'd for self-refresh */
- omap_mux_init_signal("sdr_cke0", OMAP_PIN_OUTPUT);
- omap_mux_init_signal("sdr_cke1", OMAP_PIN_OUTPUT);
+ omap_mux_init_signal("sdr
c
_cke0", OMAP_PIN_OUTPUT);
+ omap_mux_init_signal("sdr
c
_cke1", OMAP_PIN_OUTPUT);
}
static void __init devkit8000_map_io(void)
}
static void __init devkit8000_map_io(void)