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 tag 'v3.12-rc4' into next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-shmobile
/
board-armadillo800eva.c
diff --git
a/arch/arm/mach-shmobile/board-armadillo800eva.c
b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 5bd1479d3deb7e98a0d38c3c192abd2824b2825d..7f8f6076d3609e82382bb98f116df3bfc59049ed 100644
(file)
--- a/
arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/
arch/arm/mach-shmobile/board-armadillo800eva.c
@@
-1108,9
+1108,9
@@
static const struct pinctrl_map eva_pinctrl_map[] = {
PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",
"fsib_mclk_in", "fsib"),
/* GETHER */
PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",
"fsib_mclk_in", "fsib"),
/* GETHER */
- PIN_MAP_MUX_GROUP_DEFAULT("
sh-eth
", "pfc-r8a7740",
+ PIN_MAP_MUX_GROUP_DEFAULT("
r8a7740-gether
", "pfc-r8a7740",
"gether_mii", "gether"),
"gether_mii", "gether"),
- PIN_MAP_MUX_GROUP_DEFAULT("
sh-eth
", "pfc-r8a7740",
+ PIN_MAP_MUX_GROUP_DEFAULT("
r8a7740-gether
", "pfc-r8a7740",
"gether_int", "gether"),
/* HDMI */
PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",
"gether_int", "gether"),
/* HDMI */
PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",