Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding adv7610 #2

Merged
merged 3 commits into from
Nov 17, 2015
Merged

Adding adv7610 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7832bce
First add of adv7610
almatthew Nov 16, 2015
5f3e66f
Forgot the V4L2_IDENT
almatthew Nov 16, 2015
a840b03
Fix to the dtsis that fixes a PCI irq issue
almatthew Nov 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/imx6qdl.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
intc: interrupt-controller@00a01000 {
compatible = "arm,cortex-a9-gic";
#interrupt-cells = <3>;
#address-cells = <1>;
#size-cells = <1>;
interrupt-controller;
reg = <0x00a01000 0x1000>,
<0x00a00100 0x100>;
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/imx6sl.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@
intc: interrupt-controller@00a01000 {
compatible = "arm,cortex-a9-gic";
#interrupt-cells = <3>;
#address-cells = <1>;
#size-cells = <1>;
interrupt-controller;
reg = <0x00a01000 0x1000>,
<0x00a00100 0x100>;
Expand Down
6 changes: 6 additions & 0 deletions drivers/media/platform/mxc/capture/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ config MXC_CAMERA_OV5640_MIPI
---help---
If you plan to use the ov5640 Camera with mipi interface in your MXC system, say Y here.

config MXC_TVIN_ADV7610
tristate "AD ADV7610 HDMI Receiver Input support"
depends on I2C
---help---
If you plan to use the AD ADV7610 HDMI reciever with your i.mx6

config MXC_CAMERA_OV5647_MIPI
tristate "OmniVision ov5647 camera support using mipi"
depends on !VIDEO_MXC_EMMA_CAMERA && I2C
Expand Down
3 changes: 3 additions & 0 deletions drivers/media/platform/mxc/capture/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ obj-$(CONFIG_MXC_CAMERA_OV5647_MIPI) += ov5647_camera_mipi.o
adv7180_tvin-objs := adv7180.o
obj-$(CONFIG_MXC_TVIN_ADV7180) += adv7180_tvin.o

adv7610_video-objs := adv7610.o
obj-$(CONFIG_MXC_TVIN_ADV7610) += adv7610_video.o

obj-$(CONFIG_VIDEO_V4L2_MXC_INT_DEVICE) += v4l2-int-device.o
Loading