summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2014-10-21 12:57:59 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-11-18 03:01:14 (GMT)
commite2745e52e0729f1ab4e2cee63ad5f75279f9a53d (patch)
tree0ffc8a48e5065a321b856752693ba94ca9ebc878
parent9df0344a8619aaaf702bad2719be9229ec467f50 (diff)
downloadlinux-3.10-e2745e52e0729f1ab4e2cee63ad5f75279f9a53d.zip
linux-3.10-e2745e52e0729f1ab4e2cee63ad5f75279f9a53d.tar.gz
linux-3.10-e2745e52e0729f1ab4e2cee63ad5f75279f9a53d.tar.bz2
ARM: dts: exynos3250: add JPEG codec device node
Change-Id: I1c4d9de9c3c476356d71d3c219d7313c9492fddc Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
-rw-r--r--arch/arm/boot/dts/exynos3250-rinato.dts4
-rw-r--r--arch/arm/boot/dts/exynos3250.dtsi13
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts
index c5bc6c5..dbd827e 100644
--- a/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -733,6 +733,10 @@
status = "okay";
};
+&jpeg {
+ status = "okay";
+};
+
&serial_0 {
assigned-clocks = <&cmu CLK_SCLK_UART0>;
assigned-clock-rates = <100000000>;
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index d7cb851..d756aa3 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -353,6 +353,19 @@
interrupts = <0 240 0>;
};
+ jpeg: 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";
+ samsung,power-domain = <&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";
+ };
+
exynos_drm_gsc1: gsc@11850000 {
compatible = "samsung,exynos3250-drm-gsc";
reg = <0x11850000 0x1000>;