mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-07 10:43:47 +09:00
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
* 'master' of git://git.denx.de/u-boot-mpc85xx: powerpc/8xxx:Add MPH controller support in USB device-tree fixup powerpc/8xxx: Cleanup USB device-tree fixup
This commit is contained in:
commit
7dda0c3759
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2009-2011 Freescale Semiconductor, Inc.
|
* Copyright 2009-2012 Freescale Semiconductor, Inc.
|
||||||
*
|
*
|
||||||
* This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and
|
* This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and
|
||||||
* arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains
|
* arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains
|
||||||
@ -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);
|
||||||
|
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;
|
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;
|
||||||
@ -137,28 +146,34 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd)
|
|||||||
|
|
||||||
for (i = 1; i <= FSL_MAX_NUM_USB_CTRLS; i++) {
|
for (i = 1; i <= FSL_MAX_NUM_USB_CTRLS; i++) {
|
||||||
int mode_idx = -1, phy_idx = -1;
|
int mode_idx = -1, phy_idx = -1;
|
||||||
sprintf(str, "%s%d", "usb", i);
|
snprintf(str, 5, "%s%d", "usb", i);
|
||||||
if (hwconfig(str)) {
|
if (hwconfig(str)) {
|
||||||
for (j = 0; j < sizeof(modes); j++) {
|
for (j = 0; j < ARRAY_SIZE(modes); j++) {
|
||||||
if (hwconfig_subarg_cmp(str, "dr_mode",
|
if (hwconfig_subarg_cmp(str, "dr_mode",
|
||||||
modes[j])) {
|
modes[j])) {
|
||||||
mode_idx = j;
|
mode_idx = j;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (j = 0; j < sizeof(phys); j++) {
|
for (j = 0; j < ARRAY_SIZE(phys); j++) {
|
||||||
if (hwconfig_subarg_cmp(str, "phy_type",
|
if (hwconfig_subarg_cmp(str, "phy_type",
|
||||||
phys[j])) {
|
phys[j])) {
|
||||||
phy_idx = j;
|
phy_idx = j;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (mode_idx >= 0)
|
if (mode_idx >= 0) {
|
||||||
usb_mode_off = fdt_fixup_usb_mode_phy_type(blob,
|
usb_mode_off = fdt_fixup_usb_mode_phy_type(blob,
|
||||||
modes[mode_idx], NULL, usb_mode_off);
|
modes[mode_idx], NULL, usb_mode_off);
|
||||||
if (phy_idx >= 0)
|
if (usb_mode_off < 0)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (phy_idx >= 0) {
|
||||||
usb_phy_off = fdt_fixup_usb_mode_phy_type(blob,
|
usb_phy_off = fdt_fixup_usb_mode_phy_type(blob,
|
||||||
NULL, phys[phy_idx], usb_phy_off);
|
NULL, phys[phy_idx], usb_phy_off);
|
||||||
|
if (usb_phy_off < 0)
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!strcmp(str, "usb1"))
|
if (!strcmp(str, "usb1"))
|
||||||
usb1_defined = 1;
|
usb1_defined = 1;
|
||||||
if (mode_idx < 0 && phy_idx < 0)
|
if (mode_idx < 0 && phy_idx < 0)
|
||||||
@ -174,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
|
||||||
|
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user