usb: add support for Intel dual role port mux

Some Intel platforms have an USB port mux controlled by GPIOs. There's a single ACPI platform device that provides both USB ID extcon device and a USB port mux device. This MFD driver will split the 2 devices for their respective drivers.

Signed-off-by Lu Baolu <[email protected]>

Suggested-by David Cohen <[email protected]>

Reviewed-by Felipe Balbi <[email protected]>

Signed-off-by Fengguang Wu <[email protected]>

---
 MAINTAINERS                |  1 +
 drivers/mfd/Kconfig        |  8 +++++
 drivers/mfd/Makefile       |  1 +
 drivers/mfd/intel-vuport.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 88 insertions(+)
 create mode 100644 drivers/mfd/intel-vuport.c

MAINTAINERS +0 -0

index 399cefe..1671a4d 100644

MAINTAINERS +0 -0

 USB PRINTER DRIVER (usblp)
 M:	Pete Zaitcev <[email protected]>

drivers/mfd/Kconfig +0 -0

index 9ca66de..8dd1bf3 100644

drivers/mfd/Kconfig +2 -0

+	  controlled by 3 GPIOs.
+
 endmenu
 endif

drivers/mfd/Makefile +1 -0

index 0f230a6..0ccd107 100644
@@ -198,3 +198,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

drivers/mfd/intel-vuport.c new file +25 -0

new file mode 100644
index 0000000..1371099
@@ -0,0 +1,78 @@
+/*
+ * MFD driver for Intel virtual USB port
+ *
+ * Copyright(c) 2016 Intel Corporation.
+ * Author: Lu Baolu <[email protected]>
+ *
+ * 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/gpio.h>
+#include <linux/mfd/core.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 },
+	{ "vbus_en-gpios", &vbus_gpio, 1 },
+	{ "usb_mux-gpios", &mux_gpio, 1 },
+	{ },

drivers/mfd/intel-vuport.c new file +42 -0

+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, 0, 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 <[email protected]>");
+MODULE_DESCRIPTION("Intel virtual USB port");
+MODULE_LICENSE("GPL v2");

Quoted 17 lines · Lu Baolu

Some Intel platforms have an USB port mux controlled by GPIOs. There's a single ACPI platform device that provides both USB ID extcon device and a USB port mux device. This MFD driver will split the 2 devices for their respective drivers.

Signed-off-by Lu Baolu <[email protected]>

Suggested-by David Cohen <[email protected]>

Reviewed-by Felipe Balbi <[email protected]>

Signed-off-by Fengguang Wu <[email protected]>

---
 MAINTAINERS                |  1 +
 drivers/mfd/Kconfig        |  8 +++++
 drivers/mfd/Makefile       |  1 +
 drivers/mfd/intel-vuport.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 88 insertions(+)
 create mode 100644 drivers/mfd/intel-vuport.c

MAINTAINERS F: drivers/usb/mux/intel-mux.c · line 11411

Quoted 9 lines

MAINTAINERS +1 -0

index 399cefe..1671a4d 100644
@@ -11408,6 +11408,7 @@ F:	drivers/usb/mux/intel-mux.c
 F:	include/linux/usb/intel-mux.h
 F:	drivers/usb/mux/intel-mux-gpio.c
 F:	drivers/usb/mux/intel-mux-drcfg.c
+F:	drivers/mfd/intel-vuport.c

Separate patch please.

Quoted 11 lines

MAINTAINERS +0 -0

 USB PRINTER DRIVER (usblp)
 M:	Pete Zaitcev <[email protected]>

drivers/mfd/Kconfig +0 -0

index 9ca66de..8dd1bf3 100644
@@ -1534,5 +1534,13 @@ config MFD_VEXPRESS_SYSREG
 	  System Registers are the platform configuration block
 	  on the ARM Ltd. Versatile Express board.
 

drivers/mfd/Kconfig config MFD_VEXPRESS_SYSREG · line 1542

Quoted 6 lines

drivers/mfd/Kconfig +6 -0

+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 dual role port mux

Either "Intel's" or "the Intel".

Quoted 45 lines

drivers/mfd/Kconfig +2 -0

+	  controlled by 3 GPIOs.
+
 endmenu
 endif

drivers/mfd/Makefile +1 -0

index 0f230a6..0ccd107 100644
@@ -198,3 +198,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

drivers/mfd/intel-vuport.c new file +25 -0

new file mode 100644
index 0000000..1371099
@@ -0,0 +1,78 @@
+/*
+ * MFD driver for Intel virtual USB port
+ *
+ * Copyright(c) 2016 Intel Corporation.
+ * Author: Lu Baolu <[email protected]>
+ *
+ * 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/gpio.h>
+#include <linux/mfd/core.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 },
+	{ "vbus_en-gpios", &vbus_gpio, 1 },
+	{ "usb_mux-gpios", &mux_gpio, 1 },
+	{ },

drivers/mfd/intel-vuport.c line 35

Quoted 10 lines

drivers/mfd/intel-vuport.c new file +10 -0

+};
+
+static const struct mfd_cell intel_vuport_mfd_cells[] = {
+	{
+		.name = "extcon-usb-gpio",
+	},
+	{
+		.name = "intel-mux-gpio",
+	},
+};

Please place single line entries on the same line as the '{' and '}'.

As you have above.

Quoted 43 lines

drivers/mfd/intel-vuport.c new file +42 -0

+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, 0, 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 <[email protected]>");
+MODULE_DESCRIPTION("Intel virtual USB port");
+MODULE_LICENSE("GPL v2");