summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2013-01-18 19:14:50 +0100
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:42:29 +0900
commit0afb49c261895ccaf2676cf0824584b6e0e9874e (patch)
tree96c5c3462ec2f3a24888f93c68d5ca074e035a79
parentc3b6158f595471290b87b4de40908c5613dcaffe (diff)
downloadlinux-3.10-0afb49c261895ccaf2676cf0824584b6e0e9874e.tar.gz
linux-3.10-0afb49c261895ccaf2676cf0824584b6e0e9874e.tar.bz2
linux-3.10-0afb49c261895ccaf2676cf0824584b6e0e9874e.zip
ARM: dts: Add camera clocks definitions to exynos4/x12.dtsi
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
-rw-r--r--arch/arm/boot/dts/exynos4.dtsi17
-rw-r--r--arch/arm/boot/dts/exynos4x12.dtsi8
2 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e81937cd1f6..758e3216730 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -106,16 +106,23 @@
camera {
compatible = "samsung,fimc", "simple-bus";
+ clocks = <&clock 132>, <&clock 133>, <&clock 351>, <&clock 352>,
+ <&clock 388>, <&clock 389>, <&clock 17>;
+ clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0",
+ "pxl_async1", "mux_cam0", "mux_cam1", "parent";
status = "disabled";
#address-cells = <1>;
#size-cells = <1>;
ranges;
+
fimc_0: fimc@11800000 {
compatible = "samsung,exynos4210-fimc";
reg = <0x11800000 0x1000>;
interrupts = <0 84 0>;
samsung,power-domain = <&pd_cam>;
+ clocks = <&clock 256>, <&clock 128>, <&clock 384>, <&clock 17>;
+ clock-names = "fimc", "sclk_fimc", "mux", "parent";
status = "disabled";
};
@@ -124,6 +131,8 @@
reg = <0x11810000 0x1000>;
interrupts = <0 85 0>;
samsung,power-domain = <&pd_cam>;
+ clocks = <&clock 257>, <&clock 129>, <&clock 385>, <&clock 17>;
+ clock-names = "fimc", "sclk_fimc", "mux", "parent";
status = "disabled";
};
@@ -132,6 +141,8 @@
reg = <0x11820000 0x1000>;
interrupts = <0 86 0>;
samsung,power-domain = <&pd_cam>;
+ clocks = <&clock 258>, <&clock 130>, <&clock 386>, <&clock 17>;
+ clock-names = "fimc", "sclk_fimc", "mux", "parent";
status = "disabled";
};
@@ -140,6 +151,8 @@
reg = <0x11830000 0x1000>;
interrupts = <0 87 0>;
samsung,power-domain = <&pd_cam>;
+ clocks = <&clock 259>, <&clock 131>, <&clock 387>, <&clock 17>;
+ clock-names = "fimc", "sclk_fimc", "mux", "parent";
status = "disabled";
};
@@ -149,6 +162,8 @@
interrupts = <0 78 0>;
bus-width = <4>;
samsung,power-domain = <&pd_cam>;
+ clocks = <&clock 260>, <&clock 134>, <&clock 390>, <&clock 17>;
+ clock-names = "csis", "sclk_csis", "mux", "parent";
status = "disabled";
};
@@ -158,6 +173,8 @@
interrupts = <0 80 0>;
bus-width = <2>;
samsung,power-domain = <&pd_cam>;
+ clocks = <&clock 261>, <&clock 135>, <&clock 391>, <&clock 17>;
+ clock-names = "csis", "sclk_csis", "mux", "parent";
status = "disabled";
};
};
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 3b4a16b4ec3..621301cc55d 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -204,6 +204,10 @@
reg = <0x12000000 0x260000>;
interrupts = <0 90 0>, <0 95 0>;
samsung,power-domain = <&pd_isp>;
+ clocks = <&clock 353>, <&clock 354>, <&clock 355>,
+ <&clock 356>, <&clock 342>, <&clock 17>;
+ clock-names = "flite0", "flite1", "ppmuispx",
+ "ppmuispmx", "sysreg", "mpll";
status = "disabled";
#address-cells = <1>;
#size-cells = <1>;
@@ -214,6 +218,8 @@
reg = <0x12390000 0x1000>;
interrupts = <0 105 0>;
samsung,power-domain = <&pd_isp>;
+ clocks = <&clock 353>;
+ clock-names = "flite";
status = "disabled";
};
@@ -222,6 +228,8 @@
reg = <0x123A0000 0x1000>;
interrupts = <0 106 0>;
samsung,power-domain = <&pd_isp>;
+ clocks = <&clock 354>;
+ clock-names = "flite";
status = "disabled";
};
};