projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'edac_for_4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
dra7.dtsi
diff --git
a/arch/arm/boot/dts/dra7.dtsi
b/arch/arm/boot/dts/dra7.dtsi
index
bc672fb
..
fe99231
100644
(file)
--- a/
arch/arm/boot/dts/dra7.dtsi
+++ b/
arch/arm/boot/dts/dra7.dtsi
@@
-1459,8
+1459,8
@@
interrupt-names = "tx", "rx";
dmas = <&sdma_xbar 133>, <&sdma_xbar 132>;
dma-names = "tx", "rx";
interrupt-names = "tx", "rx";
dmas = <&sdma_xbar 133>, <&sdma_xbar 132>;
dma-names = "tx", "rx";
- clocks = <&mcasp3_ahclkx_mux>;
- clock-names = "fck";
+ clocks = <&mcasp3_a
ux_gfclk_mux>, <&mcasp3_a
hclkx_mux>;
+ clock-names = "fck"
, "ahclkx"
;
status = "disabled";
};
status = "disabled";
};