diff options
author | Jay Agarwal <jagarwal@nvidia.com> | 2011-12-05 14:25:38 +0530 |
---|---|---|
committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-15 12:05:31 +0530 |
commit | eba3b9a73807a14a11983d931883022834e7349e (patch) | |
tree | 1567f12ec0a5042bc826e293876855f70992d6c2 /arch/arm/mach-tegra/board-trimslice.c | |
parent | a4f80ed45571d6d37589dcca1e2cadfb8f46df6e (diff) |
arm: tegra: cardhu: pcie support for cardhu bsp
Enabling PCIE support in cardhu board.
Fixes bug: 637871
Reviewed-on: http://git-master/r/34474
(cherry picked from commit bde3e58d998b6e76934152219b8803327cea2fad)
Change-Id: I18c548b458ad3d17ec07d2ec5b16fd83897b44b1
Signed-off-by: Krishna Kishore <kthota@nvidia.com>
Reviewed-on: http://git-master/r/62072
Reviewed-by: Lokesh Pathak <lpathak@nvidia.com>
Tested-by: Lokesh Pathak <lpathak@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-trimslice.c')
-rw-r--r-- | arch/arm/mach-tegra/board-trimslice.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index 89a6d2adc1de..823060ec478f 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c @@ -33,6 +33,7 @@ #include <mach/iomap.h> #include <mach/sdhci.h> #include <mach/gpio.h> +#include <mach/pci.h> #include "board.h" #include "clock.h" @@ -79,6 +80,13 @@ static struct platform_device trimslice_audio_device = { .id = 0, }; +static struct tegra_pci_platform_data trimslice_pci_platform_data = { + .port_status[0] = 1, + .port_status[1] = 1, + .use_dock_detect = 0, + .gpio = 0, +}; + static struct platform_device *trimslice_devices[] __initdata = { &debug_uart, &tegra_sdhci_device1, @@ -87,6 +95,7 @@ static struct platform_device *trimslice_devices[] __initdata = { &tegra_das_device, &tegra_pcm_device, &trimslice_audio_device, + &trimslice_pci_platform_data, }; static struct i2c_board_info trimslice_i2c3_board_info[] = { @@ -146,15 +155,6 @@ static __initdata struct tegra_clk_init_table trimslice_clk_init_table[] = { { NULL, NULL, 0, 0}, }; -static int __init tegra_trimslice_pci_init(void) -{ - if (!machine_is_trimslice()) - return 0; - - return tegra_pcie_init(true, true); -} -subsys_initcall(tegra_trimslice_pci_init); - static void __init tegra_trimslice_init(void) { tegra_clk_init_from_table(trimslice_clk_init_table); @@ -163,6 +163,7 @@ static void __init tegra_trimslice_init(void) tegra_sdhci_device1.dev.platform_data = &sdhci_pdata1; tegra_sdhci_device4.dev.platform_data = &sdhci_pdata4; + tegra_pci_device.dev.platform_data = &trimslice_pci_platform_data; platform_add_devices(trimslice_devices, ARRAY_SIZE(trimslice_devices)); |