projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel-stable' into for-next
[cascardo/linux.git]
/
arch
/
arm
/
mach-davinci
/
board-dm365-evm.c
diff --git
a/arch/arm/mach-davinci/board-dm365-evm.c
b/arch/arm/mach-davinci/board-dm365-evm.c
index
c67f684
..
9818f21
100644
(file)
--- a/
arch/arm/mach-davinci/board-dm365-evm.c
+++ b/
arch/arm/mach-davinci/board-dm365-evm.c
@@
-520,7
+520,7
@@
fail:
*/
if (have_imager()) {
label = "HD imager";
*/
if (have_imager()) {
label = "HD imager";
- mux |=
1
;
+ mux |=
2
;
/* externally mux MMC1/ENET/AIC33 to imager */
mux |= BIT(6) | BIT(5) | BIT(3);
/* externally mux MMC1/ENET/AIC33 to imager */
mux |= BIT(6) | BIT(5) | BIT(3);
@@
-540,7
+540,7
@@
fail:
resets &= ~BIT(1);
if (have_tvp7002()) {
resets &= ~BIT(1);
if (have_tvp7002()) {
- mux |=
2
;
+ mux |=
1
;
resets &= ~BIT(2);
label = "tvp7002 HD";
} else {
resets &= ~BIT(2);
label = "tvp7002 HD";
} else {
@@
-617,5
+617,6
@@
MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM")
.init_irq = davinci_irq_init,
.timer = &davinci_timer,
.init_machine = dm365_evm_init,
.init_irq = davinci_irq_init,
.timer = &davinci_timer,
.init_machine = dm365_evm_init,
+ .dma_zone_size = SZ_128M,
MACHINE_END
MACHINE_END