Skip to content

Commit df9a2f3

Browse files
Merge pull request #2 from allanm84/adding_adv7610
Adding adv7610
2 parents cda5b7f + a840b03 commit df9a2f3

File tree

6 files changed

+772
-4
lines changed

6 files changed

+772
-4
lines changed

arch/arm/boot/dts/imx6qdl.dtsi

-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
intc: interrupt-controller@00a01000 {
4949
compatible = "arm,cortex-a9-gic";
5050
#interrupt-cells = <3>;
51-
#address-cells = <1>;
52-
#size-cells = <1>;
5351
interrupt-controller;
5452
reg = <0x00a01000 0x1000>,
5553
<0x00a00100 0x100>;

arch/arm/boot/dts/imx6sl.dtsi

-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@
7676
intc: interrupt-controller@00a01000 {
7777
compatible = "arm,cortex-a9-gic";
7878
#interrupt-cells = <3>;
79-
#address-cells = <1>;
80-
#size-cells = <1>;
8179
interrupt-controller;
8280
reg = <0x00a01000 0x1000>,
8381
<0x00a00100 0x100>;

drivers/media/platform/mxc/capture/Kconfig

+6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ config MXC_CAMERA_OV5640_MIPI
2727
---help---
2828
If you plan to use the ov5640 Camera with mipi interface in your MXC system, say Y here.
2929

30+
config MXC_TVIN_ADV7610
31+
tristate "AD ADV7610 HDMI Receiver Input support"
32+
depends on I2C
33+
---help---
34+
If you plan to use the AD ADV7610 HDMI reciever with your i.mx6
35+
3036
config MXC_CAMERA_OV5647_MIPI
3137
tristate "OmniVision ov5647 camera support using mipi"
3238
depends on !VIDEO_MXC_EMMA_CAMERA && I2C

drivers/media/platform/mxc/capture/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,7 @@ obj-$(CONFIG_MXC_CAMERA_OV5647_MIPI) += ov5647_camera_mipi.o
2121
adv7180_tvin-objs := adv7180.o
2222
obj-$(CONFIG_MXC_TVIN_ADV7180) += adv7180_tvin.o
2323

24+
adv7610_video-objs := adv7610.o
25+
obj-$(CONFIG_MXC_TVIN_ADV7610) += adv7610_video.o
26+
2427
obj-$(CONFIG_VIDEO_V4L2_MXC_INT_DEVICE) += v4l2-int-device.o

0 commit comments

Comments
 (0)