mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
Convert CONFIG_PHY_RESET_DELAY to Kconfig
This converts the following to Kconfig: CONFIG_PHY_RESET_DELAY Cc: Ramon Fried <rfried.dev@gmail.com> Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
0b956e3987
commit
16199a8b96
19 changed files with 22 additions and 18 deletions
7
README
7
README
|
@ -1075,13 +1075,6 @@ The following options need to be configured:
|
||||||
|
|
||||||
The clock frequency of the MII bus
|
The clock frequency of the MII bus
|
||||||
|
|
||||||
CONFIG_PHY_RESET_DELAY
|
|
||||||
|
|
||||||
Some PHY like Intel LXT971A need extra delay after
|
|
||||||
reset before any MII register access is possible.
|
|
||||||
For such PHY, set this option to the usec delay
|
|
||||||
required. (minimum 300usec for LXT971A)
|
|
||||||
|
|
||||||
CONFIG_PHY_CMD_DELAY (ppc4xx)
|
CONFIG_PHY_CMD_DELAY (ppc4xx)
|
||||||
|
|
||||||
Some PHY like Intel LXT971A need extra delay after
|
Some PHY like Intel LXT971A need extra delay after
|
||||||
|
|
|
@ -19,7 +19,4 @@
|
||||||
#define CONFIG_SYS_NS16550_CLK_DIV 54
|
#define CONFIG_SYS_NS16550_CLK_DIV 54
|
||||||
#define CONFIG_SYS_NS16550_COM3 0x18023000
|
#define CONFIG_SYS_NS16550_COM3 0x18023000
|
||||||
|
|
||||||
/* Ethernet */
|
|
||||||
#define CONFIG_PHY_RESET_DELAY 10000 /* PHY reset delay in us*/
|
|
||||||
|
|
||||||
#endif /* __ARCH_CONFIGS_H */
|
#endif /* __ARCH_CONFIGS_H */
|
||||||
|
|
|
@ -366,7 +366,7 @@ int miiphy_reset(const char *devname, unsigned char addr)
|
||||||
debug("PHY reset failed\n");
|
debug("PHY reset failed\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
#ifdef CONFIG_PHY_RESET_DELAY
|
#if CONFIG_PHY_RESET_DELAY > 0
|
||||||
udelay(CONFIG_PHY_RESET_DELAY); /* Intel LXT971A needs this */
|
udelay(CONFIG_PHY_RESET_DELAY); /* Intel LXT971A needs this */
|
||||||
#endif
|
#endif
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -49,6 +49,7 @@ CONFIG_MTD_RAW_NAND=y
|
||||||
CONFIG_NAND_BRCMNAND=y
|
CONFIG_NAND_BRCMNAND=y
|
||||||
CONFIG_NAND_BRCMNAND_6838=y
|
CONFIG_NAND_BRCMNAND_6838=y
|
||||||
CONFIG_SYS_NAND_ONFI_DETECTION=y
|
CONFIG_SYS_NAND_ONFI_DETECTION=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_PHY=y
|
CONFIG_PHY=y
|
||||||
CONFIG_BCM6368_USBH_PHY=y
|
CONFIG_BCM6368_USBH_PHY=y
|
||||||
CONFIG_PINCTRL=y
|
CONFIG_PINCTRL=y
|
||||||
|
|
|
@ -50,6 +50,7 @@ CONFIG_MTD=y
|
||||||
CONFIG_DM_SPI_FLASH=y
|
CONFIG_DM_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_WINBOND=y
|
CONFIG_SPI_FLASH_WINBOND=y
|
||||||
CONFIG_SPI_FLASH_MTD=y
|
CONFIG_SPI_FLASH_MTD=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_BCM6368_ETH=y
|
CONFIG_BCM6368_ETH=y
|
||||||
CONFIG_PHY=y
|
CONFIG_PHY=y
|
||||||
|
|
|
@ -50,6 +50,7 @@ CONFIG_MTD=y
|
||||||
CONFIG_DM_SPI_FLASH=y
|
CONFIG_DM_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_MACRONIX=y
|
CONFIG_SPI_FLASH_MACRONIX=y
|
||||||
CONFIG_SPI_FLASH_MTD=y
|
CONFIG_SPI_FLASH_MTD=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_BCM6368_ETH=y
|
CONFIG_BCM6368_ETH=y
|
||||||
CONFIG_PHY=y
|
CONFIG_PHY=y
|
||||||
|
|
|
@ -51,6 +51,7 @@ CONFIG_SYS_FLASH_PROTECTION=y
|
||||||
CONFIG_SYS_FLASH_CFI=y
|
CONFIG_SYS_FLASH_CFI=y
|
||||||
CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
|
CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
|
||||||
CONFIG_PHY_FIXED=y
|
CONFIG_PHY_FIXED=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_BCM6348_ETH=y
|
CONFIG_BCM6348_ETH=y
|
||||||
CONFIG_PHY=y
|
CONFIG_PHY=y
|
||||||
|
|
|
@ -52,6 +52,7 @@ CONFIG_MTD_RAW_NAND=y
|
||||||
CONFIG_NAND_BRCMNAND=y
|
CONFIG_NAND_BRCMNAND=y
|
||||||
CONFIG_NAND_BRCMNAND_6368=y
|
CONFIG_NAND_BRCMNAND_6368=y
|
||||||
CONFIG_SYS_NAND_ONFI_DETECTION=y
|
CONFIG_SYS_NAND_ONFI_DETECTION=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_BCM6368_ETH=y
|
CONFIG_BCM6368_ETH=y
|
||||||
CONFIG_PHY=y
|
CONFIG_PHY=y
|
||||||
|
|
|
@ -50,6 +50,7 @@ CONFIG_CFI_FLASH=y
|
||||||
CONFIG_SYS_FLASH_PROTECTION=y
|
CONFIG_SYS_FLASH_PROTECTION=y
|
||||||
CONFIG_SYS_FLASH_CFI=y
|
CONFIG_SYS_FLASH_CFI=y
|
||||||
CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
|
CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_PHY_GIGE=y
|
CONFIG_PHY_GIGE=y
|
||||||
CONFIG_BCM6368_ETH=y
|
CONFIG_BCM6368_ETH=y
|
||||||
|
|
|
@ -51,6 +51,7 @@ CONFIG_SYS_FLASH_PROTECTION=y
|
||||||
CONFIG_SYS_FLASH_CFI=y
|
CONFIG_SYS_FLASH_CFI=y
|
||||||
CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
|
CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
|
||||||
CONFIG_PHY_FIXED=y
|
CONFIG_PHY_FIXED=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_BCM6348_ETH=y
|
CONFIG_BCM6348_ETH=y
|
||||||
CONFIG_PHY=y
|
CONFIG_PHY=y
|
||||||
|
|
|
@ -45,6 +45,7 @@ CONFIG_MTD=y
|
||||||
CONFIG_DM_SPI_FLASH=y
|
CONFIG_DM_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_SPANSION=y
|
CONFIG_SPI_FLASH_SPANSION=y
|
||||||
CONFIG_SPI_FLASH_MTD=y
|
CONFIG_SPI_FLASH_MTD=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_DM_RESET=y
|
CONFIG_DM_RESET=y
|
||||||
CONFIG_RESET_BCM6345=y
|
CONFIG_RESET_BCM6345=y
|
||||||
CONFIG_DM_SERIAL=y
|
CONFIG_DM_SERIAL=y
|
||||||
|
|
|
@ -47,6 +47,7 @@ CONFIG_LED=y
|
||||||
CONFIG_LED_BCM6328=y
|
CONFIG_LED_BCM6328=y
|
||||||
CONFIG_LED_BLINK=y
|
CONFIG_LED_BLINK=y
|
||||||
CONFIG_LED_GPIO=y
|
CONFIG_LED_GPIO=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_PHY_GIGE=y
|
CONFIG_PHY_GIGE=y
|
||||||
CONFIG_BCM6368_ETH=y
|
CONFIG_BCM6368_ETH=y
|
||||||
|
|
|
@ -49,6 +49,7 @@ CONFIG_DM_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_WINBOND=y
|
CONFIG_SPI_FLASH_WINBOND=y
|
||||||
CONFIG_SPI_FLASH_MTD=y
|
CONFIG_SPI_FLASH_MTD=y
|
||||||
CONFIG_PHY_FIXED=y
|
CONFIG_PHY_FIXED=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_BCM6348_ETH=y
|
CONFIG_BCM6348_ETH=y
|
||||||
CONFIG_DM_RESET=y
|
CONFIG_DM_RESET=y
|
||||||
|
|
|
@ -53,6 +53,7 @@ CONFIG_SYS_FLASH_PROTECTION=y
|
||||||
CONFIG_SYS_FLASH_CFI=y
|
CONFIG_SYS_FLASH_CFI=y
|
||||||
CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
|
CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y
|
||||||
CONFIG_PHY_FIXED=y
|
CONFIG_PHY_FIXED=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=20
|
||||||
CONFIG_DM_ETH=y
|
CONFIG_DM_ETH=y
|
||||||
CONFIG_BCM6348_ETH=y
|
CONFIG_BCM6348_ETH=y
|
||||||
CONFIG_PHY=y
|
CONFIG_PHY=y
|
||||||
|
|
|
@ -35,6 +35,7 @@ CONFIG_SPI_FLASH_STMICRO=y
|
||||||
CONFIG_SPI_FLASH_WINBOND=y
|
CONFIG_SPI_FLASH_WINBOND=y
|
||||||
CONFIG_PHY_MICREL=y
|
CONFIG_PHY_MICREL=y
|
||||||
CONFIG_PHY_MICREL_KSZ8XXX=y
|
CONFIG_PHY_MICREL_KSZ8XXX=y
|
||||||
|
CONFIG_PHY_RESET_DELAY=10000
|
||||||
CONFIG_ETH_DESIGNWARE=y
|
CONFIG_ETH_DESIGNWARE=y
|
||||||
CONFIG_MII=y
|
CONFIG_MII=y
|
||||||
CONFIG_CADENCE_QSPI=y
|
CONFIG_CADENCE_QSPI=y
|
||||||
|
|
|
@ -330,3 +330,11 @@ config PHY_NCSI
|
||||||
depends on DM_ETH
|
depends on DM_ETH
|
||||||
|
|
||||||
endif #PHYLIB
|
endif #PHYLIB
|
||||||
|
|
||||||
|
config PHY_RESET_DELAY
|
||||||
|
int "Extra delay after reset before MII register access"
|
||||||
|
default 0
|
||||||
|
help
|
||||||
|
Some PHYs need extra delay after reset before any MII register access
|
||||||
|
is possible. For such PHY, set this option to the usec delay
|
||||||
|
required.
|
||||||
|
|
|
@ -872,7 +872,7 @@ int phy_reset(struct phy_device *phydev)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PHY_RESET_DELAY
|
#if CONFIG_PHY_RESET_DELAY > 0
|
||||||
udelay(CONFIG_PHY_RESET_DELAY); /* Intel LXT971A needs this */
|
udelay(CONFIG_PHY_RESET_DELAY); /* Intel LXT971A needs this */
|
||||||
#endif
|
#endif
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -8,9 +8,6 @@
|
||||||
|
|
||||||
#include <linux/sizes.h>
|
#include <linux/sizes.h>
|
||||||
|
|
||||||
/* ETH */
|
|
||||||
#define CONFIG_PHY_RESET_DELAY 20
|
|
||||||
|
|
||||||
/* UART */
|
/* UART */
|
||||||
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \
|
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \
|
||||||
230400, 500000, 1500000 }
|
230400, 500000, 1500000 }
|
||||||
|
|
|
@ -29,9 +29,6 @@
|
||||||
|
|
||||||
#define CONFIG_DW_ALTDESCRIPTOR
|
#define CONFIG_DW_ALTDESCRIPTOR
|
||||||
|
|
||||||
/* Command support defines */
|
|
||||||
#define CONFIG_PHY_RESET_DELAY 10000 /* in usec */
|
|
||||||
|
|
||||||
/* Misc configuration */
|
/* Misc configuration */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue