* [PATCH v9 1/7] regulator: fixed: add support for ACPI interface
2016-05-30 5:51 [PATCH v9 0/7] usb: add support for Intel dual role port mux Lu Baolu
@ 2016-05-30 5:51 ` Lu Baolu
2016-05-30 5:51 ` [PATCH v9 2/7] usb: mux: add generic code for dual role port mux Lu Baolu
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Lu Baolu @ 2016-05-30 5:51 UTC (permalink / raw)
To: Greg Kroah-Hartman, felipe.balbi, Mathias Nyman, Lee Jones,
Heikki Krogerus, Liam Girdwood, Mark Brown
Cc: linux-usb, linux-kernel, Lu Baolu
Add support to retrieve fixed voltage configure information through
ACPI interface. This is needed for Intel Bay Trail devices, where a
GPIO is used to control the USB vbus.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/regulator/fixed.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index ff62d69..207ab40 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -30,6 +30,9 @@
#include <linux/of_gpio.h>
#include <linux/regulator/of_regulator.h>
#include <linux/regulator/machine.h>
+#include <linux/acpi.h>
+#include <linux/property.h>
+#include <linux/gpio/consumer.h>
struct fixed_voltage_data {
struct regulator_desc desc;
@@ -104,6 +107,44 @@ of_get_fixed_voltage_config(struct device *dev,
return config;
}
+/**
+ * acpi_get_fixed_voltage_config - extract fixed_voltage_config structure info
+ * @dev: device requesting for fixed_voltage_config
+ * @desc: regulator description
+ *
+ * Populates fixed_voltage_config structure by extracting data through ACPI
+ * interface, returns a pointer to the populated structure of NULL if memory
+ * alloc fails.
+ */
+static struct fixed_voltage_config *
+acpi_get_fixed_voltage_config(struct device *dev,
+ const struct regulator_desc *desc)
+{
+ struct fixed_voltage_config *config;
+ const char *supply_name;
+ struct gpio_desc *gpiod;
+ int ret;
+
+ config = devm_kzalloc(dev, sizeof(*config), GFP_KERNEL);
+ if (!config)
+ return ERR_PTR(-ENOMEM);
+
+ ret = device_property_read_string(dev, "supply-name", &supply_name);
+ if (!ret)
+ config->supply_name = supply_name;
+
+ gpiod = gpiod_get(dev, "gpio", GPIOD_ASIS);
+ if (IS_ERR(gpiod))
+ return ERR_PTR(-ENODEV);
+
+ config->gpio = desc_to_gpio(gpiod);
+ config->enable_high = device_property_read_bool(dev,
+ "enable-active-high");
+ gpiod_put(gpiod);
+
+ return config;
+}
+
static struct regulator_ops fixed_voltage_ops = {
};
@@ -124,6 +165,11 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
&drvdata->desc);
if (IS_ERR(config))
return PTR_ERR(config);
+ } else if (ACPI_HANDLE(&pdev->dev)) {
+ config = acpi_get_fixed_voltage_config(&pdev->dev,
+ &drvdata->desc);
+ if (IS_ERR(config))
+ return PTR_ERR(config);
} else {
config = dev_get_platdata(&pdev->dev);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v9 2/7] usb: mux: add generic code for dual role port mux
2016-05-30 5:51 [PATCH v9 0/7] usb: add support for Intel dual role port mux Lu Baolu
2016-05-30 5:51 ` [PATCH v9 1/7] regulator: fixed: add support for ACPI interface Lu Baolu
@ 2016-05-30 5:51 ` Lu Baolu
2016-05-30 5:51 ` [PATCH v9 3/7] usb: mux: add driver for Intel gpio controlled " Lu Baolu
` (4 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Lu Baolu @ 2016-05-30 5:51 UTC (permalink / raw)
To: Greg Kroah-Hartman, felipe.balbi, Mathias Nyman, Lee Jones,
Heikki Krogerus, Liam Girdwood, Mark Brown
Cc: linux-usb, linux-kernel, Lu Baolu
Several Intel platforms implement USB dual role by having completely
separate xHCI and dwc3 IPs in PCH or SOC silicons. These two IPs share
a single USB port. There is another external port mux which controls
where the data lines should go. While the USB controllers are part of
the silicon, the port mux design are platform specific.
This patch adds the generic code to handle such multiple roles of a
usb port. It exports the necessary interfaces for other components to
register or unregister a usb mux device, and to control its role.
It registers the mux device with sysfs as well, so that users are able
to control the port role from user space.
Some other archs (e.g. Renesas R-Car gen2 SoCs) need an external mux to
swap usb roles as well. This code could also be leveraged for those archs.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Felipe Balbi <balbi@kernel.org>
---
Documentation/ABI/testing/sysfs-bus-platform | 18 +++
drivers/usb/Kconfig | 2 +
drivers/usb/Makefile | 1 +
drivers/usb/mux/Kconfig | 8 ++
drivers/usb/mux/Makefile | 4 +
drivers/usb/mux/portmux-core.c | 202 +++++++++++++++++++++++++++
include/linux/usb/portmux.h | 90 ++++++++++++
7 files changed, 325 insertions(+)
create mode 100644 drivers/usb/mux/Kconfig
create mode 100644 drivers/usb/mux/Makefile
create mode 100644 drivers/usb/mux/portmux-core.c
create mode 100644 include/linux/usb/portmux.h
diff --git a/Documentation/ABI/testing/sysfs-bus-platform b/Documentation/ABI/testing/sysfs-bus-platform
index 5172a61..b994e4e 100644
--- a/Documentation/ABI/testing/sysfs-bus-platform
+++ b/Documentation/ABI/testing/sysfs-bus-platform
@@ -18,3 +18,21 @@ Description:
devices to opt-out of driver binding using a driver_override
name such as "none". Only a single driver may be specified in
the override, there is no support for parsing delimiters.
+
+What: /sys/bus/platform/devices/.../portmux.N/name
+ /sys/bus/platform/devices/.../portmux.N/state
+Date: April 2016
+Contact: Lu Baolu <baolu.lu@linux.intel.com>
+Description:
+ In some platforms, a single USB port is shared between a USB host
+ controller and a device controller. A USB mux driver is needed to
+ handle the port mux. Read-only attribute "name" shows the name of
+ the port mux device. "state" attribute shows and stores the mux
+ state.
+ For read:
+ 'unknown' - the mux hasn't been set yet;
+ 'peripheral' - mux has been switched to PERIPHERAL controller;
+ 'host' - mux has been switched to HOST controller.
+ For write:
+ 'peripheral' - mux will be switched to PERIPHERAL controller;
+ 'host' - mux will be switched to HOST controller.
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 8689dcb..328916e 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -148,6 +148,8 @@ endif # USB
source "drivers/usb/phy/Kconfig"
+source "drivers/usb/mux/Kconfig"
+
source "drivers/usb/gadget/Kconfig"
config USB_LED_TRIG
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index dca7856..9a92338 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -6,6 +6,7 @@
obj-$(CONFIG_USB) += core/
obj-$(CONFIG_USB_SUPPORT) += phy/
+obj-$(CONFIG_USB_SUPPORT) += mux/
obj-$(CONFIG_USB_DWC3) += dwc3/
obj-$(CONFIG_USB_DWC2) += dwc2/
diff --git a/drivers/usb/mux/Kconfig b/drivers/usb/mux/Kconfig
new file mode 100644
index 0000000..ba778f2
--- /dev/null
+++ b/drivers/usb/mux/Kconfig
@@ -0,0 +1,8 @@
+#
+# USB port mux driver configuration
+#
+
+menuconfig USB_PORTMUX
+ bool "USB dual role port MUX support"
+ help
+ Generic USB dual role port mux support.
diff --git a/drivers/usb/mux/Makefile b/drivers/usb/mux/Makefile
new file mode 100644
index 0000000..f85df92
--- /dev/null
+++ b/drivers/usb/mux/Makefile
@@ -0,0 +1,4 @@
+#
+# Makefile for USB port mux drivers
+#
+obj-$(CONFIG_USB_PORTMUX) += portmux-core.o
diff --git a/drivers/usb/mux/portmux-core.c b/drivers/usb/mux/portmux-core.c
new file mode 100644
index 0000000..75fbb45
--- /dev/null
+++ b/drivers/usb/mux/portmux-core.c
@@ -0,0 +1,202 @@
+/**
+ * portmux-core.c - USB Port Mux support
+ *
+ * Copyright (C) 2016 Intel Corporation
+ *
+ * Author: Lu Baolu <baolu.lu@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/usb/portmux.h>
+
+static int usb_mux_change_state(struct portmux_dev *pdev,
+ enum portmux_role role)
+{
+ struct device *dev = &pdev->dev;
+ int ret = -EINVAL;
+
+ dev_WARN_ONCE(dev,
+ !mutex_is_locked(&pdev->mux_mutex),
+ "mutex is unlocked\n");
+
+ switch (role) {
+ case PORTMUX_HOST:
+ if (pdev->desc->ops->set_host_cb)
+ ret = pdev->desc->ops->set_host_cb(pdev->dev.parent);
+ break;
+ case PORTMUX_DEVICE:
+ if (pdev->desc->ops->set_device_cb)
+ ret = pdev->desc->ops->set_device_cb(pdev->dev.parent);
+ break;
+ default:
+ break;
+ }
+
+ if (!ret)
+ pdev->mux_state = role;
+
+ return ret;
+}
+
+static const char * const role_name[] = {
+ "unknown", /* PORTMUX_UNKNOWN */
+ "host", /* PORTMUX_HOST */
+ "peripheral" /* PORTMUX_DEVICE */
+};
+
+static ssize_t state_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct portmux_dev *pdev = dev_get_drvdata(dev);
+
+ return sprintf(buf, "%s\n", role_name[pdev->mux_state]);
+}
+
+static ssize_t state_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct portmux_dev *pdev = dev_get_drvdata(dev);
+ enum portmux_role role;
+
+ if (sysfs_streq(buf, "peripheral"))
+ role = PORTMUX_DEVICE;
+ else if (sysfs_streq(buf, "host"))
+ role = PORTMUX_HOST;
+ else
+ return -EINVAL;
+
+ mutex_lock(&pdev->mux_mutex);
+ usb_mux_change_state(pdev, role);
+ mutex_unlock(&pdev->mux_mutex);
+
+ return count;
+}
+static DEVICE_ATTR_RW(state);
+
+static ssize_t name_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct portmux_dev *pdev = dev_get_drvdata(dev);
+
+ return sprintf(buf, "%s\n", pdev->desc->name);
+}
+static DEVICE_ATTR_RO(name);
+
+static struct attribute *portmux_attrs[] = {
+ &dev_attr_state.attr,
+ &dev_attr_name.attr,
+ NULL,
+};
+
+static struct attribute_group portmux_attr_grp = {
+ .attrs = portmux_attrs,
+};
+
+static const struct attribute_group *portmux_group[] = {
+ &portmux_attr_grp,
+ NULL,
+};
+
+static void portmux_dev_release(struct device *dev)
+{
+ dev_vdbg(dev, "%s\n", __func__);
+}
+
+/**
+ * portmux_register - register a port mux
+ * @dev: device the mux belongs to
+ * @desc: the descriptor of this port mux
+ *
+ * Called by port mux drivers to register a mux. Returns a valid
+ * pointer to struct portmux_dev on success or an ERR_PTR() on
+ * error.
+ */
+struct portmux_dev *portmux_register(struct portmux_desc *desc)
+{
+ static atomic_t portmux_no = ATOMIC_INIT(-1);
+ struct portmux_dev *pdev;
+ int ret;
+
+ /* parameter sanity check */
+ if (!desc || !desc->name || !desc->ops || !desc->dev)
+ return ERR_PTR(-EINVAL);
+
+ pdev = kzalloc(sizeof(*pdev), GFP_KERNEL);
+ if (!pdev)
+ return ERR_PTR(-ENOMEM);
+
+ mutex_init(&pdev->mux_mutex);
+ pdev->desc = desc;
+ pdev->dev.parent = desc->dev;
+ pdev->dev.release = portmux_dev_release;
+ dev_set_name(&pdev->dev, "portmux.%lu",
+ (unsigned long)atomic_inc_return(&portmux_no));
+ pdev->dev.groups = portmux_group;
+ ret = device_register(&pdev->dev);
+ if (ret) {
+ kfree(pdev);
+ return ERR_PTR(ret);
+ }
+
+ dev_set_drvdata(&pdev->dev, pdev);
+
+ return pdev;
+}
+EXPORT_SYMBOL_GPL(portmux_register);
+
+/**
+ * portmux_unregister - unregister a port mux
+ * @pdev: the port mux device
+ *
+ * Called by port mux drivers to release a mux.
+ */
+void portmux_unregister(struct portmux_dev *pdev)
+{
+ device_unregister(&pdev->dev);
+ kfree(pdev);
+}
+EXPORT_SYMBOL_GPL(portmux_unregister);
+
+/**
+ * portmux_switch - switch the port role
+ * @pdev: the port mux device
+ * @role: the target role
+ *
+ * Called by other components to switch the port role.
+ */
+int portmux_switch(struct portmux_dev *pdev, enum portmux_role role)
+{
+ int ret;
+
+ mutex_lock(&pdev->mux_mutex);
+ ret = usb_mux_change_state(pdev, role);
+ mutex_unlock(&pdev->mux_mutex);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(portmux_switch);
+
+#ifdef CONFIG_PM_SLEEP
+/**
+ * portmux_complete - refresh port state during system resumes back
+ * @pdev: the port mux device
+ *
+ * Called by port mux drivers to refresh port state during system
+ * resumes back.
+ */
+void portmux_complete(struct portmux_dev *pdev)
+{
+ mutex_lock(&pdev->mux_mutex);
+ usb_mux_change_state(pdev, pdev->mux_state);
+ mutex_unlock(&pdev->mux_mutex);
+}
+EXPORT_SYMBOL_GPL(portmux_complete);
+#endif
diff --git a/include/linux/usb/portmux.h b/include/linux/usb/portmux.h
new file mode 100644
index 0000000..093620a
--- /dev/null
+++ b/include/linux/usb/portmux.h
@@ -0,0 +1,90 @@
+/**
+ * portmux.h - USB Port Mux definitions
+ *
+ * Copyright (C) 2016 Intel Corporation
+ *
+ * Author: Lu Baolu <baolu.lu@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __LINUX_USB_PORTMUX_H
+#define __LINUX_USB_PORTMUX_H
+
+#include <linux/device.h>
+
+/**
+ * struct portmux_ops - ops two switch the port
+ *
+ * @set_host_cb: callback for switching port to host
+ * @set_device_cb: callback for switching port to device
+ */
+struct portmux_ops {
+ int (*set_host_cb)(struct device *dev);
+ int (*set_device_cb)(struct device *dev);
+};
+
+/**
+ * struct portmux_desc - port mux device descriptor
+ *
+ * @name: the name of the mux device
+ * @dev: the parent of the mux device
+ * @ops: ops to switch the port role
+ */
+struct portmux_desc {
+ const char *name;
+ struct device *dev;
+ const struct portmux_ops *ops;
+};
+
+/**
+ * enum portmux_role - role of the port
+ */
+enum portmux_role {
+ PORTMUX_UNKNOWN,
+ PORTMUX_HOST,
+ PORTMUX_DEVICE,
+};
+
+/**
+ * struct portmux_dev - A mux device
+ *
+ * @desc: the descriptor of the mux
+ * @dev: device of this mux
+ * @mux_mutex: lock to serialize port switch operation
+ * @mux_state: state of the mux
+ */
+struct portmux_dev {
+ const struct portmux_desc *desc;
+ struct device dev;
+
+ /* lock for mux_state */
+ struct mutex mux_mutex;
+ enum portmux_role mux_state;
+};
+
+/*
+ * Functions for mux driver
+ */
+struct portmux_dev *portmux_register(struct portmux_desc *desc);
+void portmux_unregister(struct portmux_dev *pdev);
+#ifdef CONFIG_PM_SLEEP
+void portmux_complete(struct portmux_dev *pdev);
+#endif
+
+/*
+ * Functions for mux consumer
+ */
+#if defined(CONFIG_USB_PORTMUX)
+int portmux_switch(struct portmux_dev *pdev, enum portmux_role role);
+#else
+static inline int portmux_switch(struct portmux_dev *pdev,
+ enum portmux_role role)
+{
+ return 0;
+}
+#endif
+
+#endif /* __LINUX_USB_PORTMUX_H */
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v9 3/7] usb: mux: add driver for Intel gpio controlled port mux
2016-05-30 5:51 [PATCH v9 0/7] usb: add support for Intel dual role port mux Lu Baolu
2016-05-30 5:51 ` [PATCH v9 1/7] regulator: fixed: add support for ACPI interface Lu Baolu
2016-05-30 5:51 ` [PATCH v9 2/7] usb: mux: add generic code for dual role port mux Lu Baolu
@ 2016-05-30 5:51 ` Lu Baolu
2016-05-30 5:51 ` [PATCH v9 4/7] usb: mux: add driver for Intel drcfg " Lu Baolu
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Lu Baolu @ 2016-05-30 5:51 UTC (permalink / raw)
To: Greg Kroah-Hartman, felipe.balbi, Mathias Nyman, Lee Jones,
Heikki Krogerus, Liam Girdwood, Mark Brown
Cc: linux-usb, linux-kernel, Lu Baolu, David Cohen
In some Intel platforms, a single usb port is shared between USB host
and device controller. The shared port is under control of GPIO pins.
This patch adds the support for USB GPIO controlled port mux.
[baolu: removed .owner per platform_no_drv_owner.cocci]
[baolu: extcon usage reviewed by Chanwoo Choi]
Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Felipe Balbi <balbi@kernel.org>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/usb/mux/Kconfig | 13 +++
drivers/usb/mux/Makefile | 1 +
drivers/usb/mux/portmux-intel-gpio.c | 183 +++++++++++++++++++++++++++++++++++
3 files changed, 197 insertions(+)
create mode 100644 drivers/usb/mux/portmux-intel-gpio.c
diff --git a/drivers/usb/mux/Kconfig b/drivers/usb/mux/Kconfig
index ba778f2..41b0f72 100644
--- a/drivers/usb/mux/Kconfig
+++ b/drivers/usb/mux/Kconfig
@@ -6,3 +6,16 @@ menuconfig USB_PORTMUX
bool "USB dual role port MUX support"
help
Generic USB dual role port mux support.
+
+if USB_PORTMUX
+
+config INTEL_MUX_GPIO
+tristate "Intel dual role port mux controlled by GPIOs"
+ depends on GPIOLIB
+ depends on REGULATOR
+ depends on X86 && ACPI
+ help
+ Say Y here to enable support for Intel dual role port mux
+ controlled by GPIOs.
+
+endif
diff --git a/drivers/usb/mux/Makefile b/drivers/usb/mux/Makefile
index f85df92..4eb5582 100644
--- a/drivers/usb/mux/Makefile
+++ b/drivers/usb/mux/Makefile
@@ -2,3 +2,4 @@
# Makefile for USB port mux drivers
#
obj-$(CONFIG_USB_PORTMUX) += portmux-core.o
+obj-$(CONFIG_INTEL_MUX_GPIO) += portmux-intel-gpio.o
diff --git a/drivers/usb/mux/portmux-intel-gpio.c b/drivers/usb/mux/portmux-intel-gpio.c
new file mode 100644
index 0000000..cada490
--- /dev/null
+++ b/drivers/usb/mux/portmux-intel-gpio.c
@@ -0,0 +1,183 @@
+/*
+ * USB Dual Role Port Mux driver controlled by gpios
+ *
+ * Copyright (c) 2016, Intel Corporation.
+ * Author: David Cohen <david.a.cohen@linux.intel.com>
+ * Author: Lu Baolu <baolu.lu@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/module.h>
+#include <linux/extcon.h>
+#include <linux/gpio/consumer.h>
+#include <linux/platform_device.h>
+#include <linux/usb/portmux.h>
+#include <linux/regulator/consumer.h>
+
+struct vuport {
+ struct extcon_dev *edev;
+ struct notifier_block nb;
+ struct portmux_desc desc;
+ struct portmux_dev *pdev;
+ struct regulator *regulator;
+ struct gpio_desc *gpio_usb_mux;
+};
+
+/*
+ * id == 0, HOST connected, USB port should be set to peripheral
+ * id == 1, HOST disconnected, USB port should be set to host
+ *
+ * Peripheral: set USB mux to peripheral and disable VBUS
+ * Host: set USB mux to host and enable VBUS
+ */
+static inline int vuport_set_port(struct device *dev, int id)
+{
+ struct vuport *vup;
+
+ dev_dbg(dev, "USB PORT ID: %s\n", id ? "HOST" : "PERIPHERAL");
+
+ vup = dev_get_drvdata(dev);
+
+ gpiod_set_value_cansleep(vup->gpio_usb_mux, !id);
+
+ if (!id ^ regulator_is_enabled(vup->regulator))
+ return id ? regulator_disable(vup->regulator) :
+ regulator_enable(vup->regulator);
+
+ return 0;
+}
+
+static int vuport_cable_set(struct device *dev)
+{
+ return vuport_set_port(dev, 1);
+}
+
+static int vuport_cable_unset(struct device *dev)
+{
+ return vuport_set_port(dev, 0);
+}
+
+static const struct portmux_ops vuport_ops = {
+ .set_host_cb = vuport_cable_set,
+ .set_device_cb = vuport_cable_unset,
+};
+
+static int vuport_notifier(struct notifier_block *nb,
+ unsigned long event, void *ptr)
+{
+ struct vuport *vup;
+ int state;
+
+ vup = container_of(nb, struct vuport, nb);
+ state = extcon_get_cable_state_(vup->edev, EXTCON_USB_HOST);
+ if (state < 0)
+ return state;
+
+ return portmux_switch(vup->pdev, state ? PORTMUX_HOST : PORTMUX_DEVICE);
+}
+
+static int vuport_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct vuport *vup;
+ int ret;
+
+ vup = devm_kzalloc(dev, sizeof(*vup), GFP_KERNEL);
+ if (!vup)
+ return -ENOMEM;
+
+ vup->regulator = devm_regulator_get_exclusive(dev,
+ "regulator-usb-gpio");
+ if (IS_ERR_OR_NULL(vup->regulator))
+ return -EPROBE_DEFER;
+
+ vup->edev = extcon_get_extcon_dev("extcon-usb-gpio");
+ if (IS_ERR_OR_NULL(vup->edev))
+ return -EPROBE_DEFER;
+
+ vup->gpio_usb_mux = devm_gpiod_get_optional(dev,
+ "usb_mux", GPIOD_ASIS);
+ if (IS_ERR(vup->gpio_usb_mux))
+ return PTR_ERR(vup->gpio_usb_mux);
+
+ vup->desc.dev = dev;
+ vup->desc.name = "intel-mux-gpio";
+ vup->desc.ops = &vuport_ops;
+ dev_set_drvdata(dev, vup);
+ vup->pdev = portmux_register(&vup->desc);
+ if (IS_ERR(vup->pdev))
+ return PTR_ERR(vup->pdev);
+
+ vup->nb.notifier_call = vuport_notifier;
+ ret = extcon_register_notifier(vup->edev, EXTCON_USB_HOST,
+ &vup->nb);
+ if (ret < 0) {
+ portmux_unregister(vup->pdev);
+ return ret;
+ }
+
+ vuport_notifier(&vup->nb, 0, NULL);
+
+ return 0;
+}
+
+static int vuport_remove(struct platform_device *pdev)
+{
+ struct vuport *vup;
+
+ vup = platform_get_drvdata(pdev);
+ extcon_unregister_notifier(vup->edev, EXTCON_USB_HOST, &vup->nb);
+ portmux_unregister(vup->pdev);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+/*
+ * In case a micro A cable was plugged in while device was sleeping,
+ * we missed the interrupt. We need to poll usb id gpio when waking the
+ * driver to detect the missed event.
+ * We use 'complete' callback to give time to all extcon listeners to
+ * resume before we send new events.
+ */
+static void vuport_complete(struct device *dev)
+{
+ struct vuport *vup;
+
+ vup = dev_get_drvdata(dev);
+ vuport_notifier(&vup->nb, 0, NULL);
+}
+
+static const struct dev_pm_ops vuport_pm_ops = {
+ .complete = vuport_complete,
+};
+#endif
+
+static const struct platform_device_id vuport_platform_ids[] = {
+ { .name = "intel-mux-gpio", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, vuport_platform_ids);
+
+static struct platform_driver vuport_driver = {
+ .driver = {
+ .name = "intel-mux-gpio",
+#ifdef CONFIG_PM_SLEEP
+ .pm = &vuport_pm_ops,
+#endif
+ },
+ .probe = vuport_probe,
+ .remove = vuport_remove,
+ .id_table = vuport_platform_ids,
+};
+
+module_platform_driver(vuport_driver);
+
+MODULE_AUTHOR("David Cohen <david.a.cohen@linux.intel.com>");
+MODULE_AUTHOR("Lu Baolu <baolu.lu@linux.intel.com>");
+MODULE_DESCRIPTION("Intel USB gpio mux driver");
+MODULE_LICENSE("GPL v2");
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v9 4/7] usb: mux: add driver for Intel drcfg controlled port mux
2016-05-30 5:51 [PATCH v9 0/7] usb: add support for Intel dual role port mux Lu Baolu
` (2 preceding siblings ...)
2016-05-30 5:51 ` [PATCH v9 3/7] usb: mux: add driver for Intel gpio controlled " Lu Baolu
@ 2016-05-30 5:51 ` Lu Baolu
2016-05-30 5:51 ` [PATCH v9 5/7] mfd: intel_vuport: Add Intel virtual USB port MFD Driver Lu Baolu
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Lu Baolu @ 2016-05-30 5:51 UTC (permalink / raw)
To: Greg Kroah-Hartman, felipe.balbi, Mathias Nyman, Lee Jones,
Heikki Krogerus, Liam Girdwood, Mark Brown
Cc: linux-usb, linux-kernel, Lu Baolu, Wu Hao
Several Intel PCHs and SOCs have an internal mux that is used to
share one USB port between device controller and host controller.
The mux is handled through the Dual Role Configuration Register.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Wu Hao <hao.wu@intel.com>
Reviewed-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/mux/Kconfig | 7 ++
drivers/usb/mux/Makefile | 1 +
drivers/usb/mux/portmux-intel-drcfg.c | 162 ++++++++++++++++++++++++++++++++++
3 files changed, 170 insertions(+)
create mode 100644 drivers/usb/mux/portmux-intel-drcfg.c
diff --git a/drivers/usb/mux/Kconfig b/drivers/usb/mux/Kconfig
index 41b0f72..98b54d2 100644
--- a/drivers/usb/mux/Kconfig
+++ b/drivers/usb/mux/Kconfig
@@ -18,4 +18,11 @@ tristate "Intel dual role port mux controlled by GPIOs"
Say Y here to enable support for Intel dual role port mux
controlled by GPIOs.
+config INTEL_MUX_DRCFG
+ tristate "Intel dual role port mux controlled by register"
+ depends on X86
+ help
+ Say Y here to enable support for Intel dual role port mux
+ controlled by the Dual Role Configuration Register.
+
endif
diff --git a/drivers/usb/mux/Makefile b/drivers/usb/mux/Makefile
index 4eb5582..0f102b5 100644
--- a/drivers/usb/mux/Makefile
+++ b/drivers/usb/mux/Makefile
@@ -3,3 +3,4 @@
#
obj-$(CONFIG_USB_PORTMUX) += portmux-core.o
obj-$(CONFIG_INTEL_MUX_GPIO) += portmux-intel-gpio.o
+obj-$(CONFIG_INTEL_MUX_DRCFG) += portmux-intel-drcfg.o
diff --git a/drivers/usb/mux/portmux-intel-drcfg.c b/drivers/usb/mux/portmux-intel-drcfg.c
new file mode 100644
index 0000000..67b11d2
--- /dev/null
+++ b/drivers/usb/mux/portmux-intel-drcfg.c
@@ -0,0 +1,162 @@
+/**
+ * intel-mux-drcfg.c - Driver for Intel USB mux via register
+ *
+ * Copyright (C) 2016 Intel Corporation
+ * Author: Heikki Krogerus <heikki.krogerus@linux.intel.com>
+ * Author: Lu Baolu <baolu.lu@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/property.h>
+#include <linux/platform_device.h>
+#include <linux/usb.h>
+#include <linux/usb/portmux.h>
+
+#define INTEL_MUX_CFG0 0x00
+#define CFG0_SW_IDPIN BIT(20)
+#define CFG0_SW_IDPIN_EN BIT(21)
+#define CFG0_SW_VBUS_VALID BIT(24)
+
+struct intel_mux_drcfg {
+ struct portmux_desc desc;
+ struct device *dev;
+ void __iomem *regs;
+ struct portmux_dev *pdev;
+};
+
+static inline int intel_mux_drcfg_switch(struct device *dev, bool host)
+{
+ u32 data;
+ struct intel_mux_drcfg *mux;
+
+ mux = dev_get_drvdata(dev);
+
+ /* Check and set mux to SW controlled mode */
+ data = readl(mux->regs + INTEL_MUX_CFG0);
+ if (!(data & CFG0_SW_IDPIN_EN)) {
+ data |= CFG0_SW_IDPIN_EN;
+ writel(data, mux->regs + INTEL_MUX_CFG0);
+ }
+
+ /*
+ * Configure CFG0 to switch the mux and VBUS_VALID bit is
+ * required for device mode.
+ */
+ data = readl(mux->regs + INTEL_MUX_CFG0);
+ if (host)
+ data &= ~(CFG0_SW_IDPIN | CFG0_SW_VBUS_VALID);
+ else
+ data |= (CFG0_SW_IDPIN | CFG0_SW_VBUS_VALID);
+ writel(data, mux->regs + INTEL_MUX_CFG0);
+
+ return 0;
+}
+
+static int intel_mux_drcfg_set_host(struct device *dev)
+{
+ dev_dbg(dev, "drcfg mux switch to HOST\n");
+
+ return intel_mux_drcfg_switch(dev, true);
+}
+
+static int intel_mux_drcfg_set_device(struct device *dev)
+{
+ dev_dbg(dev, "drcfg mux switch to DEVICE\n");
+
+ return intel_mux_drcfg_switch(dev, false);
+}
+
+static const struct portmux_ops drcfg_ops = {
+ .set_host_cb = intel_mux_drcfg_set_host,
+ .set_device_cb = intel_mux_drcfg_set_device,
+};
+
+static int intel_mux_drcfg_probe(struct platform_device *pdev)
+{
+ struct intel_mux_drcfg *mux;
+ struct device *dev = &pdev->dev;
+ u64 start, size;
+ int ret;
+
+ mux = devm_kzalloc(dev, sizeof(*mux), GFP_KERNEL);
+ if (!mux)
+ return -ENOMEM;
+
+ ret = device_property_read_u64(dev, "reg-start", &start);
+ ret |= device_property_read_u64(dev, "reg-size", &size);
+ if (ret)
+ return -ENODEV;
+
+ mux->regs = devm_ioremap_nocache(dev, start, size);
+ if (!mux->regs)
+ return -ENOMEM;
+
+ mux->desc.dev = dev;
+ mux->desc.name = "intel-mux-drcfg";
+ mux->desc.ops = &drcfg_ops;
+ dev_set_drvdata(dev, mux);
+ mux->pdev = portmux_register(&mux->desc);
+
+ return PTR_ERR_OR_ZERO(mux->pdev);
+}
+
+static int intel_mux_drcfg_remove(struct platform_device *pdev)
+{
+ struct intel_mux_drcfg *mux;
+
+ mux = platform_get_drvdata(pdev);
+ portmux_unregister(mux->pdev);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+/*
+ * In case a micro A cable was plugged in while device was sleeping,
+ * we missed the interrupt. We need to poll usb id state when waking
+ * the driver to detect the missed event.
+ * We use 'complete' callback to give time to all extcon listeners to
+ * resume before we send new events.
+ */
+static void intel_mux_drcfg_complete(struct device *dev)
+{
+ struct intel_mux_drcfg *mux;
+
+ mux = dev_get_drvdata(dev);
+ portmux_complete(mux->pdev);
+}
+
+static const struct dev_pm_ops intel_mux_drcfg_pm_ops = {
+ .complete = intel_mux_drcfg_complete,
+};
+#endif
+
+static const struct platform_device_id intel_mux_drcfg_platform_ids[] = {
+ { .name = "intel-mux-drcfg", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, intel_mux_drcfg_platform_ids);
+
+static struct platform_driver intel_mux_drcfg_driver = {
+ .probe = intel_mux_drcfg_probe,
+ .remove = intel_mux_drcfg_remove,
+ .driver = {
+ .name = "intel-mux-drcfg",
+#ifdef CONFIG_PM_SLEEP
+ .pm = &intel_mux_drcfg_pm_ops,
+#endif
+ },
+ .id_table = intel_mux_drcfg_platform_ids,
+};
+
+module_platform_driver(intel_mux_drcfg_driver);
+
+MODULE_AUTHOR("Heikki Krogerus <heikki.krogerus@linux.intel.com>");
+MODULE_AUTHOR("Lu Baolu <baolu.lu@linux.intel.com>");
+MODULE_DESCRIPTION("Intel USB drcfg mux driver");
+MODULE_LICENSE("GPL v2");
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v9 5/7] mfd: intel_vuport: Add Intel virtual USB port MFD Driver
2016-05-30 5:51 [PATCH v9 0/7] usb: add support for Intel dual role port mux Lu Baolu
` (3 preceding siblings ...)
2016-05-30 5:51 ` [PATCH v9 4/7] usb: mux: add driver for Intel drcfg " Lu Baolu
@ 2016-05-30 5:51 ` Lu Baolu
2016-05-30 5:51 ` [PATCH v9 6/7] usb: pci-quirks: add Intel USB drcfg mux device Lu Baolu
2016-05-30 5:51 ` [PATCH v9 7/7] MAINTAINERS: add maintainer entry for Intel USB dual role mux drivers Lu Baolu
6 siblings, 0 replies; 11+ messages in thread
From: Lu Baolu @ 2016-05-30 5:51 UTC (permalink / raw)
To: Greg Kroah-Hartman, felipe.balbi, Mathias Nyman, Lee Jones,
Heikki Krogerus, Liam Girdwood, Mark Brown
Cc: linux-usb, linux-kernel, Lu Baolu
Some Intel platforms have an USB port mux controlled by GPIOs.
There's a single ACPI platform device that provides 1) USB ID
extcon device; 2) USB vbus regulator device; and 3) USB port
switch device. This MFD driver will split these 3 devices for
their respective drivers.
[baolu: removed .owner per platform_no_drv_owner.cocci]
Suggested-by: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Felipe Balbi <balbi@kernel.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/Kconfig | 8 +++++
drivers/mfd/Makefile | 1 +
drivers/mfd/intel-vuport.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 95 insertions(+)
create mode 100644 drivers/mfd/intel-vuport.c
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 1bcf601..94affb3 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1603,5 +1603,13 @@ config MFD_VEXPRESS_SYSREG
System Registers are the platform configuration block
on the ARM Ltd. Versatile Express board.
+config MFD_INTEL_VUPORT
+ tristate "Intel virtual USB port controller"
+ select MFD_CORE
+ depends on X86 && ACPI
+ help
+ Say Y here to enable support for Intel's dual role port mux
+ controlled by GPIOs.
+
endmenu
endif
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 42a66e1..b86d4f9 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -205,3 +205,4 @@ intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
intel-soc-pmic-$(CONFIG_INTEL_PMC_IPC) += intel_soc_pmic_bxtwc.o
obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
obj-$(CONFIG_MFD_MT6397) += mt6397-core.o
+obj-$(CONFIG_MFD_INTEL_VUPORT) += intel-vuport.o
diff --git a/drivers/mfd/intel-vuport.c b/drivers/mfd/intel-vuport.c
new file mode 100644
index 0000000..eb27a8f
--- /dev/null
+++ b/drivers/mfd/intel-vuport.c
@@ -0,0 +1,86 @@
+/*
+ * MFD driver for Intel virtual USB port
+ *
+ * Copyright(c) 2016 Intel Corporation.
+ * Author: Lu Baolu <baolu.lu@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/module.h>
+#include <linux/gpio.h>
+#include <linux/mfd/core.h>
+#include <linux/property.h>
+#include <linux/platform_device.h>
+
+/* ACPI GPIO Mappings */
+static const struct acpi_gpio_params id_gpio = { 0, 0, false };
+static const struct acpi_gpio_params vbus_gpio = { 1, 0, false };
+static const struct acpi_gpio_params mux_gpio = { 2, 0, false };
+static const struct acpi_gpio_mapping acpi_usb_gpios[] = {
+ { "id-gpios", &id_gpio, 1 },
+ { "gpio-gpios", &vbus_gpio, 1 },
+ { "usb_mux-gpios", &mux_gpio, 1 },
+ { },
+};
+
+static struct property_entry reg_properties[] = {
+ PROPERTY_ENTRY_STRING("supply-name", "regulator-usb-gpio"),
+ { },
+};
+
+static const struct mfd_cell intel_vuport_mfd_cells[] = {
+ { .name = "extcon-usb-gpio", },
+ {
+ .name = "reg-fixed-voltage",
+ .properties = reg_properties,
+ },
+ { .name = "intel-mux-gpio", },
+};
+
+static int vuport_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ int ret;
+
+ ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev), acpi_usb_gpios);
+ if (ret)
+ return ret;
+
+ return mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE,
+ intel_vuport_mfd_cells,
+ ARRAY_SIZE(intel_vuport_mfd_cells), NULL, 0,
+ NULL);
+}
+
+static int vuport_remove(struct platform_device *pdev)
+{
+ mfd_remove_devices(&pdev->dev);
+ acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pdev->dev));
+
+ return 0;
+}
+
+static struct acpi_device_id vuport_acpi_match[] = {
+ { "INT3496" },
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, vuport_acpi_match);
+
+static struct platform_driver vuport_driver = {
+ .driver = {
+ .name = "intel-vuport",
+ .acpi_match_table = ACPI_PTR(vuport_acpi_match),
+ },
+ .probe = vuport_probe,
+ .remove = vuport_remove,
+};
+
+module_platform_driver(vuport_driver);
+
+MODULE_AUTHOR("Lu Baolu <baolu.lu@linux.intel.com>");
+MODULE_DESCRIPTION("Intel virtual USB port");
+MODULE_LICENSE("GPL v2");
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v9 6/7] usb: pci-quirks: add Intel USB drcfg mux device
2016-05-30 5:51 [PATCH v9 0/7] usb: add support for Intel dual role port mux Lu Baolu
` (4 preceding siblings ...)
2016-05-30 5:51 ` [PATCH v9 5/7] mfd: intel_vuport: Add Intel virtual USB port MFD Driver Lu Baolu
@ 2016-05-30 5:51 ` Lu Baolu
2016-05-30 5:51 ` [PATCH v9 7/7] MAINTAINERS: add maintainer entry for Intel USB dual role mux drivers Lu Baolu
6 siblings, 0 replies; 11+ messages in thread
From: Lu Baolu @ 2016-05-30 5:51 UTC (permalink / raw)
To: Greg Kroah-Hartman, felipe.balbi, Mathias Nyman, Lee Jones,
Heikki Krogerus, Liam Girdwood, Mark Brown
Cc: linux-usb, linux-kernel, Lu Baolu
In some Intel platforms, a single usb port is shared between USB host
and device controllers. The shared port is under control of a switch
which is defined in the Intel vendor defined extended capability for
xHCI.
This patch adds the support to detect and create the platform device
for the port mux switch.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Felipe Balbi <balbi@kernel.org>
---
drivers/usb/host/pci-quirks.c | 42 +++++++++++++++++++++++++++++++++++++++-
drivers/usb/host/xhci-ext-caps.h | 2 ++
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 35af362..7e3194f 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -16,6 +16,8 @@
#include <linux/export.h>
#include <linux/acpi.h>
#include <linux/dmi.h>
+#include <linux/platform_device.h>
+
#include "pci-quirks.h"
#include "xhci-ext-caps.h"
@@ -78,6 +80,9 @@
#define USB_INTEL_USB3_PSSEN 0xD8
#define USB_INTEL_USB3PRM 0xDC
+#define DEVICE_ID_INTEL_BROXTON_P_XHCI 0x5aa8
+#define DEVICE_ID_INTEL_CHERRYVIEW_XHCI 0x22b5
+
/*
* amd_chipset_gen values represent AMD different chipset generations
*/
@@ -956,6 +961,36 @@ void usb_disable_xhci_ports(struct pci_dev *xhci_pdev)
}
EXPORT_SYMBOL_GPL(usb_disable_xhci_ports);
+static void create_intel_usb_mux_device(struct pci_dev *xhci_pdev,
+ void __iomem *base)
+{
+ int ret;
+ struct platform_device *plat_dev;
+ struct property_entry pentry[] = {
+ PROPERTY_ENTRY_U64("reg-start",
+ pci_resource_start(xhci_pdev, 0) + 0x80d8),
+ PROPERTY_ENTRY_U64("reg-size", 8),
+ { },
+ };
+
+ if (!xhci_find_next_ext_cap(base, 0, XHCI_EXT_CAPS_INTEL_USB_MUX))
+ return;
+
+ plat_dev = platform_device_alloc("intel-mux-drcfg",
+ PLATFORM_DEVID_NONE);
+ if (!plat_dev)
+ return;
+
+ plat_dev->dev.parent = &xhci_pdev->dev;
+ platform_device_add_properties(plat_dev, pentry);
+ ret = platform_device_add(plat_dev);
+ if (ret) {
+ dev_warn(&xhci_pdev->dev,
+ "failed to create mux device with error %d", ret);
+ platform_device_put(plat_dev);
+ }
+}
+
/**
* PCI Quirks for xHCI.
*
@@ -1022,9 +1057,14 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
writel(val, base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);
hc_init:
- if (pdev->vendor == PCI_VENDOR_ID_INTEL)
+ if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
usb_enable_intel_xhci_ports(pdev);
+ if (pdev->device == DEVICE_ID_INTEL_BROXTON_P_XHCI ||
+ pdev->device == DEVICE_ID_INTEL_CHERRYVIEW_XHCI)
+ create_intel_usb_mux_device(pdev, base);
+ }
+
op_reg_base = base + XHCI_HC_LENGTH(readl(base));
/* Wait for the host controller to be ready before writing any
diff --git a/drivers/usb/host/xhci-ext-caps.h b/drivers/usb/host/xhci-ext-caps.h
index e0244fb..e368ccb 100644
--- a/drivers/usb/host/xhci-ext-caps.h
+++ b/drivers/usb/host/xhci-ext-caps.h
@@ -51,6 +51,8 @@
#define XHCI_EXT_CAPS_ROUTE 5
/* IDs 6-9 reserved */
#define XHCI_EXT_CAPS_DEBUG 10
+/* Vendor defined 192-255 */
+#define XHCI_EXT_CAPS_INTEL_USB_MUX 192
/* USB Legacy Support Capability - section 7.1.1 */
#define XHCI_HC_BIOS_OWNED (1 << 16)
#define XHCI_HC_OS_OWNED (1 << 24)
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v9 7/7] MAINTAINERS: add maintainer entry for Intel USB dual role mux drivers
2016-05-30 5:51 [PATCH v9 0/7] usb: add support for Intel dual role port mux Lu Baolu
` (5 preceding siblings ...)
2016-05-30 5:51 ` [PATCH v9 6/7] usb: pci-quirks: add Intel USB drcfg mux device Lu Baolu
@ 2016-05-30 5:51 ` Lu Baolu
2016-05-30 8:16 ` Heikki Krogerus
6 siblings, 1 reply; 11+ messages in thread
From: Lu Baolu @ 2016-05-30 5:51 UTC (permalink / raw)
To: Greg Kroah-Hartman, felipe.balbi, Mathias Nyman, Lee Jones,
Heikki Krogerus, Liam Girdwood, Mark Brown
Cc: linux-usb, linux-kernel, Lu Baolu
Add a maintainer entry for Intel USB dual role mux drivers and
add myself as a maintainer.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
MAINTAINERS | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index ed1229e..edaeebe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5961,6 +5961,16 @@ S: Maintained
F: arch/x86/include/asm/intel_telemetry.h
F: drivers/platform/x86/intel_telemetry*
+INTEL USB DUAL ROLE PORT MUX DRIVERS
+M: Lu Baolu <baolu.lu@linux.intel.com>
+L: linux-usb@vger.kernel.org
+S: Supported
+F: include/linux/usb/portmux.h
+F: drivers/usb/mux/portmux-core.c
+F: drivers/usb/mux/portmux-intel-gpio.c
+F: drivers/usb/mux/portmux-intel-drcfg.c
+F: drivers/mfd/intel-vuport.c
+
IOC3 ETHERNET DRIVER
M: Ralf Baechle <ralf@linux-mips.org>
L: linux-mips@linux-mips.org
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v9 7/7] MAINTAINERS: add maintainer entry for Intel USB dual role mux drivers
2016-05-30 5:51 ` [PATCH v9 7/7] MAINTAINERS: add maintainer entry for Intel USB dual role mux drivers Lu Baolu
@ 2016-05-30 8:16 ` Heikki Krogerus
2016-05-30 12:53 ` Lu Baolu
0 siblings, 1 reply; 11+ messages in thread
From: Heikki Krogerus @ 2016-05-30 8:16 UTC (permalink / raw)
To: Lu Baolu
Cc: Greg Kroah-Hartman, felipe.balbi, Mathias Nyman, Lee Jones,
Liam Girdwood, Mark Brown, linux-usb, linux-kernel
Hi Baolu,
On Mon, May 30, 2016 at 01:51:44PM +0800, Lu Baolu wrote:
> Add a maintainer entry for Intel USB dual role mux drivers and
> add myself as a maintainer.
>
> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
> ---
> MAINTAINERS | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ed1229e..edaeebe 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5961,6 +5961,16 @@ S: Maintained
> F: arch/x86/include/asm/intel_telemetry.h
> F: drivers/platform/x86/intel_telemetry*
>
> +INTEL USB DUAL ROLE PORT MUX DRIVERS
> +M: Lu Baolu <baolu.lu@linux.intel.com>
> +L: linux-usb@vger.kernel.org
> +S: Supported
> +F: include/linux/usb/portmux.h
> +F: drivers/usb/mux/portmux-core.c
> +F: drivers/usb/mux/portmux-intel-gpio.c
> +F: drivers/usb/mux/portmux-intel-drcfg.c
> +F: drivers/mfd/intel-vuport.c
> +
> IOC3 ETHERNET DRIVER
> M: Ralf Baechle <ralf@linux-mips.org>
> L: linux-mips@linux-mips.org
> --
> 2.1.4
This one does not apply on top of v4.7-rc1.
Thanks,
--
heikki
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v9 7/7] MAINTAINERS: add maintainer entry for Intel USB dual role mux drivers
2016-05-30 8:16 ` Heikki Krogerus
@ 2016-05-30 12:53 ` Lu Baolu
2016-06-01 2:44 ` Lu Baolu
0 siblings, 1 reply; 11+ messages in thread
From: Lu Baolu @ 2016-05-30 12:53 UTC (permalink / raw)
To: Heikki Krogerus
Cc: Greg Kroah-Hartman, felipe.balbi, Mathias Nyman, Lee Jones,
Liam Girdwood, Mark Brown, linux-usb, linux-kernel
Hi Heikki,
On 05/30/2016 04:16 PM, Heikki Krogerus wrote:
> Hi Baolu,
>
> On Mon, May 30, 2016 at 01:51:44PM +0800, Lu Baolu wrote:
>> Add a maintainer entry for Intel USB dual role mux drivers and
>> add myself as a maintainer.
>>
>> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
>> ---
>> MAINTAINERS | 10 ++++++++++
>> 1 file changed, 10 insertions(+)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index ed1229e..edaeebe 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -5961,6 +5961,16 @@ S: Maintained
>> F: arch/x86/include/asm/intel_telemetry.h
>> F: drivers/platform/x86/intel_telemetry*
>>
>> +INTEL USB DUAL ROLE PORT MUX DRIVERS
>> +M: Lu Baolu <baolu.lu@linux.intel.com>
>> +L: linux-usb@vger.kernel.org
>> +S: Supported
>> +F: include/linux/usb/portmux.h
>> +F: drivers/usb/mux/portmux-core.c
>> +F: drivers/usb/mux/portmux-intel-gpio.c
>> +F: drivers/usb/mux/portmux-intel-drcfg.c
>> +F: drivers/mfd/intel-vuport.c
>> +
>> IOC3 ETHERNET DRIVER
>> M: Ralf Baechle <ralf@linux-mips.org>
>> L: linux-mips@linux-mips.org
>> --
>> 2.1.4
> This one does not apply on top of v4.7-rc1.
Thanks for pointing this out.
I will send out a rebased version later, but for now I'll wait for further comments.
Best regards,
Lu Baolu
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v9 7/7] MAINTAINERS: add maintainer entry for Intel USB dual role mux drivers
2016-05-30 12:53 ` Lu Baolu
@ 2016-06-01 2:44 ` Lu Baolu
0 siblings, 0 replies; 11+ messages in thread
From: Lu Baolu @ 2016-06-01 2:44 UTC (permalink / raw)
To: Heikki Krogerus
Cc: Greg Kroah-Hartman, felipe.balbi, Mathias Nyman, Lee Jones,
Liam Girdwood, Mark Brown, linux-usb, linux-kernel
Hi,
On 05/30/2016 08:53 PM, Lu Baolu wrote:
> Hi Heikki,
>
> On 05/30/2016 04:16 PM, Heikki Krogerus wrote:
>> Hi Baolu,
>>
>> On Mon, May 30, 2016 at 01:51:44PM +0800, Lu Baolu wrote:
>>> Add a maintainer entry for Intel USB dual role mux drivers and
>>> add myself as a maintainer.
>>>
>>> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
>>> ---
>>> MAINTAINERS | 10 ++++++++++
>>> 1 file changed, 10 insertions(+)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index ed1229e..edaeebe 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -5961,6 +5961,16 @@ S: Maintained
>>> F: arch/x86/include/asm/intel_telemetry.h
>>> F: drivers/platform/x86/intel_telemetry*
>>>
>>> +INTEL USB DUAL ROLE PORT MUX DRIVERS
>>> +M: Lu Baolu <baolu.lu@linux.intel.com>
>>> +L: linux-usb@vger.kernel.org
>>> +S: Supported
>>> +F: include/linux/usb/portmux.h
>>> +F: drivers/usb/mux/portmux-core.c
>>> +F: drivers/usb/mux/portmux-intel-gpio.c
>>> +F: drivers/usb/mux/portmux-intel-drcfg.c
>>> +F: drivers/mfd/intel-vuport.c
>>> +
>>> IOC3 ETHERNET DRIVER
>>> M: Ralf Baechle <ralf@linux-mips.org>
>>> L: linux-mips@linux-mips.org
>>> --
>>> 2.1.4
>> This one does not apply on top of v4.7-rc1.
> Thanks for pointing this out.
>
> I will send out a rebased version later, but for now I'll wait for further comments.
I haven't got further comments by now.
I will send out the rebased version in 24 hrs if no objection.
Best regards,
Lu Baolu
^ permalink raw reply [flat|nested] 11+ messages in thread