Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

phy: marvell: cp110: initialize only enabled UTMI units

Browse source 
UTMI should be initialized only for enabled device tree nodes.

This fix overrides current internal configuration array
entry with the next DT entry data if error is detected
during the current DT entry parsing or the current port
is disabled.

This way the internal configuration structure will only
contain valid ports information obtained from the DT.

Change-Id: I9c43c6a5d234e15ae9005d1c9bc983fc1f3544b8
Signed-off-by: Omri Itach <omrii@marvell.com>
Signed-off-by: Ken Ma <make@marvell.com>
This commit is contained in:
Omri Itach 2017-04-06 12:54:16 +03:00 committed by Stefan Roese
parent 89351ba4c8
commit 22bc868e49
1 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
drivers/phy/marvell/comphy_cp110.c
View file

@ -715,7 +715,7 @@ static int comphy_utmi_power_up(u32 utmi_index, void __iomem *utmi_base_addr,
* the init split in 3 parts: * the init split in 3 parts:
* 1. Power down transceiver and PLL * 1. Power down transceiver and PLL
* 2. UTMI PHY configure * 2. UTMI PHY configure
* 3. Powe up transceiver and PLL * 3. Power up transceiver and PLL
* Note: - Power down/up should be once for both UTMI PHYs * Note: - Power down/up should be once for both UTMI PHYs
* - comphy_dedicated_phys_init call this function if at least there is * - comphy_dedicated_phys_init call this function if at least there is
* one UTMI PHY exists in FDT blob. access to cp110_utmi_data[0] is * one UTMI PHY exists in FDT blob. access to cp110_utmi_data[0] is
@ -782,45 +782,47 @@ static void comphy_utmi_phy_init(u32 utmi_phy_count,
void comphy_dedicated_phys_init(void) void comphy_dedicated_phys_init(void)
{ {
struct utmi_phy_data cp110_utmi_data[MAX_UTMI_PHY_COUNT]; struct utmi_phy_data cp110_utmi_data[MAX_UTMI_PHY_COUNT];
int node; int node = -1;
int i; int node_idx;
debug_enter(); debug_enter();
debug("Initialize USB UTMI PHYs\n"); debug("Initialize USB UTMI PHYs\n");
/* Find the UTMI phy node in device tree and go over them */ for (node_idx = 0; node_idx < MAX_UTMI_PHY_COUNT;) {
node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, /* Find the UTMI phy node in device tree */
node = fdt_node_offset_by_compatible(gd->fdt_blob, node,
"marvell,mvebu-utmi-2.6.0"); "marvell,mvebu-utmi-2.6.0");
if (node <= 0)
break;
/* check if node is enabled */
if (!fdtdec_get_is_enabled(gd->fdt_blob, node))
continue;
i = 0;
while (node > 0) {
/* get base address of UTMI phy */ /* get base address of UTMI phy */
cp110_utmi_data[i].utmi_base_addr = cp110_utmi_data[node_idx].utmi_base_addr =
(void __iomem *)fdtdec_get_addr_size_auto_noparent( (void __iomem *)fdtdec_get_addr_size_auto_noparent(
gd->fdt_blob, node, "reg", 0, NULL, true); gd->fdt_blob, node, "reg", 0, NULL, true);
if (cp110_utmi_data[i].utmi_base_addr == NULL) { if (!cp110_utmi_data[node_idx].utmi_base_addr) {
pr_err("UTMI PHY base address is invalid\n"); pr_err("UTMI PHY base address is invalid\n");
i++;
continue; continue;
} }
/* get usb config address */ /* get usb config address */
cp110_utmi_data[i].usb_cfg_addr = cp110_utmi_data[node_idx].usb_cfg_addr =
(void __iomem *)fdtdec_get_addr_size_auto_noparent( (void __iomem *)fdtdec_get_addr_size_auto_noparent(
gd->fdt_blob, node, "reg", 1, NULL, true); gd->fdt_blob, node, "reg", 1, NULL, true);
if (cp110_utmi_data[i].usb_cfg_addr == NULL) { if (!cp110_utmi_data[node_idx].usb_cfg_addr) {
pr_err("UTMI PHY base address is invalid\n"); pr_err("UTMI PHY base address is invalid\n");
i++;
continue; continue;
} }
/* get UTMI config address */ /* get UTMI config address */
cp110_utmi_data[i].utmi_cfg_addr = cp110_utmi_data[node_idx].utmi_cfg_addr =
(void __iomem *)fdtdec_get_addr_size_auto_noparent( (void __iomem *)fdtdec_get_addr_size_auto_noparent(
gd->fdt_blob, node, "reg", 2, NULL, true); gd->fdt_blob, node, "reg", 2, NULL, true);
if (cp110_utmi_data[i].utmi_cfg_addr == NULL) { if (!cp110_utmi_data[node_idx].utmi_cfg_addr) {
pr_err("UTMI PHY base address is invalid\n"); pr_err("UTMI PHY base address is invalid\n");
i++;
continue; continue;
} }
@ -828,21 +830,20 @@ void comphy_dedicated_phys_init(void)
* get the port number (to check if the utmi connected to * get the port number (to check if the utmi connected to
* host/device) * host/device)
*/ */
cp110_utmi_data[i].utmi_phy_port = fdtdec_get_int( cp110_utmi_data[node_idx].utmi_phy_port = fdtdec_get_int(
gd->fdt_blob, node, "utmi-port", UTMI_PHY_INVALID); gd->fdt_blob, node, "utmi-port", UTMI_PHY_INVALID);
if (cp110_utmi_data[i].utmi_phy_port == UTMI_PHY_INVALID) { if (cp110_utmi_data[node_idx].utmi_phy_port ==
UTMI_PHY_INVALID) {
pr_err("UTMI PHY port type is invalid\n"); pr_err("UTMI PHY port type is invalid\n");
i++;
continue; continue;
} }
node = fdt_node_offset_by_compatible( /* count valid UTMI unit */
gd->fdt_blob, node, "marvell,mvebu-utmi-2.6.0"); node_idx++;
i++;
} }
if (i > 0) if (node_idx > 0)
comphy_utmi_phy_init(i, cp110_utmi_data); comphy_utmi_phy_init(node_idx, cp110_utmi_data);
debug_exit(); debug_exit();
} }