powerpc/8xxx:Add MPH controller support in USB device-tree fixup

Add support for fixing usb mode and phy type for
MPH(Multi Port Host) USB controllers in device-tree nodes.
Required for socs like P3060, P5020, etc having MPH USB controller

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
This commit is contained in:
ramneek mehresh 2012-02-10 00:36:43 +00:00 committed by Andy Fleming
parent 5a52977f28
commit 79f49120ba
2 changed files with 21 additions and 12 deletions

View file

@ -86,30 +86,39 @@ void ft_fixup_num_cores(void *blob) {
} }
#endif /* defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) */ #endif /* defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) */
#ifdef CONFIG_HAS_FSL_DR_USB #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, static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
const char *phy_type, int start_offset) const char *phy_type, int start_offset)
{ {
const char *compat = "fsl-usb2-dr"; const char *compat_dr = "fsl-usb2-dr";
const char *compat_mph = "fsl-usb2-mph";
const char *prop_mode = "dr_mode"; const char *prop_mode = "dr_mode";
const char *prop_type = "phy_type"; const char *prop_type = "phy_type";
const char *node_type = NULL;
int node_offset; int node_offset;
int err; int err;
node_offset = fdt_node_offset_by_compatible(blob, node_offset = fdt_node_offset_by_compatible(blob,
start_offset, compat); start_offset, compat_mph);
if (node_offset < 0) { if (node_offset < 0) {
printf("WARNING: could not find compatible node %s: %s.\n", node_offset = fdt_node_offset_by_compatible(blob,
compat, fdt_strerror(node_offset)); start_offset, compat_dr);
return -1; 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) { if (mode) {
err = fdt_setprop(blob, node_offset, prop_mode, mode, err = fdt_setprop(blob, node_offset, prop_mode, mode,
strlen(mode) + 1); strlen(mode) + 1);
if (err < 0) if (err < 0)
printf("WARNING: could not set %s for %s: %s.\n", printf("WARNING: could not set %s for %s: %s.\n",
prop_mode, compat, fdt_strerror(err)); prop_mode, node_type, fdt_strerror(err));
} }
if (phy_type) { if (phy_type) {
@ -117,7 +126,7 @@ static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
strlen(phy_type) + 1); strlen(phy_type) + 1);
if (err < 0) if (err < 0)
printf("WARNING: could not set %s for %s: %s.\n", printf("WARNING: could not set %s for %s: %s.\n",
prop_type, compat, fdt_strerror(err)); prop_type, node_type, fdt_strerror(err));
} }
return node_offset; return node_offset;
@ -180,7 +189,7 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd)
fdt_fixup_usb_mode_phy_type(blob, mode, phy_type, usb_off); fdt_fixup_usb_mode_phy_type(blob, mode, phy_type, usb_off);
} }
} }
#endif /* CONFIG_HAS_FSL_DR_USB */ #endif /* defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) */
/* /*
* update crypto node properties to a specified revision of the SEC * update crypto node properties to a specified revision of the SEC

View file

@ -61,11 +61,11 @@ int fdt_find_and_setprop(void *fdt, const char *node, const char *prop,
const void *val, int len, int create); const void *val, int len, int create);
void fdt_fixup_qe_firmware(void *fdt); void fdt_fixup_qe_firmware(void *fdt);
#ifdef CONFIG_HAS_FSL_DR_USB #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
void fdt_fixup_dr_usb(void *blob, bd_t *bd); void fdt_fixup_dr_usb(void *blob, bd_t *bd);
#else #else
static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {} static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {}
#endif /* CONFIG_HAS_FSL_DR_USB */ #endif /* defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) */
#if defined(CONFIG_SYS_FSL_SEC_COMPAT) #if defined(CONFIG_SYS_FSL_SEC_COMPAT)
void fdt_fixup_crypto_node(void *blob, int sec_rev); void fdt_fixup_crypto_node(void *blob, int sec_rev);