apalis/colibri_t20/t30: clean-up board files

Purely cosmetic clean-up of board files by fixing indentation,
re-ordering camera platform data, splitting lines longer than 80
characters etc.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>

3 files changed, 205 insertions, 181 deletions

diff --git a/arch/arm/mach-tegra/board-apalis_t30.c b/arch/arm/mach-tegra/board-apalis_t30.c
index 08c0dd28bc61..13580ab4c0f3 100644
--- a/arch/arm/mach-tegra/board-apalis_t30.c
+++ b/arch/arm/mach-tegra/board-apalis_t30.c
@@ -346,7 +346,6 @@ static struct platform_device soc_camera_tvp5150soc = {
 	.name	= "soc-camera-pdrv",
 };
 #endif /* CONFIG_SOC_CAMERA_TVP5150 | CONFIG_SOC_CAMERA_TVP5150_MODULE */
-
 #endif /* CONFIG_VIDEO_TEGRA | CONFIG_VIDEO_TEGRA_MODULE */
 
 /* CAN */
diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c
index ac02d4604362..3d67ebc5582e 100644
--- a/arch/arm/mach-tegra/board-colibri_t20.c
+++ b/arch/arm/mach-tegra/board-colibri_t20.c
@@ -101,8 +101,8 @@ EXPORT_SYMBOL(get_colibri_t20_audio_platform_data);
 
 #ifdef CONFIG_TEGRA_CAMERA
 static struct platform_device tegra_camera = {
-	.name	= "tegra_camera",
 	.id	= -1,
+	.name	= "tegra_camera",
 };
 #endif /* CONFIG_TEGRA_CAMERA */
 
@@ -116,44 +116,12 @@ static int tegra_camera_enable(struct nvhost_device *ndev)
 	return 0;
 }
 
-#if defined(CONFIG_SOC_CAMERA_MAX9526) || defined(CONFIG_SOC_CAMERA_MAX9526_MODULE)
-static struct i2c_board_info camera_i2c_max9526 = {
-	I2C_BOARD_INFO("max9526", 0x20),
-};
-
-static struct tegra_camera_platform_data max9526_tegra_camera_platform_data = {
-	.disable_camera		= tegra_camera_disable,
-	.enable_camera		= tegra_camera_enable,
-	.flip_h			= 0,
-	.flip_v			= 0,
-	.port			= TEGRA_CAMERA_PORT_VIP,
-	.internal_sync		= false,
-	.vip_h_active_start	= 0x8F,
-	.vip_v_active_start	= 0x12,
-};
-
-static struct soc_camera_link iclink_max9526 = {
-	.board_info	= &camera_i2c_max9526,
-	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
-	.priv		= &max9526_tegra_camera_platform_data,
-	.i2c_adapter_id	= 0,
-};
-
-static struct platform_device soc_camera_max9526 = {
-	.name	= "soc-camera-pdrv",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &iclink_max9526,
-	},
-};
-#endif /* CONFIG_SOC_CAMERA_MAX9526 | CONFIG_SOC_CAMERA_MAX9526_MODULE */
-
 #if defined(CONFIG_VIDEO_ADV7180) || defined(CONFIG_VIDEO_ADV7180_MODULE)
 static struct i2c_board_info camera_i2c_adv7180 = {
 	I2C_BOARD_INFO("adv7180", 0x21),
 };
 
-static struct tegra_camera_platform_data adv7180_tegra_camera_platform_data = {
+static struct tegra_camera_platform_data adv7180_platform_data = {
 	.disable_camera		= tegra_camera_disable,
 	.enable_camera		= tegra_camera_enable,
 	.flip_h			= 0,
@@ -167,16 +135,16 @@ static struct tegra_camera_platform_data adv7180_tegra_camera_platform_data = {
 static struct soc_camera_link iclink_adv7180 = {
 	.board_info	= &camera_i2c_adv7180,
 	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
-	.priv		= &adv7180_tegra_camera_platform_data,
 	.i2c_adapter_id	= 0,
+	.priv		= &adv7180_platform_data,
 };
 
 static struct platform_device soc_camera_adv7180 = {
-	.name	= "soc-camera-pdrv",
-	.id	= 1,
-	.dev	= {
+	.dev = {
 		.platform_data = &iclink_adv7180,
 	},
+	.id	= 0,
+	.name	= "soc-camera-pdrv",
 };
 #endif /* CONFIG_VIDEO_ADV7180 | CONFIG_VIDEO_ADV7180_MODULE */
 
@@ -185,78 +153,79 @@ static struct i2c_board_info camera_i2c_adv7280 = {
 	I2C_BOARD_INFO("adv7280", 0x21),
 };
 
-static struct tegra_camera_platform_data adv7280_tegra_camera_platform_data = {
+static struct tegra_camera_platform_data adv7280_platform_data = {
 	.disable_camera		= tegra_camera_disable,
 	.enable_camera		= tegra_camera_enable,
-	.flip_h				= 0,
-	.flip_v				= 0,
-	.port				= TEGRA_CAMERA_PORT_VIP,
+	.flip_h			= 0,
+	.flip_v			= 0,
 	.internal_sync		= false,
+	.port			= TEGRA_CAMERA_PORT_VIP,
 	.vip_h_active_start	= 0x44,
-	.vip_v_active_start = 0x27,
+	.vip_v_active_start	= 0x27,
 };
 
 static struct soc_camera_link iclink_adv7280 = {
 	.board_info	= &camera_i2c_adv7280,
-	.bus_id		= -1, /*  This must match the .id of tegra_vi01_device */
-	.priv		= &adv7280_tegra_camera_platform_data,
+	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
 	.i2c_adapter_id	= 0,
+	.priv		= &adv7280_platform_data,
 };
 
 static struct platform_device soc_camera_adv7280 = {
-	.name	= "soc-camera-pdrv",
-	.id		= 2,
-	.dev	= {
+	.dev = {
 		.platform_data = &iclink_adv7280,
 	},
-
+	.id	= 1,
+	.name	= "soc-camera-pdrv",
 };
-#endif /*  CONFIG_VIDEO_ADV7280 | CONFIG_VIDEO_ADV7280_MODULE */
+#endif /* CONFIG_VIDEO_ADV7280 | CONFIG_VIDEO_ADV7280_MODULE */
 
-#if defined(CONFIG_SOC_CAMERA_TVP5150) || defined(CONFIG_SOC_CAMERA_TVP5150_MODULE)
-static struct i2c_board_info camera_i2c_tvp5150soc = {
-	I2C_BOARD_INFO("tvp5150soc", 0x5d),
+#if defined(CONFIG_SOC_CAMERA_MAX9526) || \
+		defined(CONFIG_SOC_CAMERA_MAX9526_MODULE)
+static struct i2c_board_info camera_i2c_max9526 = {
+	I2C_BOARD_INFO("max9526", 0x20),
 };
 
-static struct tegra_camera_platform_data tvp5150soc_tegra_camera_platform_data = {
+static struct tegra_camera_platform_data max9526_platform_data = {
 	.disable_camera		= tegra_camera_disable,
 	.enable_camera		= tegra_camera_enable,
 	.flip_h			= 0,
 	.flip_v			= 0,
-	.port			= TEGRA_CAMERA_PORT_VIP,
 	.internal_sync		= false,
+	.port			= TEGRA_CAMERA_PORT_VIP,
 	.vip_h_active_start	= 0x8F,
 	.vip_v_active_start	= 0x12,
 };
 
-static struct soc_camera_link iclink_tvp5150soc = {
-	.board_info	= &camera_i2c_tvp5150soc,
+static struct soc_camera_link iclink_max9526 = {
+	.board_info	= &camera_i2c_max9526,
 	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
-	.priv		= &tvp5150soc_tegra_camera_platform_data,
 	.i2c_adapter_id	= 0,
+	.priv		= &max9526_platform_data,
 };
 
-static struct platform_device soc_camera_tvp5150soc = {
-	.name	= "soc-camera-pdrv",
-	.id	= 3,
-	.dev	= {
-		.platform_data = &iclink_tvp5150soc,
+static struct platform_device soc_camera_max9526 = {
+	.dev = {
+		.platform_data = &iclink_max9526,
 	},
+	.id	= 2,
+	.name	= "soc-camera-pdrv",
 };
-#endif /* CONFIG_SOC_CAMERA_TVP5150 | CONFIG_SOC_CAMERA_TVP5150_MODULE */
+#endif /* CONFIG_SOC_CAMERA_MAX9526 | CONFIG_SOC_CAMERA_MAX9526_MODULE */
 
-#if defined(CONFIG_SOC_CAMERA_OV7670SOC) || defined(CONFIG_SOC_CAMERA_OV7670SOC_MODULE)
+#if defined(CONFIG_SOC_CAMERA_OV7670SOC) || \
+		defined(CONFIG_SOC_CAMERA_OV7670SOC_MODULE)
 static struct i2c_board_info camera_i2c_ov7670soc = {
 	I2C_BOARD_INFO("ov7670soc", 0x21),
 };
 
-static struct tegra_camera_platform_data ov7670_tegra_camera_platform_data = {
+static struct tegra_camera_platform_data ov7670_platform_data = {
 	.disable_camera		= tegra_camera_disable,
 	.enable_camera		= tegra_camera_enable,
 	.flip_h			= 0,
 	.flip_v			= 0,
-	.port			= TEGRA_CAMERA_PORT_VIP,
 	.internal_sync		= false,
+	.port			= TEGRA_CAMERA_PORT_VIP,
 	.vip_h_active_start	= 0x8F,
 	.vip_v_active_start	= 0x12,
 };
@@ -264,18 +233,51 @@ static struct tegra_camera_platform_data ov7670_tegra_camera_platform_data = {
 static struct soc_camera_link iclink_ov7670soc = {
 	.board_info	= &camera_i2c_ov7670soc,
 	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
-	.priv		= &ov7670_tegra_camera_platform_data,
 	.i2c_adapter_id	= 0,
+	.priv		= &ov7670_platform_data,
 };
 
 static struct platform_device soc_camera_ov7670soc = {
-	.name	= "soc-camera-pdrv",
-	.id	= 4,
-	.dev	= {
+	.dev = {
 		.platform_data = &iclink_ov7670soc,
 	},
+	.id	= 3,
+	.name	= "soc-camera-pdrv",
 };
 #endif /* CONFIG_SOC_CAMERA_OV7670SOC | CONFIG_SOC_CAMERA_OV7670SOC_MODULE */
+
+#if defined(CONFIG_SOC_CAMERA_TVP5150) || \
+		defined(CONFIG_SOC_CAMERA_TVP5150_MODULE)
+static struct i2c_board_info camera_i2c_tvp5150soc = {
+	I2C_BOARD_INFO("tvp5150soc", 0x5d),
+};
+
+static struct tegra_camera_platform_data tvp5150soc_platform_data = {
+	.disable_camera		= tegra_camera_disable,
+	.enable_camera		= tegra_camera_enable,
+	.flip_h			= 0,
+	.flip_v			= 0,
+	.internal_sync		= false,
+	.port			= TEGRA_CAMERA_PORT_VIP,
+	.vip_h_active_start	= 0x8F,
+	.vip_v_active_start	= 0x12,
+};
+
+static struct soc_camera_link iclink_tvp5150soc = {
+	.board_info	= &camera_i2c_tvp5150soc,
+	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
+	.i2c_adapter_id	= 0,
+	.priv		= &tvp5150soc_platform_data,
+};
+
+static struct platform_device soc_camera_tvp5150soc = {
+	.dev = {
+		.platform_data = &iclink_tvp5150soc,
+	},
+	.id	= 4,
+	.name	= "soc-camera-pdrv",
+};
+#endif /* CONFIG_SOC_CAMERA_TVP5150 | CONFIG_SOC_CAMERA_TVP5150_MODULE */
 #endif /* CONFIG_VIDEO_TEGRA | CONFIG_VIDEO_TEGRA_MODULE */
 
 /* CAN */
@@ -285,16 +287,23 @@ static struct platform_device soc_camera_ov7670soc = {
 #endif
 
 #if defined(CONFIG_CAN_MCP251X) || defined(CONFIG_CAN_MCP251X_MODULE)
-/* Colibri EvalBoard V3.1a/MECS Tellurium xPOD CAN module featuring MCP2515 SPI CAN controller */
+/*
+ * Colibri EvalBoard V3.1a/MECS Tellurium xPOD CAN module featuring MCP2515 SPI
+ * CAN controller
+ */
 
 #ifdef MECS_TELLURIUM_XPOD2
 #define CAN_CS_GPIO		TEGRA_GPIO_PB7	/* SSPFRM2 */
-#define CAN_INTERRUPT_GPIO	TEGRA_GPIO_PK3	/* active low interrupt (MCP2515 nINT) */
-#define CAN_RESET_GPIO		TEGRA_GPIO_PK2	/* active high reset (not MCP2515 nRESET) */
+/* active low interrupt (MCP2515 nINT) */
+#define CAN_INTERRUPT_GPIO	TEGRA_GPIO_PK3
+/* active high reset (not MCP2515 nRESET) */
+#define CAN_RESET_GPIO		TEGRA_GPIO_PK2
 #else
-#define CAN_INTERRUPT_GPIO	TEGRA_GPIO_PA0	/* active low interrupt (MCP2515 nINT) */
+/* active low interrupt (MCP2515 nINT) */
+#define CAN_INTERRUPT_GPIO	TEGRA_GPIO_PA0
 #ifdef MECS_TELLURIUM
-#define CAN_RESET_GPIO		TEGRA_GPIO_PK4	/* active high reset (not MCP2515 nRESET) */
+/* active high reset (not MCP2515 nRESET) */
+#define CAN_RESET_GPIO		TEGRA_GPIO_PK4
 #endif
 #endif
 
@@ -303,7 +312,8 @@ static int __init colibri_t20_mcp2515_setup(struct spi_device *spi)
 #ifdef MECS_TELLURIUM
 	int gpio_status;
 #endif
-	printk("Colibri EvalBoard V3.1a/MECS Tellurium xPOD CAN Initialisation\n");
+	printk("Colibri EvalBoard V3.1a/MECS Tellurium xPOD CAN "
+	       "Initialisation\n");
 
 #ifdef MECS_TELLURIUM
 	/* configure MCP2515 reset line as output and pull high into reset */
@@ -319,8 +329,8 @@ static int __init colibri_t20_mcp2515_setup(struct spi_device *spi)
 	/* pull out of reset */
 	gpio_set_value(CAN_RESET_GPIO, 0);
 #else
-	/* Note: EvalBoard uses regular system reset aka RESET_OUT# on SODIMM 87 to
-		 reset the MCP2515. */
+	/* Note: EvalBoard uses regular system reset aka RESET_OUT# on SODIMM 87
+		 to reset the MCP2515. */
 #endif
 
 	return 0;
@@ -363,7 +373,8 @@ static struct spi_board_info mcp251x_board_info[] = {
 static void __init colibri_t20_mcp2515_can_init(void)
 {
 	mcp251x_board_info[0].irq = gpio_to_irq(CAN_INTERRUPT_GPIO);
-	spi_register_board_info(mcp251x_board_info, ARRAY_SIZE(mcp251x_board_info));
+	spi_register_board_info(mcp251x_board_info,
+				ARRAY_SIZE(mcp251x_board_info));
 }
 #else /* CONFIG_CAN_MCP251X | CONFIG_CAN_MCP251X_MODULE */
 #define colibri_t20_mcp2515_can_init() do {} while (0)
@@ -472,7 +483,8 @@ static struct gpio colibri_t20_gpios[] = {
 	{TEGRA_GPIO_PK0,	GPIOF_IN,	"SODIMM pin 150"},
 //multiplexed OWR
 	{TEGRA_GPIO_PK1,	GPIOF_IN,	"SODIMM pin 152"},
-#if !defined(MECS_TELLURIUM) || (!defined(CONFIG_CAN_MCP251X) && !defined(CONFIG_CAN_MCP251X_MODULE))
+#if !defined(MECS_TELLURIUM) || (!defined(CONFIG_CAN_MCP251X) && \
+				 !defined(CONFIG_CAN_MCP251X_MODULE))
 //conflicts with CAN reset on MECS Tellurium xPOD1 CAN
 	{TEGRA_GPIO_PK4,	GPIOF_IN,	"SODIMM pin 106"},
 #endif
@@ -1621,7 +1633,8 @@ static void __init colibri_t20_init(void)
 	colibri_t20_pinmux_init();
 #if defined(CONFIG_CAN_SJA1000) || defined(CONFIG_CAN_SJA1000_MODULE)
 	writel(TEGRA_SNOR_CONFIG_SNOR_CS(4), TEGRA_SNOR_CONFIG_REG);
-	writel(TEGRA_SNOR_CONFIG_GO | TEGRA_SNOR_CONFIG_SNOR_CS(4), TEGRA_SNOR_CONFIG_REG);
+	writel(TEGRA_SNOR_CONFIG_GO | TEGRA_SNOR_CONFIG_SNOR_CS(4),
+	       TEGRA_SNOR_CONFIG_REG);
 	colibri_can_resource[1].start	= gpio_to_irq(TEGRA_GPIO_PA0);
 	colibri_can_resource[1].end	= gpio_to_irq(TEGRA_GPIO_PA0);
 	platform_device_register(&colibri_can_device);
@@ -1661,21 +1674,24 @@ static void __init colibri_t20_init(void)
 	colibri_t20_mcp2515_can_init();
 
 #if defined(CONFIG_VIDEO_TEGRA) || defined(CONFIG_VIDEO_TEGRA_MODULE)
-#if defined(CONFIG_SOC_CAMERA_MAX9526) || defined(CONFIG_SOC_CAMERA_MAX9526_MODULE)
-	platform_device_register(&soc_camera_max9526);
-#endif
 #if defined(CONFIG_VIDEO_ADV7180) || defined(CONFIG_VIDEO_ADV7180_MODULE)
 	platform_device_register(&soc_camera_adv7180);
 #endif
 #if defined(CONFIG_VIDEO_ADV7280) || defined(CONFIG_VIDEO_ADV7280_MODULE)
 	platform_device_register(&soc_camera_adv7280);
 #endif
-#if defined(CONFIG_SOC_CAMERA_TVP5150) || defined(CONFIG_SOC_CAMERA_TVP5150_MODULE)
-	platform_device_register(&soc_camera_tvp5150soc);
+#if defined(CONFIG_SOC_CAMERA_MAX9526) || \
+		defined(CONFIG_SOC_CAMERA_MAX9526_MODULE)
+	platform_device_register(&soc_camera_max9526);
 #endif
-#if defined(CONFIG_SOC_CAMERA_OV7670SOC) || defined(CONFIG_SOC_CAMERA_OV7670SOC_MODULE)
+#if defined(CONFIG_SOC_CAMERA_OV7670SOC) || \
+		defined(CONFIG_SOC_CAMERA_OV7670SOC_MODULE)
 	platform_device_register(&soc_camera_ov7670soc);
 #endif
+#if defined(CONFIG_SOC_CAMERA_TVP5150) || \
+		defined(CONFIG_SOC_CAMERA_TVP5150_MODULE)
+	platform_device_register(&soc_camera_tvp5150soc);
+#endif
 #endif /* CONFIG_VIDEO_TEGRA | CONFIG_VIDEO_TEGRA_MODULE */
 
 	tegra_release_bootloader_fb();
diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c
index be236952c3d0..74fb5be46a25 100644
--- a/arch/arm/mach-tegra/board-colibri_t30.c
+++ b/arch/arm/mach-tegra/board-colibri_t30.c
@@ -96,8 +96,8 @@ static struct platform_device colibri_t30_audio_sgtl5000_device = {
 
 #ifdef CONFIG_TEGRA_CAMERA
 static struct platform_device tegra_camera = {
-	.name	= "tegra_camera",
 	.id	= -1,
+	.name	= "tegra_camera",
 };
 #endif /* CONFIG_TEGRA_CAMERA */
 
@@ -111,44 +111,12 @@ static int tegra_camera_enable(struct nvhost_device *ndev)
 	return 0;
 }
 
-#if defined(CONFIG_SOC_CAMERA_MAX9526) || defined(CONFIG_SOC_CAMERA_MAX9526_MODULE)
-static struct i2c_board_info camera_i2c_max9526 = {
-	I2C_BOARD_INFO("max9526", 0x20),
-};
-
-static struct tegra_camera_platform_data max9526_tegra_camera_platform_data = {
-	.disable_camera		= tegra_camera_disable,
-	.enable_camera		= tegra_camera_enable,
-	.flip_h			= 0,
-	.flip_v			= 0,
-	.port			= TEGRA_CAMERA_PORT_VIP,
-	.internal_sync		= false,
-	.vip_h_active_start	= 0x8F,
-	.vip_v_active_start	= 0x12,
-};
-
-static struct soc_camera_link iclink_max9526 = {
-	.board_info	= &camera_i2c_max9526,
-	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
-	.priv		= &max9526_tegra_camera_platform_data,
-	.i2c_adapter_id	= 0,
-};
-
-static struct platform_device soc_camera_max9526 = {
-	.name	= "soc-camera-pdrv",
-	.id	= 0,
-	.dev	= {
-		.platform_data = &iclink_max9526,
-	},
-};
-#endif /* CONFIG_SOC_CAMERA_MAX9526 | CONFIG_SOC_CAMERA_MAX9526_MODULE */
-
 #if defined(CONFIG_VIDEO_ADV7180) || defined(CONFIG_VIDEO_ADV7180_MODULE)
 static struct i2c_board_info camera_i2c_adv7180 = {
 	I2C_BOARD_INFO("adv7180", 0x21),
 };
 
-static struct tegra_camera_platform_data adv7180_tegra_camera_platform_data = {
+static struct tegra_camera_platform_data adv7180_platform_data = {
 	.disable_camera		= tegra_camera_disable,
 	.enable_camera		= tegra_camera_enable,
 	.flip_h			= 0,
@@ -162,96 +130,97 @@ static struct tegra_camera_platform_data adv7180_tegra_camera_platform_data = {
 static struct soc_camera_link iclink_adv7180 = {
 	.board_info	= &camera_i2c_adv7180,
 	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
-	.priv		= &adv7180_tegra_camera_platform_data,
 	.i2c_adapter_id	= 0,
+	.priv		= &adv7180_platform_data,
 };
 
 static struct platform_device soc_camera_adv7180 = {
-	.name	= "soc-camera-pdrv",
-	.id	= 1,
-	.dev	= {
+	.dev = {
 		.platform_data = &iclink_adv7180,
 	},
+	.id	= 0,
+	.name	= "soc-camera-pdrv",
 };
 #endif /* CONFIG_VIDEO_ADV7180 | CONFIG_VIDEO_ADV7180_MODULE */
 
 #if defined(CONFIG_VIDEO_ADV7280) || defined(CONFIG_VIDEO_ADV7280_MODULE)
 static struct i2c_board_info camera_i2c_adv7280 = {
-		I2C_BOARD_INFO("adv7280", 0x21),
+	I2C_BOARD_INFO("adv7280", 0x21),
 };
 
-static struct tegra_camera_platform_data adv7280_tegra_camera_platform_data = {
-		.disable_camera		= tegra_camera_disable,
-		.enable_camera		= tegra_camera_enable,
-		.flip_h				= 0,
-		.flip_v				= 0,
-		.port				= TEGRA_CAMERA_PORT_VIP,
-		.internal_sync		= false,
-		.vip_h_active_start	= 0x44,
-		.vip_v_active_start = 0x27,
-
+static struct tegra_camera_platform_data adv7280_platform_data = {
+	.disable_camera		= tegra_camera_disable,
+	.enable_camera		= tegra_camera_enable,
+	.flip_h			= 0,
+	.flip_v			= 0,
+	.internal_sync		= false,
+	.port			= TEGRA_CAMERA_PORT_VIP,
+	.vip_h_active_start	= 0x44,
+	.vip_v_active_start	= 0x27,
 };
 
 static struct soc_camera_link iclink_adv7280 = {
-		.board_info	= &camera_i2c_adv7280,
-		.bus_id		= -1, /*   This must match the .id of tegra_vi01_device */
-		.priv		= &adv7280_tegra_camera_platform_data,
-		.i2c_adapter_id	= 0,
+	.board_info	= &camera_i2c_adv7280,
+	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
+	.i2c_adapter_id	= 0,
+	.priv		= &adv7280_platform_data,
 };
 
 static struct platform_device soc_camera_adv7280 = {
-		.name	= "soc-camera-pdrv",
-		.id	= 2,
-		.dev	= {
-			.platform_data = &iclink_adv7280,
-		},
+	.dev = {
+		.platform_data = &iclink_adv7280,
+	},
+	.id	= 1,
+	.name	= "soc-camera-pdrv",
 };
-#endif /*   CONFIG_VIDEO_ADV7280 | CONFIG_VIDEO_ADV7280_MODULE */
+#endif /* CONFIG_VIDEO_ADV7280 | CONFIG_VIDEO_ADV7280_MODULE */
 
-#if defined(CONFIG_SOC_CAMERA_TVP5150) || defined(CONFIG_SOC_CAMERA_TVP5150_MODULE)
-static struct i2c_board_info camera_i2c_tvp5150soc = {
-	I2C_BOARD_INFO("tvp5150soc", 0x5d),
+#if defined(CONFIG_SOC_CAMERA_MAX9526) || \
+		defined(CONFIG_SOC_CAMERA_MAX9526_MODULE)
+static struct i2c_board_info camera_i2c_max9526 = {
+	I2C_BOARD_INFO("max9526", 0x20),
 };
 
-static struct tegra_camera_platform_data tvp5150soc_tegra_camera_platform_data = {
+static struct tegra_camera_platform_data max9526_platform_data = {
 	.disable_camera		= tegra_camera_disable,
 	.enable_camera		= tegra_camera_enable,
 	.flip_h			= 0,
 	.flip_v			= 0,
-	.port			= TEGRA_CAMERA_PORT_VIP,
 	.internal_sync		= false,
+	.port			= TEGRA_CAMERA_PORT_VIP,
 	.vip_h_active_start	= 0x8F,
 	.vip_v_active_start	= 0x12,
 };
 
-static struct soc_camera_link iclink_tvp5150soc = {
-	.board_info	= &camera_i2c_tvp5150soc,
+static struct soc_camera_link iclink_max9526 = {
+	.board_info	= &camera_i2c_max9526,
 	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
-	.priv		= &tvp5150soc_tegra_camera_platform_data,
 	.i2c_adapter_id	= 0,
+	.priv		= &max9526_platform_data,
 };
 
-static struct platform_device soc_camera_tvp5150soc = {
-	.name	= "soc-camera-pdrv",
-	.id	= 3,
-	.dev	= {
-		.platform_data = &iclink_tvp5150soc,
+static struct platform_device soc_camera_max9526 = {
+	.dev = {
+		.platform_data = &iclink_max9526,
 	},
+	.id	= 2,
+	.name	= "soc-camera-pdrv",
 };
-#endif /* CONFIG_SOC_CAMERA_TVP5150 | CONFIG_SOC_CAMERA_TVP5150_MODULE */
+#endif /* CONFIG_SOC_CAMERA_MAX9526 | CONFIG_SOC_CAMERA_MAX9526_MODULE */
 
-#if defined(CONFIG_SOC_CAMERA_OV7670SOC) || defined(CONFIG_SOC_CAMERA_OV7670SOC_MODULE)
+#if defined(CONFIG_SOC_CAMERA_OV7670SOC) || \
+		defined(CONFIG_SOC_CAMERA_OV7670SOC_MODULE)
 static struct i2c_board_info camera_i2c_ov7670soc = {
 	I2C_BOARD_INFO("ov7670soc", 0x21),
 };
 
-static struct tegra_camera_platform_data ov7670_tegra_camera_platform_data = {
+static struct tegra_camera_platform_data ov7670_platform_data = {
 	.disable_camera		= tegra_camera_disable,
 	.enable_camera		= tegra_camera_enable,
 	.flip_h			= 0,
 	.flip_v			= 0,
-	.port			= TEGRA_CAMERA_PORT_VIP,
 	.internal_sync		= false,
+	.port			= TEGRA_CAMERA_PORT_VIP,
 	.vip_h_active_start	= 0x8F,
 	.vip_v_active_start	= 0x12,
 };
@@ -259,18 +228,51 @@ static struct tegra_camera_platform_data ov7670_tegra_camera_platform_data = {
 static struct soc_camera_link iclink_ov7670soc = {
 	.board_info	= &camera_i2c_ov7670soc,
 	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
-	.priv		= &ov7670_tegra_camera_platform_data,
 	.i2c_adapter_id	= 0,
+	.priv		= &ov7670_platform_data,
 };
 
 static struct platform_device soc_camera_ov7670soc = {
-	.name	= "soc-camera-pdrv",
-	.id	= 4,
-	.dev	= {
+	.dev = {
 		.platform_data = &iclink_ov7670soc,
 	},
+	.id	= 3,
+	.name	= "soc-camera-pdrv",
 };
 #endif /* CONFIG_SOC_CAMERA_OV7670SOC | CONFIG_SOC_CAMERA_OV7670SOC_MODULE */
+
+#if defined(CONFIG_SOC_CAMERA_TVP5150) || \
+		defined(CONFIG_SOC_CAMERA_TVP5150_MODULE)
+static struct i2c_board_info camera_i2c_tvp5150soc = {
+	I2C_BOARD_INFO("tvp5150soc", 0x5d),
+};
+
+static struct tegra_camera_platform_data tvp5150soc_platform_data = {
+	.disable_camera		= tegra_camera_disable,
+	.enable_camera		= tegra_camera_enable,
+	.flip_h			= 0,
+	.flip_v			= 0,
+	.internal_sync		= false,
+	.port			= TEGRA_CAMERA_PORT_VIP,
+	.vip_h_active_start	= 0x8F,
+	.vip_v_active_start	= 0x12,
+};
+
+static struct soc_camera_link iclink_tvp5150soc = {
+	.board_info	= &camera_i2c_tvp5150soc,
+	.bus_id		= -1, /* This must match the .id of tegra_vi01_device */
+	.i2c_adapter_id	= 0,
+	.priv		= &tvp5150soc_platform_data,
+};
+
+static struct platform_device soc_camera_tvp5150soc = {
+	.dev = {
+		.platform_data = &iclink_tvp5150soc,
+	},
+	.id	= 4,
+	.name	= "soc-camera-pdrv",
+};
+#endif /* CONFIG_SOC_CAMERA_TVP5150 | CONFIG_SOC_CAMERA_TVP5150_MODULE */
 #endif /* CONFIG_VIDEO_TEGRA | CONFIG_VIDEO_TEGRA_MODULE */
 
 /* CAN */
@@ -282,14 +284,15 @@ static struct platform_device soc_camera_ov7670soc = {
 #if defined(CONFIG_CAN_MCP251X) || defined(CONFIG_CAN_MCP251X_MODULE)
 /* Colibri EvalBoard V3.1a */
 
-#define CAN_INTERRUPT_GPIO	TEGRA_GPIO_PS0	/* active low interrupt (MCP2515 nINT) */
+/* active low interrupt (MCP2515 nINT) */
+#define CAN_INTERRUPT_GPIO	TEGRA_GPIO_PS0
 
 static int __init colibri_t20_mcp2515_setup(struct spi_device *spi)
 {
 	printk("Colibri EvalBoard V3.1a CAN Initialisation\n");
 
-	/* Note: EvalBoard uses regular system reset aka RESET_OUT# on SODIMM 87 to
-		 reset the MCP2515. */
+	/* Note: EvalBoard uses regular system reset aka RESET_OUT# on SODIMM 87
+		 to reset the MCP2515. */
 
 	return 0;
 }
@@ -321,7 +324,8 @@ static struct spi_board_info mcp251x_board_info[] = {
 static void __init colibri_t20_mcp2515_can_init(void)
 {
 	mcp251x_board_info[0].irq = gpio_to_irq(CAN_INTERRUPT_GPIO);
-	spi_register_board_info(mcp251x_board_info, ARRAY_SIZE(mcp251x_board_info));
+	spi_register_board_info(mcp251x_board_info,
+				ARRAY_SIZE(mcp251x_board_info));
 }
 #else /* CONFIG_CAN_MCP251X | CONFIG_CAN_MCP251X_MODULE */
 #define colibri_t20_mcp2515_can_init() do {} while (0)
@@ -1580,7 +1584,8 @@ static void __init colibri_t30_init(void)
 	colibri_t30_pinmux_init();
 #if defined(CONFIG_CAN_SJA1000) || defined(CONFIG_CAN_SJA1000_MODULE)
 	writel(TEGRA_SNOR_CONFIG_SNOR_CS(4), TEGRA_SNOR_CONFIG_REG);
-	writel(TEGRA_SNOR_CONFIG_GO | TEGRA_SNOR_CONFIG_SNOR_CS(4), TEGRA_SNOR_CONFIG_REG);
+	writel(TEGRA_SNOR_CONFIG_GO | TEGRA_SNOR_CONFIG_SNOR_CS(4),
+	       TEGRA_SNOR_CONFIG_REG);
 	colibri_can_resource[1].start	= gpio_to_irq(TEGRA_GPIO_PS0);
 	colibri_can_resource[1].end	= gpio_to_irq(TEGRA_GPIO_PS0);
 	platform_device_register(&colibri_can_device);
@@ -1596,7 +1601,8 @@ static void __init colibri_t30_init(void)
 #ifdef CONFIG_W1_MASTER_TEGRA
 	tegra_w1_device.dev.platform_data = &colibri_t30_w1_platform_data;
 #endif
-	platform_add_devices(colibri_t30_devices, ARRAY_SIZE(colibri_t30_devices));
+	platform_add_devices(colibri_t30_devices,
+			     ARRAY_SIZE(colibri_t30_devices));
 	tegra_ram_console_debug_init();
 	tegra_io_dpd_init();
 	colibri_t30_sdhci_init();
@@ -1610,21 +1616,24 @@ static void __init colibri_t30_init(void)
 	colibri_t30_gpio_init();
 
 #if defined(CONFIG_VIDEO_TEGRA) || defined(CONFIG_VIDEO_TEGRA_MODULE)
-#if defined(CONFIG_SOC_CAMERA_MAX9526) || defined(CONFIG_SOC_CAMERA_MAX9526_MODULE)
-	platform_device_register(&soc_camera_max9526);
-#endif
 #if defined(CONFIG_VIDEO_ADV7180) || defined(CONFIG_VIDEO_ADV7180_MODULE)
 	platform_device_register(&soc_camera_adv7180);
 #endif
 #if defined(CONFIG_VIDEO_ADV7280) || defined(CONFIG_VIDEO_ADV7280_MODULE)
 	platform_device_register(&soc_camera_adv7280);
 #endif
-#if defined(CONFIG_SOC_CAMERA_TVP5150) || defined(CONFIG_SOC_CAMERA_TVP5150_MODULE)
-	platform_device_register(&soc_camera_tvp5150soc);
+#if defined(CONFIG_SOC_CAMERA_MAX9526) || \
+		defined(CONFIG_SOC_CAMERA_MAX9526_MODULE)
+	platform_device_register(&soc_camera_max9526);
 #endif
-#if defined(CONFIG_SOC_CAMERA_OV7670SOC) || defined(CONFIG_SOC_CAMERA_OV7670SOC_MODULE)
+#if defined(CONFIG_SOC_CAMERA_OV7670SOC) || \
+		defined(CONFIG_SOC_CAMERA_OV7670SOC_MODULE)
 	platform_device_register(&soc_camera_ov7670soc);
 #endif
+#if defined(CONFIG_SOC_CAMERA_TVP5150) || \
+		defined(CONFIG_SOC_CAMERA_TVP5150_MODULE)
+	platform_device_register(&soc_camera_tvp5150soc);
+#endif
 #endif /* CONFIG_VIDEO_TEGRA | CONFIG_VIDEO_TEGRA_MODULE */
 
 	tegra_release_bootloader_fb();