diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-01-11 17:16:19 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-01-11 17:16:19 +0100 |
| commit | c99abe45c1263155c23dde930caa296da95176e1 (patch) | |
| tree | e7873ffe8de705830092d6c2577a5a499dfc07a7 /arch | |
| parent | 41dbc4b6f52fdc88f516047474952549f4bcb1dd (diff) | |
colibri_t30: clean-up camera defines
Now simply enabling CONFIG_TEGRA_CAMERA resp. not explicitly disabling
it will make L4T's nv_omx_vip Gstreamer plug-in work with analogue video
decoders like the ADV7180 or MAX9526.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t30.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t30.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index ca7a29245c85..8755ef5d8637 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -73,11 +73,13 @@ static struct platform_device colibri_t30_audio_sgtl5000_device = { }, }; +#ifdef CONFIG_TEGRA_CAMERA /* Camera */ static struct platform_device tegra_camera = { .name = "tegra_camera", .id = -1, }; +#endif /* CONFIG_TEGRA_CAMERA */ /* Clocks */ static struct tegra_clk_init_table colibri_t30_clk_init_table[] __initdata = { @@ -1013,7 +1015,9 @@ static struct platform_device *colibri_t30_devices[] __initdata = { #if defined(CONFIG_TEGRA_AVP) &tegra_avp_device, #endif +#ifdef CONFIG_TEGRA_CAMERA &tegra_camera, +#endif #if defined(CONFIG_CRYPTO_DEV_TEGRA_SE) &tegra_se_device, #endif diff --git a/arch/arm/mach-tegra/board-colibri_t30.h b/arch/arm/mach-tegra/board-colibri_t30.h index 3f7479eb87af..745d2a465131 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.h +++ b/arch/arm/mach-tegra/board-colibri_t30.h @@ -61,7 +61,9 @@ //#define COLIBRI_T30_V10 /* Uncomment for camera interface support on Colibri Evaluation carrier board */ -//#define COLIBRI_T30_VI +#ifdef CONFIG_TEGRA_CAMERA +#define COLIBRI_T30_VI +#endif #define TDIODE_OFFSET (10000) /* in millicelsius */ |