Give UM more time to boot.
Signed-off-by: Lucien Mueller <lucien.mueller@netmodule.com>
This commit is contained in:
parent
2c5343e02b
commit
8ec934e776
|
|
@ -500,9 +500,9 @@ void sdram_init(void)
|
|||
|
||||
#if !defined(CONFIG_SPL_BUILD)
|
||||
|
||||
/*
|
||||
* Override for Ethernet link timeout definition,
|
||||
* with option to specify via environment variable linktimeout
|
||||
/*
|
||||
* Override for Ethernet link timeout definition,
|
||||
* with option to specify via environment variable linktimeout
|
||||
*/
|
||||
int eth_phy_timeout(void)
|
||||
{
|
||||
|
|
@ -511,7 +511,7 @@ int eth_phy_timeout(void)
|
|||
|
||||
timeout = PHY_ANEG_DEFAULT_TIMEOUT;
|
||||
|
||||
/*
|
||||
/*
|
||||
* Check if timeout has been defined by environment.
|
||||
* Valid range: 1000..10000 milliseconds
|
||||
*/
|
||||
|
|
@ -553,7 +553,7 @@ static void init_ethernet_v2(void)
|
|||
gpio_set_value(GPIO_RST_ETH_SW_N, 1);
|
||||
|
||||
/* Give clocks time to stabilize */
|
||||
mdelay(1);
|
||||
mdelay(1);
|
||||
}
|
||||
|
||||
static void init_ethernet_phys_v2(void)
|
||||
|
|
@ -666,7 +666,7 @@ static void init_user_module(void)
|
|||
|
||||
da9063_release_i2c_bus(bus);
|
||||
|
||||
mdelay(50); /* Give module some time to boot */
|
||||
mdelay(200); /* Give module some time to boot */
|
||||
um_init(CONFIG_UM_I2C_BUS); /* Try to detect user module */
|
||||
|
||||
if (um_present()) {
|
||||
|
|
@ -703,33 +703,33 @@ static void init_gsm(void)
|
|||
|
||||
/*
|
||||
* Perform power up sequence for TOBY-L2 modem.
|
||||
*
|
||||
*
|
||||
* TOBY-L2 series can be switched on in one of the following ways:
|
||||
* - Rising edge on the VCC pin to a valid voltage for module supply,
|
||||
* - Rising edge on the VCC pin to a valid voltage for module supply,
|
||||
* i.e. applying module supply
|
||||
* - Low level on the PWR_ON pin, which is normally set high by an
|
||||
* internal pull-up, for a valid time period when the applied VCC
|
||||
* voltage is within the valid operating range (see section 4.2.8).
|
||||
* - Low level on the RESET_N pin, which is normally set high by an
|
||||
* - Low level on the PWR_ON pin, which is normally set high by an
|
||||
* internal pull-up, for a valid time period when the applied VCC
|
||||
* voltage is within the valid operating range (see section 4.2.9).
|
||||
*
|
||||
* voltage is within the valid operating range (see section 4.2.8).
|
||||
* - Low level on the RESET_N pin, which is normally set high by an
|
||||
* internal pull-up, for a valid time period when the applied VCC
|
||||
* voltage is within the valid operating range (see section 4.2.9).
|
||||
*
|
||||
* PWR_ON low time: 5 ms - Low time to switch-on the module
|
||||
* RESET_N low time: 18..800 ms - Low time to switch-on the module
|
||||
* 2.1..15 s - Low time to reset the module
|
||||
* 16 s - Low time to switch-off the module
|
||||
*
|
||||
*
|
||||
* References:
|
||||
* - uBlox TOBY-L2 Datasheet UBX-13004573 - R24
|
||||
* 2.3.1 Module power-on
|
||||
* 4.2.8 PWR_ON pin
|
||||
* 4.2.9 RESET_N pin
|
||||
*
|
||||
*
|
||||
* Functionality:
|
||||
* - Leave GSM power enable as is (default at power up = off)
|
||||
* - Set reset line inactive (note: inverter logic in HW present)
|
||||
* - Leave button unpressed (note: inverter logic in HW present)
|
||||
* - Modem shall be enabled by Linux system by enabling GSM power
|
||||
* - Modem shall be enabled by Linux system by enabling GSM power
|
||||
* supply
|
||||
*/
|
||||
|
||||
|
|
@ -998,7 +998,7 @@ int board_late_init(void)
|
|||
|
||||
init_ethernet();
|
||||
configure_ethernet_switch();
|
||||
|
||||
|
||||
/* Reset ETH system again to pin strap PHYs */
|
||||
mdelay(10);
|
||||
gpio_set_value(GPIO_RST_ETH_N, 0);
|
||||
|
|
@ -1012,7 +1012,7 @@ int board_late_init(void)
|
|||
init_ethernet_v2();
|
||||
configure_ethernet_switch();
|
||||
|
||||
/*
|
||||
/*
|
||||
* Now that Ethernet switch is running, PHY clocks are present.
|
||||
* Take PHYs out of reset.
|
||||
*/
|
||||
|
|
@ -1158,7 +1158,7 @@ int board_eth_init(bd_t *bis)
|
|||
set_mac_address(0, mac_addr0);
|
||||
|
||||
writel(RMII_MODE_ENABLE | RMII_CHIPCKL_ENABLE, &cdev->miisel);
|
||||
|
||||
|
||||
{
|
||||
int rv = cpsw_register(&cpsw_data);
|
||||
if (rv < 0)
|
||||
|
|
@ -1236,7 +1236,7 @@ static void ft_user_module(void *blob)
|
|||
{
|
||||
if (um_present()) {
|
||||
int node_offset;
|
||||
|
||||
|
||||
node_offset = fdt_path_offset(blob, "/user_module/");
|
||||
if (node_offset != -1) {
|
||||
const char* model = um_type_as_str();
|
||||
|
|
@ -1327,11 +1327,11 @@ static void ft_eth(void *blob)
|
|||
{
|
||||
/*
|
||||
* PHY ID Assignment
|
||||
*
|
||||
*
|
||||
* broadr0 broadr1
|
||||
* HW V1.0: 6 7
|
||||
* HW V2.0: 3 2
|
||||
*
|
||||
*
|
||||
* DTB defines V2.0 settings. When running on v1.0 hardware, we change the PHY Ids as required.
|
||||
*/
|
||||
if (hw_ver == 1) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue