Commit 5f620bb6 authored by Ran Wang's avatar Ran Wang Committed by Greg Kroah-Hartman
Browse files

drivers: usb :fsl: Remove USB Errata checking code 



Remove USB errata checking code from driver. Applicability of erratum
is retrieved by reading corresponding property in device tree.
This property is written during device tree fixup.

Besides, replace spaces with tabs to make code aligned.

Signed-off-by: default avatarRamneek Mehresh <ramneek.mehresh@nxp.com>
Signed-off-by: default avatarNikhil Badola <nikhil.badola@freescale.com>
Signed-off-by: default avatarYinbo Zhu <yinbo.zhu@nxp.com>
Signed-off-by: default avatarRan Wang <ran.wang_1@nxp.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 73855109

drivers/usb/host/ehci-fsl.c

+1 −6
Original line number Diff line number Diff line
@@ -304,14 +304,9 @@ static int ehci_fsl_usb_setup(struct ehci_hcd *ehci) 
			return -EINVAL;



	if (pdata->operating_mode == FSL_USB2_MPH_HOST) {

		unsigned int chip, rev, svr;



		svr = mfspr(SPRN_SVR);

		chip = svr >> 16;

		rev = (svr >> 4) & 0xf;



		/* Deal with USB Erratum #14 on MPC834x Rev 1.0 & 1.1 chips */

		if ((rev == 1) && (chip >= 0x8050) && (chip <= 0x8055))

		if (pdata->has_fsl_erratum_14 == 1)

			ehci->has_fsl_port_bug = 1;



		if (pdata->port_enables & FSL_USB2_PORT0_ENABLED)

drivers/usb/host/fsl-mph-dr-of.c

+6 −0
Original line number Diff line number Diff line
@@ -225,6 +225,12 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev) 
	pdata->has_fsl_erratum_a005697 =

		of_property_read_bool(np, "fsl,usb_erratum-a005697");



	if (of_get_property(np, "fsl,usb_erratum_14", NULL))

		pdata->has_fsl_erratum_14 = 1;

	else

		pdata->has_fsl_erratum_14 = 0;





	/*

	 * Determine whether phy_clk_valid needs to be checked

	 * by reading property in device tree

include/linux/fsl_devices.h

+4 −3
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ struct fsl_usb2_platform_data { 
	unsigned	suspended:1;

	unsigned	already_suspended:1;

	unsigned	has_fsl_erratum_a007792:1;

	unsigned	has_fsl_erratum_14:1;

	unsigned	has_fsl_erratum_a005275:1;

	unsigned	has_fsl_erratum_a005697:1;

	unsigned	check_phy_clk_valid:1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE