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

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

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



Note this commit uses the same devicetree booleans for this as the ones
already existing in the usb-ehci bindings, 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 a4aeb211

Documentation/devicetree/bindings/usb/usb-ohci.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,9 @@ Required properties: 
- interrupts : ohci controller interrupt

- interrupts : ohci controller interrupt





Optional properties:

Optional properties:

- big-endian-regs : boolean, set this for hcds with big-endian registers

- big-endian-desc : boolean, set this for hcds with big-endian descriptors

- big-endian : boolean, for hcds with big-endian-regs + big-endian-desc

- clocks : a list of phandle + clock specifier pairs

- clocks : a list of phandle + clock specifier pairs

- phys : phandle + phy specifier pair

- phys : phandle + phy specifier pair

- phy-names : "usb"

- phy-names : "usb"

drivers/usb/host/ohci-platform.c

+27 −0
Original line number Original line Diff line number Diff line
@@ -128,6 +128,7 @@ static int ohci_platform_probe(struct platform_device *dev) 
	struct resource *res_mem;

	struct resource *res_mem;

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

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

	struct ohci_platform_priv *priv;

	struct ohci_platform_priv *priv;

	struct ohci_hcd *ohci;

	int err, irq, clk = 0;

	int err, irq, clk = 0;





	if (usb_disabled())

	if (usb_disabled())
@@ -164,8 +165,34 @@ static int ohci_platform_probe(struct platform_device *dev) 
	platform_set_drvdata(dev, hcd);

	platform_set_drvdata(dev, hcd);

	dev->dev.platform_data = pdata;

	dev->dev.platform_data = pdata;

	priv = hcd_to_ohci_priv(hcd);

	priv = hcd_to_ohci_priv(hcd);

	ohci = hcd_to_ohci(hcd);





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

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

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

			ohci->flags |= OHCI_QUIRK_BE_MMIO;



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

			ohci->flags |= OHCI_QUIRK_BE_DESC;



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

			ohci->flags |= OHCI_QUIRK_BE_MMIO | OHCI_QUIRK_BE_DESC;



#ifndef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO

		if (ohci->flags & OHCI_QUIRK_BE_MMIO) {

			dev_err(&dev->dev,

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

			err = -EINVAL;

			goto err_put_hcd;

		}

#endif

#ifndef CONFIG_USB_OHCI_BIG_ENDIAN_DESC

		if (ohci->flags & OHCI_QUIRK_BE_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");

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

		if (IS_ERR(priv->phy)) {

		if (IS_ERR(priv->phy)) {

			err = PTR_ERR(priv->phy);

			err = PTR_ERR(priv->phy);