Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac5166bc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "usb: chipidea: imx: set CI_HDRC_IMX28_WRITE_FIX for imx28" 



This reverts commit 30666249, as it
depended on a previous patch that I rejected, causing a build error
here.  Sorry about that.

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Cc: Peter Chen <peter.chen@freescale.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c0e0f885

drivers/usb/chipidea/ci_hdrc_imx.c

+6 −26
Original line number Original line Diff line number Diff line
@@ -23,26 +23,6 @@ 
#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;
@@ -102,9 +82,6 @@ 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) {
@@ -138,9 +115,6 @@ 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;
@@ -199,6 +173,12 @@ 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,