Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78702e43 authored by Colin Cross's avatar Colin Cross
Browse files

ARM: tegra: remove copy-and-pasted i2c platform data in boards 



Every board file includes the same platform data definition
for the i2c-tegra driver's bus speed.  Move the platform data
into devices.c, and remove it from all the board files.

Signed-off-by: default avatarColin Cross <ccross@android.com>
Tested-by: default avatarKonstantin Sinyuk <kostyas@compulab.co.il>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
parent 4c755997

arch/arm/mach-tegra/board-harmony.c

+0 −22
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/i2c.h>

#include <linux/i2c-tegra.h>



#include <sound/wm8903.h>
@@ -83,22 +82,6 @@ static struct platform_device harmony_audio_device = { 
	},

};



static struct tegra_i2c_platform_data harmony_i2c1_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct tegra_i2c_platform_data harmony_i2c2_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct tegra_i2c_platform_data harmony_i2c3_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct tegra_i2c_platform_data harmony_dvc_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct wm8903_platform_data harmony_wm8903_pdata = {

	.irq_active_low = 0,

	.micdet_cfg = 0,
@@ -121,11 +104,6 @@ static struct i2c_board_info __initdata wm8903_board_info = { 


static void __init harmony_i2c_init(void)

{

	tegra_i2c_device1.dev.platform_data = &harmony_i2c1_platform_data;

	tegra_i2c_device2.dev.platform_data = &harmony_i2c2_platform_data;

	tegra_i2c_device3.dev.platform_data = &harmony_i2c3_platform_data;

	tegra_i2c_device4.dev.platform_data = &harmony_dvc_platform_data;



	platform_device_register(&tegra_i2c_device1);

	platform_device_register(&tegra_i2c_device2);

	platform_device_register(&tegra_i2c_device3);

arch/arm/mach-tegra/board-paz00.c

+0 −17
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/pda_power.h>

#include <linux/io.h>

#include <linux/i2c.h>

#include <linux/i2c-tegra.h>

#include <linux/platform_data/tegra_usb.h>



#include <asm/mach-types.h>
@@ -74,24 +73,8 @@ static struct platform_device *paz00_devices[] __initdata = { 
	&tegra_sdhci_device4,

};



static struct tegra_i2c_platform_data paz00_i2c1_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct tegra_i2c_platform_data paz00_i2c2_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct tegra_i2c_platform_data paz00_dvc_platform_data = {

	.bus_clk_rate   = 400000,

};



static void paz00_i2c_init(void)

{

	tegra_i2c_device1.dev.platform_data = &paz00_i2c1_platform_data;

	tegra_i2c_device2.dev.platform_data = &paz00_i2c2_platform_data;

	tegra_i2c_device4.dev.platform_data = &paz00_dvc_platform_data;



	platform_device_register(&tegra_i2c_device1);

	platform_device_register(&tegra_i2c_device2);

	platform_device_register(&tegra_i2c_device4);

arch/arm/mach-tegra/board-seaboard.c

+0 −22
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/platform_device.h>

#include <linux/serial_8250.h>

#include <linux/i2c.h>

#include <linux/i2c-tegra.h>

#include <linux/delay.h>

#include <linux/input.h>

#include <linux/io.h>
@@ -66,22 +65,6 @@ static __initdata struct tegra_clk_init_table seaboard_clk_init_table[] = { 
	{ NULL,		NULL,		0,		0},

};



static struct tegra_i2c_platform_data seaboard_i2c1_platform_data = {

	.bus_clk_rate	= 400000.

};



static struct tegra_i2c_platform_data seaboard_i2c2_platform_data = {

	.bus_clk_rate	= 400000,

};



static struct tegra_i2c_platform_data seaboard_i2c3_platform_data = {

	.bus_clk_rate	= 400000,

};



static struct tegra_i2c_platform_data seaboard_dvc_platform_data = {

	.bus_clk_rate	= 400000,

};



static struct gpio_keys_button seaboard_gpio_keys_buttons[] = {

	{

		.code		= SW_LID,
@@ -161,11 +144,6 @@ static void __init seaboard_i2c_init(void) 


	i2c_register_board_info(4, &adt7461_device, 1);



	tegra_i2c_device1.dev.platform_data = &seaboard_i2c1_platform_data;

	tegra_i2c_device2.dev.platform_data = &seaboard_i2c2_platform_data;

	tegra_i2c_device3.dev.platform_data = &seaboard_i2c3_platform_data;

	tegra_i2c_device4.dev.platform_data = &seaboard_dvc_platform_data;



	platform_device_register(&tegra_i2c_device1);

	platform_device_register(&tegra_i2c_device2);

	platform_device_register(&tegra_i2c_device3);

arch/arm/mach-tegra/board-trimslice.c

+0 −17
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/serial_8250.h>

#include <linux/io.h>

#include <linux/i2c.h>

#include <linux/i2c-tegra.h>

#include <linux/platform_data/tegra_usb.h>

#include <linux/gpio.h>
@@ -92,18 +91,6 @@ static struct platform_device *trimslice_devices[] __initdata = { 
	&trimslice_audio_device,

};



static struct tegra_i2c_platform_data trimslice_i2c1_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct tegra_i2c_platform_data trimslice_i2c2_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct tegra_i2c_platform_data trimslice_i2c3_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct i2c_board_info trimslice_i2c3_board_info[] = {

	{

		I2C_BOARD_INFO("tlv320aic23", 0x1a),
@@ -115,10 +102,6 @@ static struct i2c_board_info trimslice_i2c3_board_info[] = { 


static void trimslice_i2c_init(void)

{

	tegra_i2c_device1.dev.platform_data = &trimslice_i2c1_platform_data;

	tegra_i2c_device2.dev.platform_data = &trimslice_i2c2_platform_data;

	tegra_i2c_device3.dev.platform_data = &trimslice_i2c3_platform_data;



	platform_device_register(&tegra_i2c_device1);

	platform_device_register(&tegra_i2c_device2);

	platform_device_register(&tegra_i2c_device3);

arch/arm/mach-tegra/devices.c

+21 −4
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/fsl_devices.h>

#include <linux/serial_8250.h>

#include <linux/i2c-tegra.h>

#include <asm/pmu.h>

#include <mach/irqs.h>

#include <mach/iomap.h>
@@ -79,13 +80,29 @@ static struct resource i2c_resource4[] = { 
	},

};



static struct tegra_i2c_platform_data tegra_i2c1_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct tegra_i2c_platform_data tegra_i2c2_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct tegra_i2c_platform_data tegra_i2c3_platform_data = {

	.bus_clk_rate   = 400000,

};



static struct tegra_i2c_platform_data tegra_dvc_platform_data = {

	.bus_clk_rate   = 400000,

};



struct platform_device tegra_i2c_device1 = {

	.name		= "tegra-i2c",

	.id		= 0,

	.resource	= i2c_resource1,

	.num_resources	= ARRAY_SIZE(i2c_resource1),

	.dev = {

		.platform_data = 0,

		.platform_data = &tegra_i2c1_platform_data,

	},

};
@@ -95,7 +112,7 @@ struct platform_device tegra_i2c_device2 = { 
	.resource	= i2c_resource2,

	.num_resources	= ARRAY_SIZE(i2c_resource2),

	.dev = {

		.platform_data = 0,

		.platform_data = &tegra_i2c2_platform_data,

	},

};
@@ -105,7 +122,7 @@ struct platform_device tegra_i2c_device3 = { 
	.resource	= i2c_resource3,

	.num_resources	= ARRAY_SIZE(i2c_resource3),

	.dev = {

		.platform_data = 0,

		.platform_data = &tegra_i2c3_platform_data,

	},

};
@@ -115,7 +132,7 @@ struct platform_device tegra_i2c_device4 = { 
	.resource	= i2c_resource4,

	.num_resources	= ARRAY_SIZE(i2c_resource4),

	.dev = {

		.platform_data = 0,

		.platform_data = &tegra_dvc_platform_data,

	},

};