mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
drivers:usb:common:fsl-dt-fixup: Move device-tree fixup framework to common file
Move usb device-tree fixup framework from ehci-fsl.c to common place so that it can be used by other drivers as well (xhci-fsl.c). Signed-off-by: Ramneek Mehresh <ramneek.mehresh@nxp.com> Signed-off-by: Sriram Dash <sriram.dash@nxp.com> Acked-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Sriram Dash
Marek Vasut
parent
9a80e71435
commit
93eb8f39d2
4 changed files with 220 additions and 195 deletions
1
Makefile
1
Makefile
|
|
@ -648,6 +648,7 @@ libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/
|
|||
libs-$(CONFIG_ALTERA_SDRAM) += drivers/ddr/altera/
|
||||
libs-y += drivers/serial/
|
||||
libs-y += drivers/usb/dwc3/
|
||||
libs-y += drivers/usb/common/
|
||||
libs-y += drivers/usb/emul/
|
||||
libs-y += drivers/usb/eth/
|
||||
libs-y += drivers/usb/gadget/
|
||||
|
|
|
|||
6
drivers/usb/common/Makefile
Normal file
6
drivers/usb/common/Makefile
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
# (C) Copyright 2016 Freescale Semiconductor, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
obj-$(CONFIG_USB_EHCI_FSL) += fsl-dt-fixup.o
|
||||
213
drivers/usb/common/fsl-dt-fixup.c
Normal file
213
drivers/usb/common/fsl-dt-fixup.c
Normal file
|
|
@ -0,0 +1,213 @@
|
|||
/*
|
||||
* (C) Copyright 2009, 2011 Freescale Semiconductor, Inc.
|
||||
*
|
||||
* (C) Copyright 2008, Excito Elektronik i Sk=E5ne AB
|
||||
*
|
||||
* Author: Tor Krill tor@excito.com
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <usb.h>
|
||||
#include <asm/io.h>
|
||||
#include <hwconfig.h>
|
||||
#include <fsl_usb.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
||||
#endif
|
||||
|
||||
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",
|
||||
fdt_strerror(node_offset));
|
||||
return -1;
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
static const char *fdt_usb_get_node_type(void *blob, int start_offset,
|
||||
int *node_offset)
|
||||
{
|
||||
const char *compat_dr = "fsl-usb2-dr";
|
||||
const char *compat_mph = "fsl-usb2-mph";
|
||||
const char *node_type = NULL;
|
||||
|
||||
*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("ERROR: could not find compatible node: %s\n",
|
||||
fdt_strerror(*node_offset));
|
||||
} else {
|
||||
node_type = compat_dr;
|
||||
}
|
||||
} else {
|
||||
node_type = compat_mph;
|
||||
}
|
||||
|
||||
return node_type;
|
||||
}
|
||||
|
||||
static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
|
||||
int start_offset)
|
||||
{
|
||||
int node_offset, err;
|
||||
const char *node_type = NULL;
|
||||
|
||||
node_type = fdt_usb_get_node_type(blob, start_offset, &node_offset);
|
||||
if (!node_type)
|
||||
return -1;
|
||||
|
||||
err = fdt_setprop(blob, node_offset, prop_erratum, NULL, 0);
|
||||
if (err < 0) {
|
||||
printf("ERROR: could not set %s for %s: %s.\n",
|
||||
prop_erratum, node_type, fdt_strerror(err));
|
||||
}
|
||||
|
||||
return node_offset;
|
||||
}
|
||||
|
||||
void fdt_fixup_dr_usb(void *blob, bd_t *bd)
|
||||
{
|
||||
static const char * const modes[] = { "host", "peripheral", "otg" };
|
||||
static const char * const phys[] = { "ulpi", "utmi", "utmi_dual" };
|
||||
int usb_erratum_a006261_off = -1;
|
||||
int usb_erratum_a007075_off = -1;
|
||||
int usb_erratum_a007792_off = -1;
|
||||
int usb_erratum_a005697_off = -1;
|
||||
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];
|
||||
}
|
||||
|
||||
if (has_dual_phy())
|
||||
dr_phy_type = phys[2];
|
||||
|
||||
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;
|
||||
|
||||
if (has_erratum_a006261()) {
|
||||
usb_erratum_a006261_off = fdt_fixup_usb_erratum
|
||||
(blob,
|
||||
"fsl,usb-erratum-a006261",
|
||||
usb_erratum_a006261_off);
|
||||
if (usb_erratum_a006261_off < 0)
|
||||
return;
|
||||
}
|
||||
|
||||
if (has_erratum_a007075()) {
|
||||
usb_erratum_a007075_off = fdt_fixup_usb_erratum
|
||||
(blob,
|
||||
"fsl,usb-erratum-a007075",
|
||||
usb_erratum_a007075_off);
|
||||
if (usb_erratum_a007075_off < 0)
|
||||
return;
|
||||
}
|
||||
|
||||
if (has_erratum_a007792()) {
|
||||
usb_erratum_a007792_off = fdt_fixup_usb_erratum
|
||||
(blob,
|
||||
"fsl,usb-erratum-a007792",
|
||||
usb_erratum_a007792_off);
|
||||
if (usb_erratum_a007792_off < 0)
|
||||
return;
|
||||
}
|
||||
if (has_erratum_a005697()) {
|
||||
usb_erratum_a005697_off = fdt_fixup_usb_erratum
|
||||
(blob,
|
||||
"fsl,usb-erratum-a005697",
|
||||
usb_erratum_a005697_off);
|
||||
if (usb_erratum_a005697_off < 0)
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -173,198 +173,3 @@ static void set_txfifothresh(struct usb_ehci *ehci, u32 txfifo_thresh)
|
|||
cmd |= TXFIFO_THRESH(txfifo_thresh);
|
||||
ehci_writel(&ehci->txfilltuning, cmd);
|
||||
}
|
||||
|
||||
#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",
|
||||
fdt_strerror(node_offset));
|
||||
return -1;
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
static const char *fdt_usb_get_node_type(void *blob, int start_offset,
|
||||
int *node_offset)
|
||||
{
|
||||
const char *compat_dr = "fsl-usb2-dr";
|
||||
const char *compat_mph = "fsl-usb2-mph";
|
||||
const char *node_type = NULL;
|
||||
|
||||
*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("ERROR: could not find compatible node: %s\n",
|
||||
fdt_strerror(*node_offset));
|
||||
} else {
|
||||
node_type = compat_dr;
|
||||
}
|
||||
} else {
|
||||
node_type = compat_mph;
|
||||
}
|
||||
|
||||
return node_type;
|
||||
}
|
||||
|
||||
static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
|
||||
int start_offset)
|
||||
{
|
||||
int node_offset, err;
|
||||
const char *node_type = NULL;
|
||||
|
||||
node_type = fdt_usb_get_node_type(blob, start_offset, &node_offset);
|
||||
if (!node_type)
|
||||
return -1;
|
||||
|
||||
err = fdt_setprop(blob, node_offset, prop_erratum, NULL, 0);
|
||||
if (err < 0) {
|
||||
printf("ERROR: could not set %s for %s: %s.\n",
|
||||
prop_erratum, node_type, fdt_strerror(err));
|
||||
}
|
||||
|
||||
return node_offset;
|
||||
}
|
||||
|
||||
void fdt_fixup_dr_usb(void *blob, bd_t *bd)
|
||||
{
|
||||
static const char * const modes[] = { "host", "peripheral", "otg" };
|
||||
static const char * const phys[] = { "ulpi", "utmi", "utmi_dual" };
|
||||
int usb_erratum_a006261_off = -1;
|
||||
int usb_erratum_a007075_off = -1;
|
||||
int usb_erratum_a007792_off = -1;
|
||||
int usb_erratum_a005697_off = -1;
|
||||
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];
|
||||
}
|
||||
|
||||
if (has_dual_phy())
|
||||
dr_phy_type = phys[2];
|
||||
|
||||
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;
|
||||
|
||||
if (has_erratum_a006261()) {
|
||||
usb_erratum_a006261_off = fdt_fixup_usb_erratum
|
||||
(blob,
|
||||
"fsl,usb-erratum-a006261",
|
||||
usb_erratum_a006261_off);
|
||||
if (usb_erratum_a006261_off < 0)
|
||||
return;
|
||||
}
|
||||
|
||||
if (has_erratum_a007075()) {
|
||||
usb_erratum_a007075_off = fdt_fixup_usb_erratum
|
||||
(blob,
|
||||
"fsl,usb-erratum-a007075",
|
||||
usb_erratum_a007075_off);
|
||||
if (usb_erratum_a007075_off < 0)
|
||||
return;
|
||||
}
|
||||
|
||||
if (has_erratum_a007792()) {
|
||||
usb_erratum_a007792_off = fdt_fixup_usb_erratum
|
||||
(blob,
|
||||
"fsl,usb-erratum-a007792",
|
||||
usb_erratum_a007792_off);
|
||||
if (usb_erratum_a007792_off < 0)
|
||||
return;
|
||||
}
|
||||
if (has_erratum_a005697()) {
|
||||
usb_erratum_a005697_off = fdt_fixup_usb_erratum
|
||||
(blob,
|
||||
"fsl,usb-erratum-a005697",
|
||||
usb_erratum_a005697_off);
|
||||
if (usb_erratum_a005697_off < 0)
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue