Commit 6ed151f2 authored by Saranya Gopal's avatar Saranya Gopal Committed by Greg Kroah-Hartman

xhci-ext-caps.c: Add property to disable Intel SW switch

In platforms like Cherrytrail, 'SW switch enable' bit
should not be enabled for role switch. This patch
adds a property to Intel USB Role Switch platform driver
to denote that SW switch should be disabled in
Cherrytrail devices.
Signed-off-by: default avatarSaranya Gopal <saranya.gopal@intel.com>
Signed-off-by: default avatarBalaji Manoharan <m.balaji@intel.com>
Suggested-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/1567079760-24822-1-git-send-email-saranya.gopal@intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0a46556
...@@ -6,11 +6,20 @@ ...@@ -6,11 +6,20 @@
*/ */
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/pci.h>
#include "xhci.h" #include "xhci.h"
#define USB_SW_DRV_NAME "intel_xhci_usb_sw" #define USB_SW_DRV_NAME "intel_xhci_usb_sw"
#define USB_SW_RESOURCE_SIZE 0x400 #define USB_SW_RESOURCE_SIZE 0x400
#define PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI 0x22b5
static const struct property_entry role_switch_props[] = {
PROPERTY_ENTRY_BOOL("sw_switch_disable"),
{},
};
static void xhci_intel_unregister_pdev(void *arg) static void xhci_intel_unregister_pdev(void *arg)
{ {
platform_device_unregister(arg); platform_device_unregister(arg);
...@@ -21,6 +30,7 @@ static int xhci_create_intel_xhci_sw_pdev(struct xhci_hcd *xhci, u32 cap_offset) ...@@ -21,6 +30,7 @@ static int xhci_create_intel_xhci_sw_pdev(struct xhci_hcd *xhci, u32 cap_offset)
struct usb_hcd *hcd = xhci_to_hcd(xhci); struct usb_hcd *hcd = xhci_to_hcd(xhci);
struct device *dev = hcd->self.controller; struct device *dev = hcd->self.controller;
struct platform_device *pdev; struct platform_device *pdev;
struct pci_dev *pci = to_pci_dev(dev);
struct resource res = { 0, }; struct resource res = { 0, };
int ret; int ret;
...@@ -43,6 +53,14 @@ static int xhci_create_intel_xhci_sw_pdev(struct xhci_hcd *xhci, u32 cap_offset) ...@@ -43,6 +53,14 @@ static int xhci_create_intel_xhci_sw_pdev(struct xhci_hcd *xhci, u32 cap_offset)
return ret; return ret;
} }
if (pci->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI) {
ret = platform_device_add_properties(pdev, role_switch_props);
if (ret) {
dev_err(dev, "failed to register device properties\n");
return ret;
}
}
pdev->dev.parent = dev; pdev->dev.parent = dev;
ret = platform_device_add(pdev); ret = platform_device_add(pdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment