diff options
| author | Kukjin Kim <kgene@kernel.org> | 2015-06-03 03:56:00 +0300 |
|---|---|---|
| committer | Kukjin Kim <kgene@kernel.org> | 2015-06-03 03:56:00 +0300 |
| commit | b9974fa208d9175a6d1d21f6b1068e1779295934 (patch) | |
| tree | da818bd7872f468f87f925bfe636b4818874827b /arch/arm/boot/dts/exynos3250.dtsi | |
| parent | c65b99f046843d2455aa231747b5a07a999a9f3d (diff) | |
| parent | 5ec1d441a4227b2dfdc47fdc13aa7c6c50496194 (diff) | |
| download | linux-b9974fa208d9175a6d1d21f6b1068e1779295934.tar.xz | |
Merge branch 'v4.2-next/dt-samsung-3rd' into v4.2-next/dt-samsung-4th
Diffstat (limited to 'arch/arm/boot/dts/exynos3250.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/exynos3250.dtsi | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi index e3bfb11c6ef8..4728c77ed6e4 100644 --- a/arch/arm/boot/dts/exynos3250.dtsi +++ b/arch/arm/boot/dts/exynos3250.dtsi @@ -189,7 +189,7 @@ }; rtc: rtc@10070000 { - compatible = "samsung,exynos3250-rtc"; + compatible = "samsung,s3c6410-rtc"; reg = <0x10070000 0x100>; interrupts = <0 73 0>, <0 74 0>; interrupt-parent = <&pmu_system_controller>; @@ -243,6 +243,19 @@ interrupts = <0 240 0>; }; + jpeg: codec@11830000 { + compatible = "samsung,exynos3250-jpeg"; + reg = <0x11830000 0x1000>; + interrupts = <0 171 0>; + clocks = <&cmu CLK_JPEG>, <&cmu CLK_SCLK_JPEG>; + clock-names = "jpeg", "sclk"; + power-domains = <&pd_cam>; + assigned-clocks = <&cmu CLK_MOUT_CAM_BLK>, <&cmu CLK_SCLK_JPEG>; + assigned-clock-rates = <0>, <150000000>; + assigned-clock-parents = <&cmu CLK_DIV_MPLL_PRE>; + status = "disabled"; + }; + fimd: fimd@11c00000 { compatible = "samsung,exynos3250-fimd"; reg = <0x11c00000 0x30000>; |