mirror of https://gitee.com/openkylin/linux.git
usb: chipidea: imx: set CI_HDRC_IMX28_WRITE_FIX for imx28
Due to imx28 needs ARM swp instruction for writing, we set CI_HDRC_IMX28_WRITE_FIX for imx28. This patch is needed for stable tree 3.11+ Cc: stable@vger.kernel.org Cc: robert.hodaszi@digi.com Signed-off-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Tested-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ed8f8318d2
commit
1071055e2a
|
@ -23,6 +23,26 @@
|
||||||
#include "ci.h"
|
#include "ci.h"
|
||||||
#include "ci_hdrc_imx.h"
|
#include "ci_hdrc_imx.h"
|
||||||
|
|
||||||
|
#define CI_HDRC_IMX_IMX28_WRITE_FIX BIT(0)
|
||||||
|
|
||||||
|
struct ci_hdrc_imx_platform_flag {
|
||||||
|
unsigned int flags;
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct ci_hdrc_imx_platform_flag imx27_usb_data = {
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct ci_hdrc_imx_platform_flag imx28_usb_data = {
|
||||||
|
.flags = CI_HDRC_IMX_IMX28_WRITE_FIX,
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct of_device_id ci_hdrc_imx_dt_ids[] = {
|
||||||
|
{ .compatible = "fsl,imx28-usb", .data = &imx28_usb_data},
|
||||||
|
{ .compatible = "fsl,imx27-usb", .data = &imx27_usb_data},
|
||||||
|
{ /* sentinel */ }
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(of, ci_hdrc_imx_dt_ids);
|
||||||
|
|
||||||
struct ci_hdrc_imx_data {
|
struct ci_hdrc_imx_data {
|
||||||
struct usb_phy *phy;
|
struct usb_phy *phy;
|
||||||
struct platform_device *ci_pdev;
|
struct platform_device *ci_pdev;
|
||||||
|
@ -82,6 +102,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
|
||||||
CI_HDRC_DISABLE_STREAMING,
|
CI_HDRC_DISABLE_STREAMING,
|
||||||
};
|
};
|
||||||
int ret;
|
int ret;
|
||||||
|
const struct of_device_id *of_id =
|
||||||
|
of_match_device(ci_hdrc_imx_dt_ids, &pdev->dev);
|
||||||
|
const struct ci_hdrc_imx_platform_flag *imx_platform_flag = of_id->data;
|
||||||
|
|
||||||
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
||||||
if (!data) {
|
if (!data) {
|
||||||
|
@ -115,6 +138,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
pdata.phy = data->phy;
|
pdata.phy = data->phy;
|
||||||
|
|
||||||
|
if (imx_platform_flag->flags & CI_HDRC_IMX_IMX28_WRITE_FIX)
|
||||||
|
pdata.flags |= CI_HDRC_IMX28_WRITE_FIX;
|
||||||
|
|
||||||
ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_clk;
|
goto err_clk;
|
||||||
|
@ -173,12 +199,6 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id ci_hdrc_imx_dt_ids[] = {
|
|
||||||
{ .compatible = "fsl,imx27-usb", },
|
|
||||||
{ /* sentinel */ }
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(of, ci_hdrc_imx_dt_ids);
|
|
||||||
|
|
||||||
static struct platform_driver ci_hdrc_imx_driver = {
|
static struct platform_driver ci_hdrc_imx_driver = {
|
||||||
.probe = ci_hdrc_imx_probe,
|
.probe = ci_hdrc_imx_probe,
|
||||||
.remove = ci_hdrc_imx_remove,
|
.remove = ci_hdrc_imx_remove,
|
||||||
|
|
Loading…
Reference in New Issue