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
Merge branch 'devel-gpio' into omap-for-linus
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
board-3430sdp.c
diff --git
a/arch/arm/mach-omap2/board-3430sdp.c
b/arch/arm/mach-omap2/board-3430sdp.c
index a5b095cf2adcdd67a14690e7eb0c8d99244f6167..869fb133c207f690d759035c4c1e7215256d5d71 100644
(file)
--- a/
arch/arm/mach-omap2/board-3430sdp.c
+++ b/
arch/arm/mach-omap2/board-3430sdp.c
@@
-24,6
+24,7
@@
#include <linux/regulator/machine.h>
#include <linux/io.h>
#include <linux/gpio.h>
#include <linux/regulator/machine.h>
#include <linux/io.h>
#include <linux/gpio.h>
+#include <linux/mmc/host.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
@@
-38,15
+39,14
@@
#include <plat/gpmc.h>
#include <plat/display.h>
#include <plat/gpmc.h>
#include <plat/display.h>
-#include <plat/control.h>
#include <plat/gpmc-smc91x.h>
#include <plat/gpmc-smc91x.h>
-#include <mach/board-flash.h>
-
+#include "board-flash.h"
#include "mux.h"
#include "sdram-qimonda-hyb18m512160af-6.h"
#include "hsmmc.h"
#include "pm.h"
#include "mux.h"
#include "sdram-qimonda-hyb18m512160af-6.h"
#include "hsmmc.h"
#include "pm.h"
+#include "control.h"
#define CONFIG_DISABLE_HFCLK 1
#define CONFIG_DISABLE_HFCLK 1
@@
-76,7
+76,7
@@
static struct cpuidle_params omap3_cpuidle_params_table[] = {
{1, 10000, 30000, 300000},
};
{1, 10000, 30000, 300000},
};
-static
in
t board_keymap[] = {
+static
uint32_
t board_keymap[] = {
KEY(0, 0, KEY_LEFT),
KEY(0, 1, KEY_RIGHT),
KEY(0, 2, KEY_A),
KEY(0, 0, KEY_LEFT),
KEY(0, 1, KEY_RIGHT),
KEY(0, 2, KEY_A),
@@
-328,7
+328,6
@@
static void __init omap_3430sdp_init_irq(void)
omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
omap_init_irq();
omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
omap_init_irq();
- omap_gpio_init();
}
static int sdp3430_batt_table[] = {
}
static int sdp3430_batt_table[] = {
@@
-353,12
+352,12
@@
static struct omap2_hsmmc_info mmc[] = {
/* 8 bits (default) requires S6.3 == ON,
* so the SIM card isn't used; else 4 bits.
*/
/* 8 bits (default) requires S6.3 == ON,
* so the SIM card isn't used; else 4 bits.
*/
- .
wires = 8
,
+ .
caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA
,
.gpio_wp = 4,
},
{
.mmc = 2,
.gpio_wp = 4,
},
{
.mmc = 2,
- .
wires = 8
,
+ .
caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA
,
.gpio_wp = 7,
},
{} /* Terminator */
.gpio_wp = 7,
},
{} /* Terminator */
@@
-663,8
+662,6
@@
static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
-#else
-#define board_mux NULL
#endif
/*
#endif
/*