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 branch 'for-4.3-fixes' into for-4.4
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
exynos4.dtsi
diff --git
a/arch/arm/boot/dts/exynos4.dtsi
b/arch/arm/boot/dts/exynos4.dtsi
index b0d52b1a646af0cb1154f7216a81da9b3e64ef6a..98c0a368b7778dc3b13ec9e07d476e5eebff9cbb 100644
(file)
--- a/
arch/arm/boot/dts/exynos4.dtsi
+++ b/
arch/arm/boot/dts/exynos4.dtsi
@@
-702,6
+702,7
@@
clocks = <&clock CLK_JPEG>;
clock-names = "jpeg";
power-domains = <&pd_cam>;
+ iommus = <&sysmmu_jpeg>;
};
hdmi: hdmi@12D00000 {