diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2014-01-03 17:42:28 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2014-01-03 17:42:28 -0700 |
| commit | 42527469c617f9c22ecf42d36266245a0b0cffc3 (patch) | |
| tree | 5ba7aa710566d58bf7e219079dfa20d7b1a4ffcc | |
| parent | dad0bd67cc66bf39419b87fc1807d3afe0c78bcd (diff) | |
sp: Add PCIe support
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| -rw-r--r-- | arch/arm/mach-mx6/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_sp.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/pads-mx6_sp.h | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/Kconfig b/arch/arm/mach-mx6/Kconfig index 8bd8df349a6c..213f37c93a62 100644 --- a/arch/arm/mach-mx6/Kconfig +++ b/arch/arm/mach-mx6/Kconfig @@ -382,6 +382,7 @@ config MACH_MX6_SP select IMX_HAVE_PLATFORM_FSL_USB_WAKEUP select IMX_HAVE_PLATFORM_AHCI select IMX_HAVE_PLATFORM_IMX_OCOTP + select IMX_HAVE_PLATFORM_IMX_PCIE select IMX_HAVE_PLATFORM_IMX_VIIM select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_IMX_SNVS_RTC diff --git a/arch/arm/mach-mx6/board-mx6_sp.c b/arch/arm/mach-mx6/board-mx6_sp.c index 7ae96eddb546..61c40361c02b 100644 --- a/arch/arm/mach-mx6/board-mx6_sp.c +++ b/arch/arm/mach-mx6/board-mx6_sp.c @@ -569,6 +569,13 @@ static void poweroff(void) while (1); } +static const struct imx_pcie_platform_data pcie_data __initconst = { + .pcie_pwr_en = -EINVAL, + .pcie_rst = IMX_GPIO_NR(5,2), + .pcie_wake_up = -EINVAL, + .pcie_dis = -EINVAL, +}; + /*! * Board specific initialization. */ @@ -699,6 +706,7 @@ static void __init mx6_board_init(void) imx6q_add_perfmon(1); imx6q_add_perfmon(2); // regulator_has_full_constraints(); + imx6q_add_pcie(&pcie_data); } extern void __iomem *twd_base; diff --git a/arch/arm/mach-mx6/pads-mx6_sp.h b/arch/arm/mach-mx6/pads-mx6_sp.h index b4e86b2ae16d..1b9e3179315a 100644 --- a/arch/arm/mach-mx6/pads-mx6_sp.h +++ b/arch/arm/mach-mx6/pads-mx6_sp.h @@ -176,6 +176,9 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = { SD_PINS8(4, USDHC_PAD_CTRL_50MHZ), MX6PAD(NANDF_D7__GPIO_2_7), /* eMMC reset */ + /* PCIe reset */ + NEW_PAD_CTRL(MX6PAD(EIM_A25__GPIO_5_2), WEAK), + /* GPIOs connector (J46) */ NEW_PAD_CTRL(MX6PAD(GPIO_7__GPIO_1_7), WEAK), NEW_PAD_CTRL(MX6PAD(GPIO_8__GPIO_1_8), WEAK), |