diff options
author | Kukjin Kim <kgene@kernel.org> | 2015-06-03 09:56:00 +0900 |
---|---|---|
committer | Kukjin Kim <kgene@kernel.org> | 2015-06-03 09:56:00 +0900 |
commit | b9974fa208d9175a6d1d21f6b1068e1779295934 (patch) | |
tree | da818bd7872f468f87f925bfe636b4818874827b /arch/arm/boot/dts/exynos4.dtsi | |
parent | c65b99f046843d2455aa231747b5a07a999a9f3d (diff) | |
parent | 5ec1d441a4227b2dfdc47fdc13aa7c6c50496194 (diff) |
Merge branch 'v4.2-next/dt-samsung-3rd' into v4.2-next/dt-samsung-4th
Diffstat (limited to 'arch/arm/boot/dts/exynos4.dtsi')
-rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index e20cdc24c3bb..6e7f0b4afa84 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -78,7 +78,6 @@ mipi_phy: video-phy@10020710 { compatible = "samsung,s5pv210-mipi-video-phy"; - reg = <0x10020710 8>; #phy-cells = <1>; syscon = <&pmu_system_controller>; }; @@ -266,7 +265,7 @@ status = "disabled"; }; - rtc@10070000 { + rtc: rtc@10070000 { compatible = "samsung,s3c6410-rtc"; reg = <0x10070000 0x100>; interrupt-parent = <&pmu_system_controller>; @@ -689,6 +688,15 @@ #include "exynos4412-tmu-sensor-conf.dtsi" }; + jpeg-codec@11840000 { + compatible = "samsung,exynos4210-jpeg"; + reg = <0x11840000 0x1000>; + interrupts = <0 88 0>; + clocks = <&clock CLK_JPEG>; + clock-names = "jpeg"; + power-domains = <&pd_cam>; + }; + hdmi: hdmi@12D00000 { compatible = "samsung,exynos4210-hdmi"; reg = <0x12D00000 0x70000>; |