OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'char-misc-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[uclinux-h8/linux.git]
/
arch
/
arm
/
boot
/
dts
/
exynos5420.dtsi
diff --git
a/arch/arm/boot/dts/exynos5420.dtsi
b/arch/arm/boot/dts/exynos5420.dtsi
index
df9aee9
..
1b3d6c7
100644
(file)
--- a/
arch/arm/boot/dts/exynos5420.dtsi
+++ b/
arch/arm/boot/dts/exynos5420.dtsi
@@
-1117,7
+1117,7
@@
interrupt-parent = <&combiner>;
interrupts = <3 0>;
clock-names = "sysmmu", "master";
interrupt-parent = <&combiner>;
interrupts = <3 0>;
clock-names = "sysmmu", "master";
- clocks = <&clock CLK_SMMU_FIMD1M
0
>, <&clock CLK_FIMD1>;
+ clocks = <&clock CLK_SMMU_FIMD1M
1
>, <&clock CLK_FIMD1>;
power-domains = <&disp_pd>;
#iommu-cells = <0>;
};
power-domains = <&disp_pd>;
#iommu-cells = <0>;
};