Skip to contentSkip to conversation

drivers: usb: Make usb device-tree fixup code architecture independent

PATCH New Nikhil Badola 2 participants 5 messages Oct 20, 2014 – Dec 11, 2014

Subsystems (3)
USB PowerPC USB ehci driver
lore
Share & tools
lore

Nikhil Badola

author
#0 lore raw

PATCH v2 2/3 drivers: usb: Make usb device-tree fixup code architecture independent

move usb device tree fixup code from "arch/powerpc/" to "drivers/usb/" so that it works independent of architecture it is running on

Signed-off-by Ramneek Mehresh <[email protected]>
Signed-off-by Nikhil Badola <[email protected]>

---
Changes for v2 :
- Fixed compilation error for Platforms with CONFIG_USB_MAX_CONTROLLER_COUNT not defined
- Depends on https://patchwork.ozlabs.org/patch/401063/

 arch/powerpc/cpu/mpc8xxx/fdt.c | 104 -------------------------------------
 drivers/usb/host/ehci-fsl.c    | 113 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 104 deletions(-)
arch/powerpc/cpu/mpc8xxx/fdt.c +0 -104
index 4cec5e1..65fde3f 100644
@@ -73,110 +73,6 @@ void ft_fixup_num_cores(void *blob) {
 }
 #endif /* defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) */
 
-#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
-static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
-				const char *phy_type, int start_offset)
-{
-	const char *compat_dr = "fsl-usb2-dr";
-	const char *compat_mph = "fsl-usb2-mph";
-	const char *prop_mode = "dr_mode";
-	const char *prop_type = "phy_type";
-	const char *node_type = NULL;
-	int node_offset;
-	int err;
-
-	node_offset = fdt_node_offset_by_compatible(blob,
-			start_offset, compat_mph);
-	if (node_offset < 0) {
-		node_offset = fdt_node_offset_by_compatible(blob,
-			start_offset, compat_dr);
-		if (node_offset < 0) {
-			printf("WARNING: could not find compatible"
-				" node %s or %s: %s.\n", compat_mph,
-				compat_dr, fdt_strerror(node_offset));
-			return -1;
-		} else
-			node_type = compat_dr;
-	} else
-		node_type = compat_mph;
-
-	if (mode) {
-		err = fdt_setprop(blob, node_offset, prop_mode, mode,
-				  strlen(mode) + 1);
-		if (err < 0)
-			printf("WARNING: could not set %s for %s: %s.\n",
-			       prop_mode, node_type, fdt_strerror(err));
-	}
-
-	if (phy_type) {
-		err = fdt_setprop(blob, node_offset, prop_type, phy_type,
-				  strlen(phy_type) + 1);
-		if (err < 0)
-			printf("WARNING: could not set %s for %s: %s.\n",
-			       prop_type, node_type, fdt_strerror(err));
-	}
-
-	return node_offset;
-}
-
-void fdt_fixup_dr_usb(void *blob, bd_t *bd)
-{
-	const char *modes[] = { "host", "peripheral", "otg" };
-	const char *phys[] = { "ulpi", "utmi" };
-	int usb_mode_off = -1;
-	int usb_phy_off = -1;
-	char str[5];
-	int i, j;
-
-	for (i = 1; i <= CONFIG_USB_MAX_CONTROLLER_COUNT; i++) {
-		const char *dr_mode_type = NULL;
-		const char *dr_phy_type = NULL;
-		int mode_idx = -1, phy_idx = -1;
-		snprintf(str, 5, "%s%d", "usb", i);
-		if (hwconfig(str)) {
-			for (j = 0; j < ARRAY_SIZE(modes); j++) {
-				if (hwconfig_subarg_cmp(str, "dr_mode",
-						modes[j])) {
-					mode_idx = j;
-					break;
-				}
-			}
-
-			for (j = 0; j < ARRAY_SIZE(phys); j++) {
-				if (hwconfig_subarg_cmp(str, "phy_type",
-						phys[j])) {
-					phy_idx = j;
-					break;
-				}
-			}
-
-			if (mode_idx < 0 && phy_idx < 0) {
-				printf("WARNING: invalid phy or mode\n");
-				return;
-			}
-
-			if (mode_idx > -1)
-				dr_mode_type = modes[mode_idx];
-
-			if (phy_idx > -1)
-				dr_phy_type = phys[phy_idx];
-		}
-
-		usb_mode_off = fdt_fixup_usb_mode_phy_type(blob,
-			dr_mode_type, NULL, usb_mode_off);
-
-		if (usb_mode_off < 0)
-			return;
-
-		usb_phy_off = fdt_fixup_usb_mode_phy_type(blob,
-			NULL, dr_phy_type, usb_phy_off);
-
-		if (usb_phy_off < 0)
-			return;
-	}
-}
-#endif /* defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) */
-
 /*
  * update crypto node properties to a specified revision of the SEC
  * called with sec_rev == 0 if not on an E processor
drivers/usb/host/ehci-fsl.c +113 -0

125 lines not on this page · raw message

Signature · 1 line
1.7.11.7
#1 lore raw

PATCH v2 2/3 drivers: usb: Make usb device-tree fixup code architecture independent

Quoted 11 lines · Nikhil Badola

move usb device tree fixup code from "arch/powerpc/" to "drivers/usb/" so that it works independent of architecture it is running on

Signed-off-by Ramneek Mehresh <[email protected]>
Signed-off-by Nikhil Badola <[email protected]>

---
Changes for v2 :
- Fixed compilation error for Platforms with CONFIG_USB_MAX_CONTROLLER_COUNT not defined
- Depends on https://patchwork.ozlabs.org/patch/401063/

Quoted 4 lines
 arch/powerpc/cpu/mpc8xxx/fdt.c | 104 -------------------------------------
 drivers/usb/host/ehci-fsl.c    | 113 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 104 deletions(-)

We have compiling error for boards MPC837XEMDS_HOST MPC837XERDB. ehci-fsl.c is not compiled for these boards. Can you check if CONFIG_USB_EHCI_FSL can be defined for them.

Adding Kim.

York

#2 lore raw

PATCH v2 2/3 drivers: usb: Make usb device-tree fixup code architecture independent

Quoted 17 lines · York Sun
Quoted 11 lines · Nikhil Badola

move usb device tree fixup code from "arch/powerpc/" to "drivers/usb/" so that it works independent of architecture it is running on

Signed-off-by Ramneek Mehresh <[email protected]>
Signed-off-by Nikhil Badola <[email protected]>

---
Changes for v2 :
- Fixed compilation error for Platforms with CONFIG_USB_MAX_CONTROLLER_COUNT not defined
- Depends on https://patchwork.ozlabs.org/patch/401063/

Quoted 4 lines
 arch/powerpc/cpu/mpc8xxx/fdt.c | 104 -------------------------------------
 drivers/usb/host/ehci-fsl.c    | 113 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 104 deletions(-)
Quoted 6 lines

We have compiling error for boards MPC837XEMDS_HOST MPC837XERDB. ehci-fsl.c is not compiled for these boards. Can you check if CONFIG_USB_EHCI_FSL can be defined for them.

Adding Kim.

Nikhil,

Please address this ASAP. It blocks other patches.

York

author
#3 lore raw

PATCH v2 2/3 drivers: usb: Make usb device-tree fixup code architecture independent

Quoted 31 lines

-----Original Message-----
From: York Sun [mailto:yorksun at freescale.com]
Sent: Wednesday, November 26, 2014 3:05 AM
To: Badola Nikhil-B46172
Cc: u-boot at lists.denx.de; Phillips Kim-R1AAHA; Mehresh Ramneek-B31383
Subject: Re: [U-Boot] [PATCH 2/3][v2] drivers: usb: Make usb device-tree fixup code architecture independent

Quoted 12 lines · York Sun
Quoted 11 lines · Nikhil Badola

move usb device tree fixup code from "arch/powerpc/" to "drivers/usb/" so that it works independent of architecture it is running on

Signed-off-by Ramneek Mehresh <[email protected]>
Signed-off-by Nikhil Badola <[email protected]>

---
Changes for v2 :
- Fixed compilation error for Platforms with CONFIG_USB_MAX_CONTROLLER_COUNT not defined
- Depends on https://patchwork.ozlabs.org/patch/401063/

Quoted 2 lines
Quoted 2 lines
 arch/powerpc/cpu/mpc8xxx/fdt.c | 104 -------------------------------------
 drivers/usb/host/ehci-fsl.c    | 113

+++++++++++++++++++++++++++++++++++++++++

Quoted 7 lines
Quoted 2 lines
 2 files changed, 113 insertions(+), 104 deletions(-)

We have compiling error for boards MPC837XEMDS_HOST MPC837XERDB. ehci-fsl.c is not compiled for these boards. Can you check if CONFIG_USB_EHCI_FSL can be defined for them.

Quoted 6 lines
Quoted 2 lines

Adding Kim.

Nikhil,

Please address this ASAP. It blocks other patches.

This compilation error has been addressed by patch https://patchwork.ozlabs.org/patch/401063/
which is awaiting upstream.

#4 lore raw

PATCH v2 2/3 drivers: usb: Make usb device-tree fixup code architecture independent

In reply to Nikhil Badola
Quoted 10 lines · Nikhil Badola

move usb device tree fixup code from "arch/powerpc/" to "drivers/usb/" so that it works independent of architecture it is running on

Signed-off-by Ramneek Mehresh <[email protected]>
Signed-off-by Nikhil Badola <[email protected]>

---
Changes for v2 :
- Fixed compilation error for Platforms with CONFIG_USB_MAX_CONTROLLER_COUNT not defined
- Depends on https://patchwork.ozlabs.org/patch/401063/

Applied to u-boot-fsl-qoriq master, awaiting upstream.

York