diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-08 16:45:51 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-08 16:45:51 -0500 |
commit | ac5166bcdb43889a5bd837f5076b78049e1f8bca (patch) | |
tree | 8e70c370aa5772974197fd12707427ed85e7b391 /drivers/usb/chipidea | |
parent | c0e0f8855f7fbc0c318bf514c53b4f5d4f897cde (diff) |
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/chipidea')
-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 @@ | |||
23 | #include "ci.h" | 23 | #include "ci.h" |
24 | #include "ci_hdrc_imx.h" | 24 | #include "ci_hdrc_imx.h" |
25 | 25 | ||
26 | #define CI_HDRC_IMX_IMX28_WRITE_FIX BIT(0) | ||
27 | |||
28 | struct ci_hdrc_imx_platform_flag { | ||
29 | unsigned int flags; | ||
30 | }; | ||
31 | |||
32 | static const struct ci_hdrc_imx_platform_flag imx27_usb_data = { | ||
33 | }; | ||
34 | |||
35 | static const struct ci_hdrc_imx_platform_flag imx28_usb_data = { | ||
36 | .flags = CI_HDRC_IMX_IMX28_WRITE_FIX, | ||
37 | }; | ||
38 | |||
39 | static const struct of_device_id ci_hdrc_imx_dt_ids[] = { | ||
40 | { .compatible = "fsl,imx28-usb", .data = &imx28_usb_data}, | ||
41 | { .compatible = "fsl,imx27-usb", .data = &imx27_usb_data}, | ||
42 | { /* sentinel */ } | ||
43 | }; | ||
44 | MODULE_DEVICE_TABLE(of, ci_hdrc_imx_dt_ids); | ||
45 | |||
46 | struct ci_hdrc_imx_data { | 26 | struct ci_hdrc_imx_data { |
47 | struct usb_phy *phy; | 27 | struct usb_phy *phy; |
48 | struct platform_device *ci_pdev; | 28 | struct platform_device *ci_pdev; |
@@ -102,9 +82,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) | |||
102 | CI_HDRC_DISABLE_STREAMING, | 82 | CI_HDRC_DISABLE_STREAMING, |
103 | }; | 83 | }; |
104 | int ret; | 84 | int ret; |
105 | const struct of_device_id *of_id = | ||
106 | of_match_device(ci_hdrc_imx_dt_ids, &pdev->dev); | ||
107 | const struct ci_hdrc_imx_platform_flag *imx_platform_flag = of_id->data; | ||
108 | 85 | ||
109 | data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); | 86 | data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); |
110 | if (!data) { | 87 | if (!data) { |
@@ -138,9 +115,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) | |||
138 | 115 | ||
139 | pdata.phy = data->phy; | 116 | pdata.phy = data->phy; |
140 | 117 | ||
141 | if (imx_platform_flag->flags & CI_HDRC_IMX_IMX28_WRITE_FIX) | ||
142 | pdata.flags |= CI_HDRC_IMX28_WRITE_FIX; | ||
143 | |||
144 | ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); | 118 | ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); |
145 | if (ret) | 119 | if (ret) |
146 | goto err_clk; | 120 | goto err_clk; |
@@ -199,6 +173,12 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev) | |||
199 | return 0; | 173 | return 0; |
200 | } | 174 | } |
201 | 175 | ||
176 | static const struct of_device_id ci_hdrc_imx_dt_ids[] = { | ||
177 | { .compatible = "fsl,imx27-usb", }, | ||
178 | { /* sentinel */ } | ||
179 | }; | ||
180 | MODULE_DEVICE_TABLE(of, ci_hdrc_imx_dt_ids); | ||
181 | |||
202 | static struct platform_driver ci_hdrc_imx_driver = { | 182 | static struct platform_driver ci_hdrc_imx_driver = { |
203 | .probe = ci_hdrc_imx_probe, | 183 | .probe = ci_hdrc_imx_probe, |
204 | .remove = ci_hdrc_imx_remove, | 184 | .remove = ci_hdrc_imx_remove, |