mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
Below are main changes for v5.11-rc1:
For Chipidea USB2: - Add tracepoint support for UDC - Some tiny improvements For Cadence USB3 - Add some quirks for host mode, and let host work well at more use cases * SKIP_PHY_INIT * Disable BEI * Enable runtime PM default for i.mx platform - Some tiny improvements -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEDaZUZmFxRG/wNThrSFkpgVDWcbsFAl/R7S0ACgkQSFkpgVDW cbv/QQf+KhHOZYYzGMZXvyDiFIoE28sfrxyTrZKoDUXIWuAsLegpvY/bw6YJxAZy bj8z/iAk6NOyQLMH+2ULQoJfc8GX18O05ZOSKg+prcIw5e398TEH0NFrJZV/0dBa VSk0+pGaRvn6jLfw/lF2EImf4gHLh4EsgDOgWn4ffZL3IRwmGPub2splppmu9N88 1fbrxexc5NORnIpigH0kkftPQkda7slPfo3pMRjpHHb49SDQVw0C2x6FPooQxoaz c7DWEKfy2E8OcRDCgFdFFLIZNELSlvLHXOk1H8taTXlcVSHHFgos69qzCdOeiRuq OMHzsRM+M2XEb7LlSPYU0+G/K6SXFQ== =dV/G -----END PGP SIGNATURE----- Merge tag 'usb-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next Peter writes: Below are main changes for v5.11-rc1: For Chipidea USB2: - Add tracepoint support for UDC - Some tiny improvements For Cadence USB3 - Add some quirks for host mode, and let host work well at more use cases * SKIP_PHY_INIT * Disable BEI * Enable runtime PM default for i.mx platform - Some tiny improvements * tag 'usb-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb: MAINTAINERS: Add myself as a reviewer for CADENCE USB3 DRD IP DRIVER usb: chipidea: ci_hdrc_imx: Use of_device_get_match_data() usb: chipidea: usbmisc_imx: Use of_device_get_match_data() usb: cdns3: fix NULL pointer dereference on no platform data usb: chipidea: trace: fix the endian issue usb: chipidea: add tracepoint support for udc doc: dt-binding: cdns,usb3: add wakeup-irq usb: cdns3: imx: enable runtime pm by default usb: cdns3: add quirk for enable runtime pm by default usb: cdns3: host: disable BEI support usb: cdns3: host: add xhci_plat_priv quirk XHCI_SKIP_PHY_INIT usb: cdns3: host: add .suspend_quirk for xhci-plat.c usb: cdns3: Rids of duplicate error message usb: cdns3: Add static to cdns3_gadget_exit function
This commit is contained in:
Greg Kroah-Hartman
commit
d2a968dddf
15 changed files with 210 additions and 32 deletions
|
|
@ -26,16 +26,21 @@ properties:
|
|||
- const: dev
|
||||
|
||||
interrupts:
|
||||
minItems: 3
|
||||
items:
|
||||
- description: OTG/DRD controller interrupt
|
||||
- description: XHCI host controller interrupt
|
||||
- description: Device controller interrupt
|
||||
- description: interrupt used to wake up core, e.g when usbcmd.rs is
|
||||
cleared by xhci core, this interrupt is optional
|
||||
|
||||
interrupt-names:
|
||||
minItems: 3
|
||||
items:
|
||||
- const: host
|
||||
- const: peripheral
|
||||
- const: otg
|
||||
- const: wakeup
|
||||
|
||||
dr_mode:
|
||||
enum: [host, otg, peripheral]
|
||||
|
|
|
|||
|
|
@ -3863,6 +3863,7 @@ CADENCE USB3 DRD IP DRIVER
|
|||
M: Peter Chen <peter.chen@nxp.com>
|
||||
M: Pawel Laszczak <pawell@cadence.com>
|
||||
M: Roger Quadros <rogerq@ti.com>
|
||||
R: Aswath Govindraju <a-govindraju@ti.com>
|
||||
L: linux-usb@vger.kernel.org
|
||||
S: Maintained
|
||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
|
||||
|
|
|
|||
|
|
@ -151,6 +151,7 @@ static int cdns_imx_platform_suspend(struct device *dev,
|
|||
bool suspend, bool wakeup);
|
||||
static struct cdns3_platform_data cdns_imx_pdata = {
|
||||
.platform_suspend = cdns_imx_platform_suspend,
|
||||
.quirks = CDNS3_DEFAULT_PM_RUNTIME_ALLOW,
|
||||
};
|
||||
|
||||
static const struct of_dev_auxdata cdns_imx_auxdata[] = {
|
||||
|
|
@ -206,7 +207,6 @@ static int cdns_imx_probe(struct platform_device *pdev)
|
|||
device_set_wakeup_capable(dev, true);
|
||||
pm_runtime_set_active(dev);
|
||||
pm_runtime_enable(dev);
|
||||
pm_runtime_forbid(dev);
|
||||
|
||||
return ret;
|
||||
err:
|
||||
|
|
|
|||
|
|
@ -465,11 +465,8 @@ static int cdns3_probe(struct platform_device *pdev)
|
|||
cdns->xhci_res[1] = *res;
|
||||
|
||||
cdns->dev_irq = platform_get_irq_byname(pdev, "peripheral");
|
||||
if (cdns->dev_irq == -EPROBE_DEFER)
|
||||
return cdns->dev_irq;
|
||||
|
||||
if (cdns->dev_irq < 0)
|
||||
dev_err(dev, "couldn't get peripheral irq\n");
|
||||
return cdns->dev_irq;
|
||||
|
||||
regs = devm_platform_ioremap_resource_byname(pdev, "dev");
|
||||
if (IS_ERR(regs))
|
||||
|
|
@ -477,14 +474,9 @@ static int cdns3_probe(struct platform_device *pdev)
|
|||
cdns->dev_regs = regs;
|
||||
|
||||
cdns->otg_irq = platform_get_irq_byname(pdev, "otg");
|
||||
if (cdns->otg_irq == -EPROBE_DEFER)
|
||||
if (cdns->otg_irq < 0)
|
||||
return cdns->otg_irq;
|
||||
|
||||
if (cdns->otg_irq < 0) {
|
||||
dev_err(dev, "couldn't get otg irq\n");
|
||||
return cdns->otg_irq;
|
||||
}
|
||||
|
||||
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "otg");
|
||||
if (!res) {
|
||||
dev_err(dev, "couldn't get otg resource\n");
|
||||
|
|
@ -569,7 +561,8 @@ static int cdns3_probe(struct platform_device *pdev)
|
|||
device_set_wakeup_capable(dev, true);
|
||||
pm_runtime_set_active(dev);
|
||||
pm_runtime_enable(dev);
|
||||
pm_runtime_forbid(dev);
|
||||
if (!(cdns->pdata && (cdns->pdata->quirks & CDNS3_DEFAULT_PM_RUNTIME_ALLOW)))
|
||||
pm_runtime_forbid(dev);
|
||||
|
||||
/*
|
||||
* The controller needs less time between bus and controller suspend,
|
||||
|
|
|
|||
|
|
@ -42,6 +42,8 @@ struct cdns3_role_driver {
|
|||
struct cdns3_platform_data {
|
||||
int (*platform_suspend)(struct device *dev,
|
||||
bool suspend, bool wakeup);
|
||||
unsigned long quirks;
|
||||
#define CDNS3_DEFAULT_PM_RUNTIME_ALLOW BIT(0)
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -73,6 +75,7 @@ struct cdns3_platform_data {
|
|||
* @wakeup_pending: wakeup interrupt pending
|
||||
* @pdata: platform data from glue layer
|
||||
* @lock: spinlock structure
|
||||
* @xhci_plat_data: xhci private data structure pointer
|
||||
*/
|
||||
struct cdns3 {
|
||||
struct device *dev;
|
||||
|
|
@ -106,6 +109,7 @@ struct cdns3 {
|
|||
bool wakeup_pending;
|
||||
struct cdns3_platform_data *pdata;
|
||||
spinlock_t lock;
|
||||
struct xhci_plat_priv *xhci_plat_data;
|
||||
};
|
||||
|
||||
int cdns3_hw_role_switch(struct cdns3 *cdns);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
#ifdef CONFIG_USB_CDNS3_GADGET
|
||||
|
||||
int cdns3_gadget_init(struct cdns3 *cdns);
|
||||
void cdns3_gadget_exit(struct cdns3 *cdns);
|
||||
#else
|
||||
|
||||
static inline int cdns3_gadget_init(struct cdns3 *cdns)
|
||||
|
|
@ -21,8 +20,6 @@ static inline int cdns3_gadget_init(struct cdns3 *cdns)
|
|||
return -ENXIO;
|
||||
}
|
||||
|
||||
static inline void cdns3_gadget_exit(struct cdns3 *cdns) { }
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* __LINUX_CDNS3_GADGET_EXPORT */
|
||||
|
|
|
|||
|
|
@ -3084,7 +3084,7 @@ static void cdns3_gadget_release(struct device *dev)
|
|||
kfree(priv_dev);
|
||||
}
|
||||
|
||||
void cdns3_gadget_exit(struct cdns3 *cdns)
|
||||
static void cdns3_gadget_exit(struct cdns3 *cdns)
|
||||
{
|
||||
struct cdns3_device *priv_dev;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,9 +9,11 @@
|
|||
#ifndef __LINUX_CDNS3_HOST_EXPORT
|
||||
#define __LINUX_CDNS3_HOST_EXPORT
|
||||
|
||||
struct usb_hcd;
|
||||
#ifdef CONFIG_USB_CDNS3_HOST
|
||||
|
||||
int cdns3_host_init(struct cdns3 *cdns);
|
||||
int xhci_cdns3_suspend_quirk(struct usb_hcd *hcd);
|
||||
|
||||
#else
|
||||
|
||||
|
|
@ -21,6 +23,10 @@ static inline int cdns3_host_init(struct cdns3 *cdns)
|
|||
}
|
||||
|
||||
static inline void cdns3_host_exit(struct cdns3 *cdns) { }
|
||||
static inline int xhci_cdns3_suspend_quirk(struct usb_hcd *hcd)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_USB_CDNS3_HOST */
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,19 @@
|
|||
#include "drd.h"
|
||||
#include "host-export.h"
|
||||
#include <linux/usb/hcd.h>
|
||||
#include "../host/xhci.h"
|
||||
#include "../host/xhci-plat.h"
|
||||
|
||||
#define XECP_PORT_CAP_REG 0x8000
|
||||
#define XECP_AUX_CTRL_REG1 0x8120
|
||||
|
||||
#define CFG_RXDET_P3_EN BIT(15)
|
||||
#define LPM_2_STB_SWITCH_EN BIT(25)
|
||||
|
||||
static const struct xhci_plat_priv xhci_plat_cdns3_xhci = {
|
||||
.quirks = XHCI_SKIP_PHY_INIT | XHCI_AVOID_BEI,
|
||||
.suspend_quirk = xhci_cdns3_suspend_quirk,
|
||||
};
|
||||
|
||||
static int __cdns3_host_init(struct cdns3 *cdns)
|
||||
{
|
||||
|
|
@ -39,10 +52,25 @@ static int __cdns3_host_init(struct cdns3 *cdns)
|
|||
goto err1;
|
||||
}
|
||||
|
||||
cdns->xhci_plat_data = kmemdup(&xhci_plat_cdns3_xhci,
|
||||
sizeof(struct xhci_plat_priv), GFP_KERNEL);
|
||||
if (!cdns->xhci_plat_data) {
|
||||
ret = -ENOMEM;
|
||||
goto err1;
|
||||
}
|
||||
|
||||
if (cdns->pdata && (cdns->pdata->quirks & CDNS3_DEFAULT_PM_RUNTIME_ALLOW))
|
||||
cdns->xhci_plat_data->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
|
||||
|
||||
ret = platform_device_add_data(xhci, cdns->xhci_plat_data,
|
||||
sizeof(struct xhci_plat_priv));
|
||||
if (ret)
|
||||
goto free_memory;
|
||||
|
||||
ret = platform_device_add(xhci);
|
||||
if (ret) {
|
||||
dev_err(cdns->dev, "failed to register xHCI device\n");
|
||||
goto err1;
|
||||
goto free_memory;
|
||||
}
|
||||
|
||||
/* Glue needs to access xHCI region register for Power management */
|
||||
|
|
@ -51,13 +79,43 @@ static int __cdns3_host_init(struct cdns3 *cdns)
|
|||
cdns->xhci_regs = hcd->regs;
|
||||
|
||||
return 0;
|
||||
|
||||
free_memory:
|
||||
kfree(cdns->xhci_plat_data);
|
||||
err1:
|
||||
platform_device_put(xhci);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int xhci_cdns3_suspend_quirk(struct usb_hcd *hcd)
|
||||
{
|
||||
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
||||
u32 value;
|
||||
|
||||
if (pm_runtime_status_suspended(hcd->self.controller))
|
||||
return 0;
|
||||
|
||||
/* set usbcmd.EU3S */
|
||||
value = readl(&xhci->op_regs->command);
|
||||
value |= CMD_PM_INDEX;
|
||||
writel(value, &xhci->op_regs->command);
|
||||
|
||||
if (hcd->regs) {
|
||||
value = readl(hcd->regs + XECP_AUX_CTRL_REG1);
|
||||
value |= CFG_RXDET_P3_EN;
|
||||
writel(value, hcd->regs + XECP_AUX_CTRL_REG1);
|
||||
|
||||
value = readl(hcd->regs + XECP_PORT_CAP_REG);
|
||||
value |= LPM_2_STB_SWITCH_EN;
|
||||
writel(value, hcd->regs + XECP_PORT_CAP_REG);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void cdns3_host_exit(struct cdns3 *cdns)
|
||||
{
|
||||
kfree(cdns->xhci_plat_data);
|
||||
platform_device_unregister(cdns->host_dev);
|
||||
cdns->host_dev = NULL;
|
||||
cdns3_drd_host_off(cdns);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
# define_trace.h needs to know how to find our header
|
||||
CFLAGS_trace.o := -I$(src)
|
||||
obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc.o
|
||||
|
||||
ci_hdrc-y := core.o otg.o debug.o ulpi.o
|
||||
ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC) += udc.o
|
||||
ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC) += udc.o trace.o
|
||||
ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST) += host.o
|
||||
ci_hdrc-$(CONFIG_USB_OTG_FSM) += otg_fsm.o
|
||||
|
||||
|
|
|
|||
|
|
@ -320,16 +320,11 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
|
|||
.notify_event = ci_hdrc_imx_notify_event,
|
||||
};
|
||||
int ret;
|
||||
const struct of_device_id *of_id;
|
||||
const struct ci_hdrc_imx_platform_flag *imx_platform_flag;
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
struct device *dev = &pdev->dev;
|
||||
|
||||
of_id = of_match_device(ci_hdrc_imx_dt_ids, dev);
|
||||
if (!of_id)
|
||||
return -ENODEV;
|
||||
|
||||
imx_platform_flag = of_id->data;
|
||||
imx_platform_flag = of_device_get_match_data(&pdev->dev);
|
||||
|
||||
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
||||
if (!data)
|
||||
|
|
|
|||
23
drivers/usb/chipidea/trace.c
Normal file
23
drivers/usb/chipidea/trace.c
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Chipidea Device Mode Trace Support
|
||||
*
|
||||
* Copyright (C) 2020 NXP
|
||||
*
|
||||
* Author: Peter Chen <peter.chen@nxp.com>
|
||||
*/
|
||||
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include "trace.h"
|
||||
|
||||
void ci_log(struct ci_hdrc *ci, const char *fmt, ...)
|
||||
{
|
||||
struct va_format vaf;
|
||||
va_list args;
|
||||
|
||||
va_start(args, fmt);
|
||||
vaf.fmt = fmt;
|
||||
vaf.va = &args;
|
||||
trace_ci_log(ci, &vaf);
|
||||
va_end(args);
|
||||
}
|
||||
92
drivers/usb/chipidea/trace.h
Normal file
92
drivers/usb/chipidea/trace.h
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* Trace support header file for device mode
|
||||
*
|
||||
* Copyright (C) 2020 NXP
|
||||
*
|
||||
* Author: Peter Chen <peter.chen@nxp.com>
|
||||
*/
|
||||
|
||||
#undef TRACE_SYSTEM
|
||||
#define TRACE_SYSTEM chipidea
|
||||
|
||||
#if !defined(__LINUX_CHIPIDEA_TRACE) || defined(TRACE_HEADER_MULTI_READ)
|
||||
#define __LINUX_CHIPIDEA_TRACE
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/tracepoint.h>
|
||||
#include <linux/usb/chipidea.h>
|
||||
#include "ci.h"
|
||||
#include "udc.h"
|
||||
|
||||
#define CHIPIDEA_MSG_MAX 500
|
||||
|
||||
void ci_log(struct ci_hdrc *ci, const char *fmt, ...);
|
||||
|
||||
TRACE_EVENT(ci_log,
|
||||
TP_PROTO(struct ci_hdrc *ci, struct va_format *vaf),
|
||||
TP_ARGS(ci, vaf),
|
||||
TP_STRUCT__entry(
|
||||
__string(name, dev_name(ci->dev))
|
||||
__dynamic_array(char, msg, CHIPIDEA_MSG_MAX)
|
||||
),
|
||||
TP_fast_assign(
|
||||
__assign_str(name, dev_name(ci->dev));
|
||||
vsnprintf(__get_str(msg), CHIPIDEA_MSG_MAX, vaf->fmt, *vaf->va);
|
||||
),
|
||||
TP_printk("%s: %s", __get_str(name), __get_str(msg))
|
||||
);
|
||||
|
||||
DECLARE_EVENT_CLASS(ci_log_trb,
|
||||
TP_PROTO(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq, struct td_node *td),
|
||||
TP_ARGS(hwep, hwreq, td),
|
||||
TP_STRUCT__entry(
|
||||
__string(name, hwep->name)
|
||||
__field(struct td_node *, td)
|
||||
__field(struct usb_request *, req)
|
||||
__field(dma_addr_t, dma)
|
||||
__field(s32, td_remaining_size)
|
||||
__field(u32, next)
|
||||
__field(u32, token)
|
||||
__field(u32, type)
|
||||
),
|
||||
TP_fast_assign(
|
||||
__assign_str(name, hwep->name);
|
||||
__entry->req = &hwreq->req;
|
||||
__entry->td = td;
|
||||
__entry->dma = td->dma;
|
||||
__entry->td_remaining_size = td->td_remaining_size;
|
||||
__entry->next = le32_to_cpu(td->ptr->next);
|
||||
__entry->token = le32_to_cpu(td->ptr->token);
|
||||
__entry->type = usb_endpoint_type(hwep->ep.desc);
|
||||
),
|
||||
TP_printk("%s: req: %p, td: %p, td_dma_address: %pad, remaining_size: %d, "
|
||||
"next: %x, total bytes: %d, status: %lx",
|
||||
__get_str(name), __entry->req, __entry->td, &__entry->dma,
|
||||
__entry->td_remaining_size, __entry->next,
|
||||
(int)((__entry->token & TD_TOTAL_BYTES) >> __ffs(TD_TOTAL_BYTES)),
|
||||
__entry->token & TD_STATUS
|
||||
)
|
||||
);
|
||||
|
||||
DEFINE_EVENT(ci_log_trb, ci_prepare_td,
|
||||
TP_PROTO(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq, struct td_node *td),
|
||||
TP_ARGS(hwep, hwreq, td)
|
||||
);
|
||||
|
||||
DEFINE_EVENT(ci_log_trb, ci_complete_td,
|
||||
TP_PROTO(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq, struct td_node *td),
|
||||
TP_ARGS(hwep, hwreq, td)
|
||||
);
|
||||
|
||||
#endif /* __LINUX_CHIPIDEA_TRACE */
|
||||
|
||||
/* this part must be outside header guard */
|
||||
|
||||
#undef TRACE_INCLUDE_PATH
|
||||
#define TRACE_INCLUDE_PATH .
|
||||
|
||||
#undef TRACE_INCLUDE_FILE
|
||||
#define TRACE_INCLUDE_FILE trace
|
||||
|
||||
#include <trace/define_trace.h>
|
||||
|
|
@ -26,6 +26,7 @@
|
|||
#include "bits.h"
|
||||
#include "otg.h"
|
||||
#include "otg_fsm.h"
|
||||
#include "trace.h"
|
||||
|
||||
/* control endpoint description */
|
||||
static const struct usb_endpoint_descriptor
|
||||
|
|
@ -569,14 +570,18 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
firstnode = list_first_entry(&hwreq->tds, struct td_node, td);
|
||||
|
||||
lastnode = list_entry(hwreq->tds.prev,
|
||||
struct td_node, td);
|
||||
|
||||
lastnode->ptr->next = cpu_to_le32(TD_TERMINATE);
|
||||
if (!hwreq->req.no_interrupt)
|
||||
lastnode->ptr->token |= cpu_to_le32(TD_IOC);
|
||||
|
||||
list_for_each_entry_safe(firstnode, lastnode, &hwreq->tds, td)
|
||||
trace_ci_prepare_td(hwep, hwreq, firstnode);
|
||||
|
||||
firstnode = list_first_entry(&hwreq->tds, struct td_node, td);
|
||||
|
||||
wmb();
|
||||
|
||||
hwreq->req.actual = 0;
|
||||
|
|
@ -671,6 +676,7 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
|
|||
|
||||
list_for_each_entry_safe(node, tmpnode, &hwreq->tds, td) {
|
||||
tmptoken = le32_to_cpu(node->ptr->token);
|
||||
trace_ci_complete_td(hwep, hwreq, node);
|
||||
if ((TD_STATUS_ACTIVE & tmptoken) != 0) {
|
||||
int n = hw_ep_bit(hwep->num, hwep->dir);
|
||||
|
||||
|
|
|
|||
|
|
@ -1134,11 +1134,6 @@ MODULE_DEVICE_TABLE(of, usbmisc_imx_dt_ids);
|
|||
static int usbmisc_imx_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct imx_usbmisc *data;
|
||||
const struct of_device_id *of_id;
|
||||
|
||||
of_id = of_match_device(usbmisc_imx_dt_ids, &pdev->dev);
|
||||
if (!of_id)
|
||||
return -ENODEV;
|
||||
|
||||
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
||||
if (!data)
|
||||
|
|
@ -1150,7 +1145,7 @@ static int usbmisc_imx_probe(struct platform_device *pdev)
|
|||
if (IS_ERR(data->base))
|
||||
return PTR_ERR(data->base);
|
||||
|
||||
data->ops = (const struct usbmisc_ops *)of_id->data;
|
||||
data->ops = of_device_get_match_data(&pdev->dev);
|
||||
platform_set_drvdata(pdev, data);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue