diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-08 13:45:51 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-08 13:45:51 -0800 |
| commit | ac5166bcdb43889a5bd837f5076b78049e1f8bca (patch) | |
| tree | 8e70c370aa5772974197fd12707427ed85e7b391 /drivers/usb | |
| parent | c0e0f8855f7fbc0c318bf514c53b4f5d4f897cde (diff) | |
| download | linux-ac5166bcdb43889a5bd837f5076b78049e1f8bca.tar.bz2 | |
Revert "usb: chipidea: imx: set CI_HDRC_IMX28_WRITE_FIX for imx28"
This reverts commit 30666249eae3b04875d514dea557d1ab1468c006, as it
depended on a previous patch that I rejected, causing a build error
here. Sorry about that.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Peter Chen <peter.chen@freescale.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/chipidea/ci_hdrc_imx.c | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c index c00f77257d36..bb5d976e5b81 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.c +++ b/drivers/usb/chipidea/ci_hdrc_imx.c @@ -23,26 +23,6 @@ #include "ci.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 usb_phy *phy; struct platform_device *ci_pdev; @@ -102,9 +82,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) CI_HDRC_DISABLE_STREAMING, }; 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); if (!data) { @@ -138,9 +115,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 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)); if (ret) goto err_clk; @@ -199,6 +173,12 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev) 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 = { .probe = ci_hdrc_imx_probe, .remove = ci_hdrc_imx_remove, |