git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
dts
/
imx6qdl.dtsi
diff --git
a/arch/arm/boot/dts/imx6qdl.dtsi
b/arch/arm/boot/dts/imx6qdl.dtsi
index
2109d07
..
d6c69ec
100644
(file)
--- a/
arch/arm/boot/dts/imx6qdl.dtsi
+++ b/
arch/arm/boot/dts/imx6qdl.dtsi
@@
-339,9
+339,8
@@
<0 3 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "bit", "jpeg";
clocks = <&clks IMX6QDL_CLK_VPU_AXI>,
<0 3 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "bit", "jpeg";
clocks = <&clks IMX6QDL_CLK_VPU_AXI>,
- <&clks IMX6QDL_CLK_MMDC_CH0_AXI>,
- <&clks IMX6QDL_CLK_OCRAM>;
- clock-names = "per", "ahb", "ocram";
+ <&clks IMX6QDL_CLK_MMDC_CH0_AXI>;
+ clock-names = "per", "ahb";
resets = <&src 1>;
iram = <&ocram>;
};
resets = <&src 1>;
iram = <&ocram>;
};