MLK-22398-8 mx6sxsdb: Enable PCIE IMX DM driver

Update the board codes and configs to enable pcie imx DM driver.
The pcie node in SDB board DTS reply on the alway on regulator
"reg_pcie". So power up the always on regulators in board_init.

Signed-off-by: Ye Li <ye.li@nxp.com>

diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 575bac3..f91f1d6 100644 (file)
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -30,6 +30,7 @@
 #include <usb.h>
 #include <usb/ehci-ci.h>
 #include <asm/mach-imx/video.h>
+#include <power/regulator.h>
 
 #ifdef CONFIG_IMX_RDC
 #include <asm/mach-imx/rdc-sema.h>
@@ -204,7 +205,7 @@ static iomux_v3_cfg_t const phy_control_pads[] = {
        MX6_PAD_ENET2_CRS__GPIO2_IO_7 | MUX_PAD_CTRL(NO_PAD_CTRL),
 };
 
-#ifdef CONFIG_PCIE_IMX
+#if defined(CONFIG_PCIE_IMX) && !defined(CONFIG_DM_PCI)
 iomux_v3_cfg_t const pcie_pads[] = {
        MX6_PAD_ENET1_COL__GPIO2_IO_0 | MUX_PAD_CTRL(NO_PAD_CTRL),      /* POWER */
        MX6_PAD_ENET1_CRS__GPIO2_IO_1 | MUX_PAD_CTRL(NO_PAD_CTRL),      /* RESET */
@@ -843,9 +844,9 @@ int board_init(void)
         */
        imx_iomux_v3_setup_pad(wdog_b_pad);
 
-       /* Active high for ncp692 */
-       gpio_request(IMX_GPIO_NR(4, 16), "ncp692_en");
-       gpio_direction_output(IMX_GPIO_NR(4, 16), 1);
+#if defined(CONFIG_DM_REGULATOR)
+       regulators_enable_boot_on(false);
+#endif
 
 #ifdef CONFIG_SYS_I2C
        setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
@@ -862,7 +863,7 @@ int board_init(void)
        board_qspi_init();
 #endif
 
-#ifdef CONFIG_PCIE_IMX
+#if defined(CONFIG_PCIE_IMX) && !defined(CONFIG_DM_PCI)
        setup_pcie();
 #endif
 

diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index c84b7fd..8106a03 100644 (file)
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -51,6 +51,9 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_PMIC=y
@@ -86,4 +89,4 @@ CONFIG_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x83800000
 CONFIG_FASTBOOT_BUF_SIZE=0x40000000
 CONFIG_FASTBOOT_FLASH=y
-CONFIG_EFI_PARTITION=y
\ No newline at end of file
+CONFIG_EFI_PARTITION=y

diff --git a/configs/mx6sxsabresd_emmc_defconfig b/configs/mx6sxsabresd_emmc_defconfig
index 24d8de8..a9039cf 100644 (file)
--- a/configs/mx6sxsabresd_emmc_defconfig
+++ b/configs/mx6sxsabresd_emmc_defconfig
@@ -52,6 +52,9 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_PMIC=y

diff --git a/configs/mx6sxsabresd_m4fastup_defconfig b/configs/mx6sxsabresd_m4fastup_defconfig
index 775ed32..02e923f 100644 (file)
--- a/configs/mx6sxsabresd_m4fastup_defconfig
+++ b/configs/mx6sxsabresd_m4fastup_defconfig
@@ -44,6 +44,9 @@ CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_PMIC=y

diff --git a/configs/mx6sxsabresd_optee_defconfig b/configs/mx6sxsabresd_optee_defconfig
index ceb6f46..c153629 100644 (file)
--- a/configs/mx6sxsabresd_optee_defconfig
+++ b/configs/mx6sxsabresd_optee_defconfig
@@ -52,6 +52,9 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_PMIC=y

diff --git a/configs/mx6sxsabresd_qspi2_defconfig b/configs/mx6sxsabresd_qspi2_defconfig
index 4898007..6644b6a 100644 (file)
--- a/configs/mx6sxsabresd_qspi2_defconfig
+++ b/configs/mx6sxsabresd_qspi2_defconfig
@@ -55,6 +55,9 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_PMIC=y

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index a0663f7..cd9e8ca 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -247,9 +247,11 @@
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_PCIE_IMX
+#ifndef CONFIG_DM_PCI
 #define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(2, 0)
 #define CONFIG_PCIE_IMX_POWER_GPIO     IMX_GPIO_NR(2, 1)
 #endif
+#endif
 
 #define CONFIG_IMX_THERMAL