From: Colin Cross Date: Wed, 4 Aug 2010 01:31:33 +0000 (-0700) Subject: [ARM] tegra: stingray: Update board file for i2c-tegra changes X-Git-Tag: firefly_0821_release~9834^2~731 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0fda36dc5e59b0eac6db877bd03b263b6a4f0051;p=firefly-linux-kernel-4.4.55.git [ARM] tegra: stingray: Update board file for i2c-tegra changes The latest i2c-tegra driver requires more platform data to support multiple i2c busses on a single controller. --- diff --git a/arch/arm/mach-tegra/board-stingray.c b/arch/arm/mach-tegra/board-stingray.c index 5216e7607ee9..2c1291d068eb 100644 --- a/arch/arm/mach-tegra/board-stingray.c +++ b/arch/arm/mach-tegra/board-stingray.c @@ -563,7 +563,25 @@ static struct tegra_sdhci_platform_data stingray_sdhci_platform_data4 = { }; static struct tegra_i2c_platform_data stingray_i2c1_platform_data = { - .bus_clk_rate = 400000, + .adapter_nr = 0, + .bus_count = 1, + .bus_clk_rate = { 400000 }, +}; + +static struct tegra_i2c_platform_data stingray_i2c2_platform_data = { + .adapter_nr = 1, + .bus_count = 1, +}; + +static struct tegra_i2c_platform_data stingray_i2c3_platform_data = { + .adapter_nr = 2, + .bus_count = 1, +}; + +static struct tegra_i2c_platform_data stingray_i2c4_platform_data = { + .adapter_nr = 3, + .bus_count = 1, + .is_dvc = true, }; static __initdata struct tegra_clk_init_table stingray_clk_init_table[] = { @@ -589,6 +607,9 @@ static __initdata struct tegra_clk_init_table stingray_clk_init_table[] = { static void stingray_i2c_init(void) { tegra_i2c_device1.dev.platform_data = &stingray_i2c1_platform_data; + tegra_i2c_device2.dev.platform_data = &stingray_i2c2_platform_data; + tegra_i2c_device3.dev.platform_data = &stingray_i2c3_platform_data; + tegra_i2c_device4.dev.platform_data = &stingray_i2c4_platform_data; platform_device_register(&tegra_i2c_device1); platform_device_register(&tegra_i2c_device2);