mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 13:43:28 +00:00
global: Migrate CONFIG_PCIE_IMX_PERST_GPIO to CFG
Perform a simple rename of CONFIG_PCIE_IMX_PERST_GPIO to CFG_PCIE_IMX_PERST_GPIO Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
a2c164cbb4
commit
7906f91789
6 changed files with 11 additions and 11 deletions
|
@ -566,7 +566,7 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
|
|||
* do self-initialisation.
|
||||
*
|
||||
* In case your #PERST pin is connected to a plain GPIO pin of the
|
||||
* CPU, you can define CONFIG_PCIE_IMX_PERST_GPIO in your board's
|
||||
* CPU, you can define CFG_PCIE_IMX_PERST_GPIO in your board's
|
||||
* configuration file and the condition below will handle the rest
|
||||
* of the reset toggling.
|
||||
*
|
||||
|
@ -578,13 +578,13 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
|
|||
* Linux at all in the first place since it's in some non-reset
|
||||
* state due to being previously used in U-Boot.
|
||||
*/
|
||||
#ifdef CONFIG_PCIE_IMX_PERST_GPIO
|
||||
gpio_request(CONFIG_PCIE_IMX_PERST_GPIO, "pcie_reset");
|
||||
gpio_direction_output(CONFIG_PCIE_IMX_PERST_GPIO, 0);
|
||||
#ifdef CFG_PCIE_IMX_PERST_GPIO
|
||||
gpio_request(CFG_PCIE_IMX_PERST_GPIO, "pcie_reset");
|
||||
gpio_direction_output(CFG_PCIE_IMX_PERST_GPIO, 0);
|
||||
mdelay(20);
|
||||
gpio_set_value(CONFIG_PCIE_IMX_PERST_GPIO, 1);
|
||||
gpio_set_value(CFG_PCIE_IMX_PERST_GPIO, 1);
|
||||
mdelay(20);
|
||||
gpio_free(CONFIG_PCIE_IMX_PERST_GPIO);
|
||||
gpio_free(CFG_PCIE_IMX_PERST_GPIO);
|
||||
#else
|
||||
if (dm_gpio_is_valid(gpio)) {
|
||||
/* Assert PERST# for 20ms then de-assert */
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#define CFG_SYS_FSL_USDHC_NUM 3
|
||||
|
||||
#ifdef CONFIG_CMD_PCI
|
||||
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
|
||||
#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
|
||||
#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(3, 19)
|
||||
#endif
|
||||
|
||||
|
|
|
@ -123,7 +123,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_PCI
|
||||
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0)
|
||||
#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0)
|
||||
#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1)
|
||||
#endif
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
/* PCI express */
|
||||
#ifdef CONFIG_CMD_PCI
|
||||
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29)
|
||||
#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29)
|
||||
#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(7, 12)
|
||||
#endif
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
/* PCI */
|
||||
#ifdef CONFIG_CMD_PCI
|
||||
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
|
||||
#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
|
||||
#endif
|
||||
|
||||
/* USB */
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#define CFG_MXC_USB_FLAGS 0
|
||||
|
||||
#ifdef CONFIG_CMD_PCI
|
||||
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6)
|
||||
#define CFG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6)
|
||||
#endif
|
||||
|
||||
#define CFG_IMX6_PWM_PER_CLK 66000000
|
||||
|
|
Loading…
Reference in a new issue