From bf90d2cdddc6398095c75b5105f7455431e63417 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Wed, 31 Jul 2013 15:53:44 +0200 Subject: apalis_t30: enable modular camera configuration Enable the modular camera configuration for ACM which allows switching not only decoders but also their inputs at run-time. This is the only correct order to load the modules: modprobe videobuf2-memops modprobe videobuf2-dma-nvmap modprobe max9526 # or modprobe adv7180 modprobe tegra_v4l2_camera To change the decoder on the fly: rmmod tegra_v4l2_camera rmmod max9526 # or rmmod adv7180 modprobe adv7180 # or modprobe max9526 modprobe tegra_v4l2_camera To get a pre-view window through gstreamer: gst-launch v4l2src ! deinterlace tff=1 method=4 ! nv_omx_videomixer ! nv_gl_eglimagesink To switch inputs (0-5 resp. 0-4 for ADV7180 and 0-2 for MAX9526 where 2 means auto selection): v4l2-ctl -i 0 v4l2-ctl -i 1 v4l2-ctl -i 2 v4l2-ctl -i 3 v4l2-ctl -i 4 v4l2-ctl -i 5 To check what input is active: v4l2-ctl -I While at it enable NVIDIA confirmed ARM errata 716044 and 720789 as well. --- arch/arm/configs/apalis_t30_defconfig | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/apalis_t30_defconfig b/arch/arm/configs/apalis_t30_defconfig index 3e872b1f86d4..7eaa96620be3 100644 --- a/arch/arm/configs/apalis_t30_defconfig +++ b/arch/arm/configs/apalis_t30_defconfig @@ -41,7 +41,9 @@ CONFIG_USB_HOTPLUG=y CONFIG_TEGRA_DYNAMIC_PWRDET=y CONFIG_TEGRA_PLLM_RESTRICTED=y CONFIG_TEGRA_PREINIT_CLOCKS=y +CONFIG_ARM_ERRATA_716044=y CONFIG_ARM_ERRATA_742230=y +CONFIG_ARM_ERRATA_720789=y CONFIG_ARM_ERRATA_743622=y CONFIG_ARM_ERRATA_751472=y CONFIG_ARM_ERRATA_752520=y @@ -240,15 +242,39 @@ CONFIG_REGULATOR_TPS62360=y CONFIG_REGULATOR_TPS6591X=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y +# CONFIG_MEDIA_TUNER_SIMPLE is not set +# CONFIG_MEDIA_TUNER_TDA8290 is not set +# CONFIG_MEDIA_TUNER_TDA827X is not set +# CONFIG_MEDIA_TUNER_TDA18271 is not set +# CONFIG_MEDIA_TUNER_TDA9887 is not set +# CONFIG_MEDIA_TUNER_TEA5761 is not set +# CONFIG_MEDIA_TUNER_TEA5767 is not set +# CONFIG_MEDIA_TUNER_MT20XX is not set +# CONFIG_MEDIA_TUNER_MT2060 is not set +# CONFIG_MEDIA_TUNER_MT2266 is not set +# CONFIG_MEDIA_TUNER_MT2131 is not set +# CONFIG_MEDIA_TUNER_QT1010 is not set +# CONFIG_MEDIA_TUNER_XC2028 is not set +# CONFIG_MEDIA_TUNER_XC5000 is not set +# CONFIG_MEDIA_TUNER_XC4000 is not set +# CONFIG_MEDIA_TUNER_MXL5005S is not set +# CONFIG_MEDIA_TUNER_MXL5007T is not set +# CONFIG_MEDIA_TUNER_MC44S803 is not set +# CONFIG_MEDIA_TUNER_MAX2165 is not set +# CONFIG_MEDIA_TUNER_TDA18218 is not set +# CONFIG_MEDIA_TUNER_TDA18212 is not set CONFIG_VIDEO_V4L2=y +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_NVMAP=m # CONFIG_TEGRA_AVP is not set # CONFIG_TEGRA_MEDIASERVER is not set CONFIG_TEGRA_NVAVP=y # CONFIG_TEGRA_CAMERA is not set # CONFIG_TEGRA_DTV is not set +CONFIG_VIDEO_ADV7180=m CONFIG_SOC_CAMERA=y -CONFIG_SOC_CAMERA_MAX9526=y -CONFIG_VIDEO_TEGRA=y +CONFIG_SOC_CAMERA_MAX9526=m +CONFIG_VIDEO_TEGRA=m CONFIG_USB_VIDEO_CLASS=y # CONFIG_RADIO_ADAPTERS is not set # CONFIG_VGA_ARB is not set -- cgit v1.2.3