commit 3300dde52aa94ab530a45646c6f88440238fcd5e
author Linux Build Service Account <lnxbuild@localhost> Mon Mar 25 07:54:35 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 25 07:54:34 2013 -0700
tree a0875de27e2ed4a81bda973b92dbf913b93aff48
parent 3af7349b16765a3f5e45ee08c1eb87dcf0698b74
parent 9a3ad3c3f841a363b787a827de380cb90ba10cf0

Merge "arm/dt: msm8226: camera: Enable cpp in kernel for 8x26"

arch/arm/boot/dts/msm8226-camera.dtsi

diff --git a/arch/arm/boot/dts/msm8226-camera.dtsi b/arch/arm/boot/dts/msm8226-camera.dtsi
index 425f358..e94459e 100644
--- a/arch/arm/boot/dts/msm8226-camera.dtsi
+++ b/arch/arm/boot/dts/msm8226-camera.dtsi
@@ -95,6 +95,18 @@
 		reg-names = "irqrouter";
 	};
 
+	qcom,cpp@fda04000 {
+		cell-index = <0>;
+		compatible = "qcom,cpp";
+		reg = <0xfda04000 0x100>,
+		      <0xfda40000 0x200>,
+		      <0xfda18000 0x008>;
+		reg-names = "cpp", "cpp_vbif", "cpp_hw";
+		interrupts = <0 49 0>;
+		interrupt-names = "cpp";
+		vdd-supply = <&gdsc_vfe>;
+	};
+
 	cci: qcom,cci@fda0c000 {
 		cell-index = <0>;
 		compatible = "qcom,cci";