Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d3df626cb9e0dceb7de56bf6a6c0d04a53b7ceee

Authored by Ye Li
1 parent d12350bdea
Exists in smarc_8mq-imx_v2020.04_5.4.24_2.1.0 and in 3 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, smarc-8m-android-10.0.0_2.6.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0

MLK-22398-10 mx6sabresd: Enable PCIE IMX DM driver 

Update the board codes and configs to enable PCIE IMX driver on all
imx6dql sabresd boards.
The always on regulators is powered up in board_init for enabling
"pcie_reg" regulator.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit c59e779f71008dede451d1a6185002701b5a34f0)

Showing 15 changed files with 44 additions and 3 deletions Side-by-side Diff

board/freescale/mx6sabresd/mx6sabresd.c
Diff comments   View file @ d3df626
... ... @@ -34,6 +34,7 @@
34 34 #include <usb.h>
35 35 #include <usb/ehci-ci.h>
36 36 #include <asm/arch/mx6-ddr.h>
  37 +#include <power/regulator.h>
37 38 #if defined(CONFIG_MX6DL) && defined(CONFIG_MXC_EPDC)
38 39 #include <lcd.h>
39 40 #include <mxc_epdc_fb.h>
... ... @@ -181,7 +182,7 @@
181 182 };
182 183 #endif
183 184  
184   -#ifdef CONFIG_PCIE_IMX
  185 +#if defined(CONFIG_PCIE_IMX) && !defined(CONFIG_DM_PCI)
185 186 iomux_v3_cfg_t const pcie_pads[] = {
186 187 IOMUX_PADS(PAD_EIM_D19__GPIO3_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL)), /* POWER */
187 188 IOMUX_PADS(PAD_GPIO_17__GPIO7_IO12 | MUX_PAD_CTRL(NO_PAD_CTRL)), /* RESET */
... ... @@ -821,6 +822,10 @@
821 822 /* address of boot parameters */
822 823 gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
823 824  
  825 +#if defined(CONFIG_DM_REGULATOR)
  826 + regulators_enable_boot_on(false);
  827 +#endif
  828 +
824 829 #ifdef CONFIG_MXC_SPI
825 830 setup_spi();
826 831 #endif
... ... @@ -829,7 +834,7 @@
829 834 setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
830 835 #endif
831 836  
832   -#ifdef CONFIG_PCIE_IMX
  837 +#if defined(CONFIG_PCIE_IMX) && !defined(CONFIG_DM_PCI)
833 838 setup_pcie();
834 839 #endif
835 840  
configs/mx6dlsabresd_defconfig
Diff comments   View file @ d3df626
... ... @@ -81,6 +81,9 @@
81 81 CONFIG_PHYLIB=y
82 82 CONFIG_MII=y
83 83 CONFIG_PCI=y
  84 +CONFIG_DM_PCI=y
  85 +CONFIG_REGMAP=y
  86 +CONFIG_SYSCON=y
84 87  
85 88 CONFIG_CMD_FASTBOOT=y
86 89 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6dlsabresd_epdc_defconfig
Diff comments   View file @ d3df626
... ... @@ -76,6 +76,9 @@
76 76 CONFIG_PHYLIB=y
77 77 CONFIG_MII=y
78 78 CONFIG_PCI=y
  79 +CONFIG_DM_PCI=y
  80 +CONFIG_REGMAP=y
  81 +CONFIG_SYSCON=y
79 82 CONFIG_MXC_EPDC=y
80 83 CONFIG_LCD=y
81 84  
configs/mx6dlsabresd_optee_defconfig
Diff comments   View file @ d3df626
... ... @@ -82,6 +82,9 @@
82 82 CONFIG_PHYLIB=y
83 83 CONFIG_MII=y
84 84 CONFIG_PCI=y
  85 +CONFIG_DM_PCI=y
  86 +CONFIG_REGMAP=y
  87 +CONFIG_SYSCON=y
85 88  
86 89 CONFIG_CMD_FASTBOOT=y
87 90 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6dlsabresd_plugin_defconfig
Diff comments   View file @ d3df626
... ... @@ -82,6 +82,9 @@
82 82 CONFIG_PHYLIB=y
83 83 CONFIG_MII=y
84 84 CONFIG_PCI=y
  85 +CONFIG_DM_PCI=y
  86 +CONFIG_REGMAP=y
  87 +CONFIG_SYSCON=y
85 88  
86 89 CONFIG_CMD_FASTBOOT=y
87 90 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6qpsabresd_defconfig
Diff comments   View file @ d3df626
... ... @@ -81,6 +81,9 @@
81 81 CONFIG_PHYLIB=y
82 82 CONFIG_MII=y
83 83 CONFIG_PCI=y
  84 +CONFIG_DM_PCI=y
  85 +CONFIG_REGMAP=y
  86 +CONFIG_SYSCON=y
84 87  
85 88 CONFIG_CMD_FASTBOOT=y
86 89 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6qpsabresd_optee_defconfig
Diff comments   View file @ d3df626
... ... @@ -82,7 +82,9 @@
82 82 CONFIG_PHYLIB=y
83 83 CONFIG_MII=y
84 84 CONFIG_PCI=y
85   -
  85 +CONFIG_DM_PCI=y
  86 +CONFIG_REGMAP=y
  87 +CONFIG_SYSCON=y
86 88  
87 89 CONFIG_CMD_FASTBOOT=y
88 90 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6qpsabresd_sata_defconfig
Diff comments   View file @ d3df626
... ... @@ -82,6 +82,7 @@
82 82 CONFIG_PHYLIB=y
83 83 CONFIG_MII=y
84 84 CONFIG_PCI=y
  85 +CONFIG_DM_PCI=y
85 86  
86 87 CONFIG_CMD_FASTBOOT=y
87 88 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6qsabresd_defconfig
Diff comments   View file @ d3df626
... ... @@ -81,6 +81,9 @@
81 81 CONFIG_PHYLIB=y
82 82 CONFIG_MII=y
83 83 CONFIG_PCI=y
  84 +CONFIG_DM_PCI=y
  85 +CONFIG_REGMAP=y
  86 +CONFIG_SYSCON=y
84 87  
85 88 CONFIG_CMD_FASTBOOT=y
86 89 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6qsabresd_optee_defconfig
Diff comments   View file @ d3df626
... ... @@ -82,6 +82,9 @@
82 82 CONFIG_PHYLIB=y
83 83 CONFIG_MII=y
84 84 CONFIG_PCI=y
  85 +CONFIG_DM_PCI=y
  86 +CONFIG_REGMAP=y
  87 +CONFIG_SYSCON=y
85 88  
86 89 CONFIG_CMD_FASTBOOT=y
87 90 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6qsabresd_plugin_defconfig
Diff comments   View file @ d3df626
... ... @@ -82,6 +82,9 @@
82 82 CONFIG_PHYLIB=y
83 83 CONFIG_MII=y
84 84 CONFIG_PCI=y
  85 +CONFIG_DM_PCI=y
  86 +CONFIG_REGMAP=y
  87 +CONFIG_SYSCON=y
85 88  
86 89 CONFIG_CMD_FASTBOOT=y
87 90 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6qsabresd_sata_defconfig
Diff comments   View file @ d3df626
... ... @@ -82,6 +82,7 @@
82 82 CONFIG_PHYLIB=y
83 83 CONFIG_MII=y
84 84 CONFIG_PCI=y
  85 +CONFIG_DM_PCI=y
85 86  
86 87 CONFIG_CMD_FASTBOOT=y
87 88 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6solosabresd_defconfig
Diff comments   View file @ d3df626
... ... @@ -81,6 +81,9 @@
81 81 CONFIG_PHYLIB=y
82 82 CONFIG_MII=y
83 83 CONFIG_PCI=y
  84 +CONFIG_DM_PCI=y
  85 +CONFIG_REGMAP=y
  86 +CONFIG_SYSCON=y
84 87  
85 88 CONFIG_CMD_FASTBOOT=y
86 89 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/mx6solosabresd_optee_defconfig
Diff comments   View file @ d3df626
... ... @@ -82,6 +82,9 @@
82 82 CONFIG_PHYLIB=y
83 83 CONFIG_MII=y
84 84 CONFIG_PCI=y
  85 +CONFIG_DM_PCI=y
  86 +CONFIG_REGMAP=y
  87 +CONFIG_SYSCON=y
85 88  
86 89 CONFIG_CMD_FASTBOOT=y
87 90 CONFIG_USB_FUNCTION_FASTBOOT=y
include/configs/mx6sabresd.h
Diff comments   View file @ d3df626
... ... @@ -60,8 +60,10 @@
60 60 #ifdef CONFIG_CMD_PCI
61 61 #define CONFIG_PCI_SCAN_SHOW
62 62 #define CONFIG_PCIE_IMX
  63 +#ifndef CONFIG_DM_PCI
63 64 #define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
64 65 #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19)
  66 +#endif
65 67 #endif
66 68  
67 69 /* USB Configs */