From de68848ba2ffd3ab88f9407be94a0374f87d7086 Mon Sep 17 00:00:00 2001
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Mon, 17 Dec 2012 08:15:52 +0100
Subject: colibri_t20: camera: rename CAMERA_INTERFACE define

Rename CAMERA_INTERFACE to COLIBRI_T20_VI which stands for video input
to be more in-line with Colibri T30.
---
 arch/arm/mach-tegra/board-colibri_t20-pinmux.c |  4 ++--
 arch/arm/mach-tegra/board-colibri_t20.c        | 16 ++++++++--------
 arch/arm/mach-tegra/board-colibri_t20.h        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c
index 7ce2e10397b9..6e2306b9328c 100644
--- a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c
+++ b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c
@@ -199,14 +199,14 @@ static __initdata struct tegra_pingroup_config colibri_t20_pinmux[] = {
 	{TEGRA_PINGROUP_PTA,	TEGRA_MUX_RSVD,		TEGRA_PUPD_PULL_DOWN,	TEGRA_TRI_NORMAL},
 	{TEGRA_PINGROUP_RM,	TEGRA_MUX_I2C,		TEGRA_PUPD_NORMAL,	TEGRA_TRI_NORMAL},
 	/* PWM3 */
-#ifdef CAMERA_INTERFACE
+#ifdef COLIBRI_T20_VI
 	/* PWM<D> multiplexed with CIF_DD<6> */
 	{TEGRA_PINGROUP_SDB,	TEGRA_MUX_PWM,		TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},
 #else
 	{TEGRA_PINGROUP_SDB,	TEGRA_MUX_PWM,		TEGRA_PUPD_NORMAL,	TEGRA_TRI_NORMAL},
 #endif
 	/* GPIO B6 and B7, PWM0 and PWM1 */
-#ifdef CAMERA_INTERFACE
+#ifdef COLIBRI_T20_VI
 	/* PWM<A> multiplexed with CIF_DD<7> */
 	{TEGRA_PINGROUP_SDC,	TEGRA_MUX_PWM,		TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},
 #else
diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c
index e093b461af8c..2077a46dec12 100644
--- a/arch/arm/mach-tegra/board-colibri_t20.c
+++ b/arch/arm/mach-tegra/board-colibri_t20.c
@@ -91,13 +91,13 @@ void *get_colibri_t20_audio_platform_data(void)
 }
 EXPORT_SYMBOL(get_colibri_t20_audio_platform_data);
 
-#ifdef CAMERA_INTERFACE
+#ifdef COLIBRI_T20_VI
 /* Camera */
 static struct platform_device tegra_camera = {
 	.name	= "tegra_camera",
 	.id	= -1,
 };
-#endif /* CAMERA_INTERFACE */
+#endif /* COLIBRI_T20_VI */
 
 /* Clock */
 static __initdata struct tegra_clk_init_table colibri_t20_clk_init_table[] = {
@@ -176,7 +176,7 @@ static struct gpio colibri_t20_gpios[] = {
 	{TEGRA_GPIO_PB6,	GPIOF_IN,	"SODIMM pin 55"},
 //conflicts with MECS Tellurium xPOD2 SSPFRM2
 	{TEGRA_GPIO_PB7,	GPIOF_IN,	"SODIMM pin 63"},
-#ifndef CAMERA_INTERFACE
+#ifndef COLIBRI_T20_VI
 	{TEGRA_GPIO_PD5,	GPIOF_IN,	"SODI-98, Iris X16-13"},
 	{TEGRA_GPIO_PD6,	GPIOF_IN,	"SODIMM pin 81"},
 	{TEGRA_GPIO_PD7,	GPIOF_IN,	"SODIMM pin 94"},
@@ -193,7 +193,7 @@ static struct gpio colibri_t20_gpios[] = {
 #ifndef CONFIG_KEYBOARD_GPIO
 	{TEGRA_GPIO_PK6,	GPIOF_IN,	"SODIMM pin 135"},
 #endif
-#ifndef CAMERA_INTERFACE
+#ifndef COLIBRI_T20_VI
 	{TEGRA_GPIO_PL0,	GPIOF_IN,	"SOD-101, Iris X16-16"},
 	{TEGRA_GPIO_PL1,	GPIOF_IN,	"SOD-103, Iris X16-15"},
 //conflicts with Ethernet interrupt on Protea
@@ -220,7 +220,7 @@ static struct gpio colibri_t20_gpios[] = {
 //conflicts with ADDRESS15
 	{TEGRA_GPIO_PP6,	GPIOF_IN,	"SODIMM pin 124"},
 	{TEGRA_GPIO_PP7,	GPIOF_IN,	"SODIMM pin 188"},
-#ifndef CAMERA_INTERFACE
+#ifndef COLIBRI_T20_VI
 	{TEGRA_GPIO_PT0,	GPIOF_IN,	"SODIMM pin 96"},
 	{TEGRA_GPIO_PT1,	GPIOF_IN,	"SODIMM pin 75"},
 #endif
@@ -293,7 +293,7 @@ static struct i2c_board_info colibri_t20_i2c_bus1_board_info[] = {
 		I2C_BOARD_INFO("rtc-ds1307", 0x68),
 			.type = "m41t00",
 	},
-#if defined(CAMERA_INTERFACE) && !defined(CONFIG_ANDROID)
+#if defined(COLIBRI_T20_VI) && !defined(CONFIG_ANDROID)
 	{
 		I2C_BOARD_INFO("adv7180", 0x21),
 	},
@@ -301,7 +301,7 @@ static struct i2c_board_info colibri_t20_i2c_bus1_board_info[] = {
 		I2C_BOARD_INFO("mt9v111", 0x5c),
 			.platform_data = (void *)&camera_mt9v111_data,
 	},
-#endif /* CAMERA_INTERFACE && !CONFIG_ANDROID */
+#endif /* COLIBRI_T20_VI && !CONFIG_ANDROID */
 };
 
 static struct tegra_i2c_platform_data colibri_t20_i2c1_platform_data = {
@@ -1060,7 +1060,7 @@ static struct platform_device *colibri_t20_devices[] __initdata = {
 #endif
 	&tegra_wdt_device,
 	&tegra_avp_device,
-#ifdef CAMERA_INTERFACE
+#ifdef COLIBRI_T20_VI
 	&tegra_camera,
 #endif
 	&tegra_ac97_device,
diff --git a/arch/arm/mach-tegra/board-colibri_t20.h b/arch/arm/mach-tegra/board-colibri_t20.h
index 0873f5919b1a..970337d83f6b 100644
--- a/arch/arm/mach-tegra/board-colibri_t20.h
+++ b/arch/arm/mach-tegra/board-colibri_t20.h
@@ -27,7 +27,7 @@
 
 /* Uncomment for camera interface support on Colibri Evaluation carrier board */
 #ifdef CONFIG_ANDROID
-#define CAMERA_INTERFACE
+#define COLIBRI_T20_VI
 #endif
 
 /* Use SODIMM pin 73 as DAC power save on Iris carrier board */
-- 
cgit v1.2.3