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

Commit ad3db5da authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

ehci-platform: Add support for controllers with big-endian regs / descriptors 



This uses the already documented devicetree booleans for this, see:
Documentation/devicetree/bindings/usb/usb-ehci.txt

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b1034412

drivers/usb/host/ehci-platform.c

+31 −2
Original line number Diff line number Diff line
@@ -55,8 +55,10 @@ static int ehci_platform_reset(struct usb_hcd *hcd) 


	hcd->has_tt = pdata->has_tt;

	ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;

	ehci->big_endian_desc = pdata->big_endian_desc;

	ehci->big_endian_mmio = pdata->big_endian_mmio;

	if (pdata->big_endian_desc)

		ehci->big_endian_desc = 1;

	if (pdata->big_endian_mmio)

		ehci->big_endian_mmio = 1;



	if (pdata->pre_setup) {

		retval = pdata->pre_setup(hcd);
@@ -142,6 +144,7 @@ static int ehci_platform_probe(struct platform_device *dev) 
	struct resource *res_mem;

	struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);

	struct ehci_platform_priv *priv;

	struct ehci_hcd *ehci;

	int err, irq, clk = 0;



	if (usb_disabled())
@@ -177,8 +180,34 @@ static int ehci_platform_probe(struct platform_device *dev) 
	platform_set_drvdata(dev, hcd);

	dev->dev.platform_data = pdata;

	priv = hcd_to_ehci_priv(hcd);

	ehci = hcd_to_ehci(hcd);



	if (pdata == &ehci_platform_defaults && dev->dev.of_node) {

		if (of_property_read_bool(dev->dev.of_node, "big-endian-regs"))

			ehci->big_endian_mmio = 1;



		if (of_property_read_bool(dev->dev.of_node, "big-endian-desc"))

			ehci->big_endian_desc = 1;



		if (of_property_read_bool(dev->dev.of_node, "big-endian"))

			ehci->big_endian_mmio = ehci->big_endian_desc = 1;



#ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO

		if (ehci->big_endian_mmio) {

			dev_err(&dev->dev,

				"Error big-endian-regs not compiled in\n");

			err = -EINVAL;

			goto err_put_hcd;

		}

#endif

#ifndef CONFIG_USB_EHCI_BIG_ENDIAN_DESC

		if (ehci->big_endian_desc) {

			dev_err(&dev->dev,

				"Error big-endian-desc not compiled in\n");

			err = -EINVAL;

			goto err_put_hcd;

		}

#endif

		priv->phy = devm_phy_get(&dev->dev, "usb");

		if (IS_ERR(priv->phy)) {

			err = PTR_ERR(priv->phy);