author | Arthur Philpott <arthur.philpott@ti.com> | |
Wed, 30 Oct 2013 19:45:35 +0000 (14:45 -0500) | ||
committer | Arthur Philpott <arthur.philpott@ti.com> | |
Wed, 30 Oct 2013 19:45:35 +0000 (14:45 -0500) |
* vip:
VPDMA: Create Load Kernel VPDMA F/W flag
DTS: Added ov10633 sensor support to the DTS file
i2c: ov10635: Added support for the OV10633 sensor
VIP: Remove GPIO configuration for OV1063x sensors
VPDMA FW: Include VPDMA FW in kernel firmware directory.
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Conflicts:
firmware/Makefile
Change-Id: I9e7b688e1aa4f1474da13667c059c571eab4d53c
VPDMA: Create Load Kernel VPDMA F/W flag
DTS: Added ov10633 sensor support to the DTS file
i2c: ov10635: Added support for the OV10633 sensor
VIP: Remove GPIO configuration for OV1063x sensors
VPDMA FW: Include VPDMA FW in kernel firmware directory.
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Conflicts:
firmware/Makefile
Change-Id: I9e7b688e1aa4f1474da13667c059c571eab4d53c
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/dra7-evm.dts | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/dra7-evm.dts
index 05d7a2e5798c2559f70e19567cff4a12a831e91b,c871982096574141a1b617be5f84d0f7c549c7e1..537f7dd4a18d3a5e1596647ed82746e3f0339183
ov10635: ov10635@30 {
compatible = "omnivision,ov10635";
reg = <0x30>;
+
+ camera_ov10635: camera_ov10635 {
+ compatible = "ti,camera-ov10635";
+
+ gpios = <&pcf_hdmi 2 0>,
+ <&pcf_hdmi 3 0>,
+ <&gpio4 13 0>,
+ <&gpio4 14 0>,
+ <&gpio4 15 0>,
+ <&gpio4 16 0>,
+ <&gpio6 17 0>;
+
+ ovnode = <&i2c2>;
+ sensor = "ov10635";
+ };
+ };
+
+ ov10633: ov10633@37 {
+ compatible = "omnivision,ov10633";
+ reg = <0x37>;
+
+ camera_ov10633: camera_ov10633 {
+ compatible = "ti,camera-ov10633";
+
+ gpios = <&pcf_hdmi 2 0>,
+ <&pcf_hdmi 3 0>,
+ <&gpio4 13 0>,
+ <&gpio4 14 0>,
+ <&gpio4 15 0>,
+ <&gpio4 16 0>,
+ <&gpio6 17 0>;
+
+ ovnode = <&i2c2>;
+ sensor = "ov10633";
+ };
};
+
+ lvds_fpd: ds90uh925q@1b {
+ compatible = "ti,ds90uh925q";
+ reg = <0x1b>;
+ };
+
+ lvds_fpd1: ds90uh928q@2c {
+ compatible = "ti,ds90uh928q";
+ reg = <0x2c>;
+ };
};
&i2c3 {