From patchwork Thu Dec 17 22:47:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 7877791 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5B684BEEE5 for ; Thu, 17 Dec 2015 22:47:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECB1E2041E for ; Thu, 17 Dec 2015 22:47:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A02442041B for ; Thu, 17 Dec 2015 22:47:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965137AbbLQWrU (ORCPT ); Thu, 17 Dec 2015 17:47:20 -0500 Received: from mail-lb0-f169.google.com ([209.85.217.169]:35101 "EHLO mail-lb0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965101AbbLQWrS (ORCPT ); Thu, 17 Dec 2015 17:47:18 -0500 Received: by mail-lb0-f169.google.com with SMTP id u9so53548877lbp.2 for ; Thu, 17 Dec 2015 14:47:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:organization:user-agent :mime-version:content-transfer-encoding:content-type; bh=MKXiBzyXTBt4O5637H859IkpKHXWlphryHdFC7I7GrI=; b=Opj3mYHV+4WNkE3fHax4BEwi1BdJHNfDkbeJYET58rOH0MXcGYKiyFDI3zHhsFtjvm FiWFdQ4mE/0ZN5BLnwOr+Qqyu10tkVF2k+FFUO2DxkAF9UmdNKD4HKV1Gii+cw+6zfEx SDUZesfj4DSCdl5Z2zO+kLehxXBTKnd6xNkn4vnma4kd+s+LSqPq3iZQkDUfjLMQoTGe TukkShDcJ9oMMVAzw0JFEw9TsNqIP7sDnr4vOoQysS0ZOB6TpDFoUue75macwX2BPp5+ 9UibuFmjim3FbzEhFVzs18JeIGqwVz/icVuVcKD5Wp6nO9HRQSq3xIlRYXUKFezZf+Go pSzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization :user-agent:mime-version:content-transfer-encoding:content-type; bh=MKXiBzyXTBt4O5637H859IkpKHXWlphryHdFC7I7GrI=; b=WLgY0m6UbO/ahbvLN/WxD+W23zeEhz/RvkD2BsJ/MUaKRq0NN4YlQEExkV9sZhLiI7 9o69y7KlQkRCuDciClTHq0m4lLMF1fCPpJ+6vCs84aXRN0x750YFeutwNEwajqw+C9/e Lp5oUAPnMlXJtXDigX1tU0HFITLZ9ungpwR0Dc0vDrnl7IwlNAU4oxPd1jNKCd6L82Ew T6TJUN9y5ShUz4Gz+jNilp3DKcG6wu5pSClbcj8BbydfSZzQDn5KcaigRbIjs3rHW2fR UD4Y3oBvjW21UFJLKTMvuTTAG8yMtLlZf78kGmmzRB7so6HoQRnO5MVnJvJptec5wrzq yxbQ== X-Gm-Message-State: ALoCoQlby7+ymwcQ+XgGDWFUnw1fZ/ckTCscV8DiyYF1XJadOMVT3yFREtB/YQbWYX6RNxAmZ7KovIZccsWoDJF+onl182wtFA== X-Received: by 10.112.13.231 with SMTP id k7mr101827lbc.19.1450392436829; Thu, 17 Dec 2015 14:47:16 -0800 (PST) Received: from wasted.cogentembedded.com ([83.149.9.150]) by smtp.gmail.com with ESMTPSA id pl2sm2255509lbc.8.2015.12.17.14.47.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 Dec 2015 14:47:15 -0800 (PST) From: Sergei Shtylyov To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, myungjoo.ham@samsung.com, cw00.choi@samsung.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-sh@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH v4] extcon: add Maxim MAX3355 driver Date: Fri, 18 Dec 2015 01:47:14 +0300 Message-ID: <1767472.2Rx4LOCrWY@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.10 (Linux/4.2.7-200.fc22.x86_64; KDE/4.14.14; x86_64; ; ) MIME-Version: 1.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Maxim Integrated MAX3355E chip integrates a charge pump and comparators to enable a system with an integrated USB OTG dual-role transceiver to function as an USB OTG dual-role device. In addition to sensing/controlling Vbus, the chip also passes thru the ID signal from the USB OTG connector. On some Renesas boards, this signal is just fed into the SoC thru a GPIO pin -- there's no real OTG controller, only host and gadget USB controllers sharing the same USB bus; however, we'd like to allow host or gadget drivers to be loaded depending on the cable type, hence the need for the MAX3355 extcon driver. The Vbus status signals are also wired to GPIOs (however, we aren't currently interested in them), the OFFVBUS# signal is controlled by the host controllers, there's also the SHDN# signal wired to a GPIO, it should be driven high for the normal operation. Signed-off-by: Sergei Shtylyov Acked-by: Chanwoo Choi Acked-by: Rob Herring --- The patch is against the 'extcon-next' branch of the 'extcon.git' repo. Changes in version 4: - stopped calling kstrdup() for the device name; - removed unneeded 'owner' field initializer; - moved devm_extcon_allocate() call further down in the probe() method; - extended the driver copyright; - indented the continuation lines in the binding document. Changes in version 3: - reformatted the change log. Changes in version 2: - added the USB gadget cable support; - added the remove() driver method which drives SHDN# GPIO low to save power; - dropped vendor prefix from the ID GPIO property name; - changed the GPIO property name suffix to "-gpios"; - switched to usign extcon_set_cable_state_() API; - switched to using the gpiod/sleeping 'gpiolib' APIs; - addded error messages to max3355_probe(); - added IRQF_NO_SUSPEND flasg to the devm_request_threaded_irq() call; - renamed 'ret' variable to 'err' in max3355_probe(); - expanded the Kconfig entry help text; - added vendor name to the patch summary, the bindings document, the Kconfig entry, the driver heading comment, the module description, and the change log; - fixed up and reformatted the change log. Documentation/devicetree/bindings/extcon/extcon-max3355.txt | 21 + drivers/extcon/Kconfig | 8 drivers/extcon/Makefile | 1 drivers/extcon/extcon-max3355.c | 151 ++++++++++++ 4 files changed, 181 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: extcon/Documentation/devicetree/bindings/extcon/extcon-max3355.txt =================================================================== --- /dev/null +++ extcon/Documentation/devicetree/bindings/extcon/extcon-max3355.txt @@ -0,0 +1,21 @@ +Maxim Integrated MAX3355 USB OTG chip +------------------------------------- + +MAX3355 integrates a charge pump and comparators to enable a system with an +integrated USB OTG dual-role transceiver to function as a USB OTG dual-role +device. + +Required properties: +- compatible: should be "maxim,max3355"; +- maxim,shdn-gpios: should contain a phandle and GPIO specifier for the GPIO pin + connected to the MAX3355's SHDN# pin; +- id-gpios: should contain a phandle and GPIO specifier for the GPIO pin + connected to the MAX3355's ID_OUT pin. + +Example (Koelsch board): + + usb-otg { + compatible = "maxim,max3355"; + maxim,shdn-gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; + id-gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>; + }; Index: extcon/drivers/extcon/Kconfig =================================================================== --- extcon.orig/drivers/extcon/Kconfig +++ extcon/drivers/extcon/Kconfig @@ -52,6 +52,14 @@ config EXTCON_MAX14577 Maxim MAX14577/77836. The MAX14577/77836 MUIC is a USB port accessory detector and switch. +config EXTCON_MAX3355 + tristate "Maxim MAX3355 USB OTG EXTCON Support" + help + If you say yes here you get support for the USB OTG role detection by + MAX3355. The MAX3355 chip integrates a charge pump and comparators to + enable a system with an integrated USB OTG dual-role transceiver to + function as an USB OTG dual-role device. + config EXTCON_MAX77693 tristate "Maxim MAX77693 EXTCON Support" depends on MFD_MAX77693 && INPUT Index: extcon/drivers/extcon/Makefile =================================================================== --- extcon.orig/drivers/extcon/Makefile +++ extcon/drivers/extcon/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_EXTCON_ARIZONA) += extcon-a obj-$(CONFIG_EXTCON_AXP288) += extcon-axp288.o obj-$(CONFIG_EXTCON_GPIO) += extcon-gpio.o obj-$(CONFIG_EXTCON_MAX14577) += extcon-max14577.o +obj-$(CONFIG_EXTCON_MAX3355) += extcon-max3355.o obj-$(CONFIG_EXTCON_MAX77693) += extcon-max77693.o obj-$(CONFIG_EXTCON_MAX77843) += extcon-max77843.o obj-$(CONFIG_EXTCON_MAX8997) += extcon-max8997.o Index: extcon/drivers/extcon/extcon-max3355.c =================================================================== --- /dev/null +++ extcon/drivers/extcon/extcon-max3355.c @@ -0,0 +1,151 @@ +/* + * Maxim Integrated MAX3355 USB OTG chip extcon driver + * + * Copyright (C) 2014-2015 Cogent Embedded, Inc. + * Author: Sergei Shtylyov + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct max3355_data { + struct extcon_dev *edev; + struct gpio_desc *id_gpiod; + struct gpio_desc *shdn_gpiod; +}; + +static const unsigned int max3355_cable[] = { + EXTCON_USB, + EXTCON_USB_HOST, + EXTCON_NONE, +}; + +static irqreturn_t max3355_id_irq(int irq, void *dev_id) +{ + struct max3355_data *data = dev_id; + int id = gpiod_get_value_cansleep(data->id_gpiod); + + if (id) { + /* + * ID = 1 means USB HOST cable detached. + * As we don't have event for USB peripheral cable attached, + * we simulate USB peripheral attach here. + */ + extcon_set_cable_state_(data->edev, EXTCON_USB_HOST, false); + extcon_set_cable_state_(data->edev, EXTCON_USB, true); + } else { + /* + * ID = 0 means USB HOST cable attached. + * As we don't have event for USB peripheral cable detached, + * we simulate USB peripheral detach here. + */ + extcon_set_cable_state_(data->edev, EXTCON_USB, false); + extcon_set_cable_state_(data->edev, EXTCON_USB_HOST, true); + } + + return IRQ_HANDLED; +} + +static int max3355_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct max3355_data *data; + struct gpio_desc *gpiod; + int irq, err; + + data = devm_kzalloc(&pdev->dev, sizeof(struct max3355_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; + + gpiod = devm_gpiod_get(&pdev->dev, "id", GPIOD_IN); + if (IS_ERR(gpiod)) { + dev_err(&pdev->dev, "failed to get ID_OUT GPIO\n"); + return PTR_ERR(gpiod); + } + data->id_gpiod = gpiod; + + gpiod = devm_gpiod_get(&pdev->dev, "maxim,shdn", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod)) { + dev_err(&pdev->dev, "failed to get SHDN# GPIO\n"); + return PTR_ERR(gpiod); + } + data->shdn_gpiod = gpiod; + + data->edev = devm_extcon_dev_allocate(&pdev->dev, max3355_cable); + if (IS_ERR(data->edev)) { + dev_err(&pdev->dev, "failed to allocate extcon device\n"); + return PTR_ERR(data->edev); + } + + err = devm_extcon_dev_register(&pdev->dev, data->edev); + if (err < 0) { + dev_err(&pdev->dev, "failed to register extcon device\n"); + return err; + } + + irq = gpiod_to_irq(data->id_gpiod); + if (irq < 0) { + dev_err(&pdev->dev, "failed to translate ID_OUT GPIO to IRQ\n"); + return irq; + } + + err = devm_request_threaded_irq(&pdev->dev, irq, NULL, max3355_id_irq, + IRQF_ONESHOT | IRQF_NO_SUSPEND | + IRQF_TRIGGER_RISING | + IRQF_TRIGGER_FALLING, + pdev->name, data); + if (err < 0) { + dev_err(&pdev->dev, "failed to request ID_OUT IRQ\n"); + return err; + } + + platform_set_drvdata(pdev, data); + + /* Perform initial detection */ + max3355_id_irq(irq, data); + + return 0; +} + +static int max3355_remove(struct platform_device *pdev) +{ + struct max3355_data *data = platform_get_drvdata(pdev); + + gpiod_set_value_cansleep(data->shdn_gpiod, 0); + + return 0; +} + +static const struct of_device_id max3355_match_table[] = { + { .compatible = "maxim,max3355", }, + { } +}; +MODULE_DEVICE_TABLE(of, max3355_match_table); + +static struct platform_driver max3355_driver = { + .probe = max3355_probe, + .remove = max3355_remove, + .driver = { + .name = "extcon-max3355", + .of_match_table = max3355_match_table, + }, +}; + +module_platform_driver(max3355_driver); + +MODULE_AUTHOR("Sergei Shtylyov "); +MODULE_DESCRIPTION("Maxim MAX3355 extcon driver"); +MODULE_LICENSE("GPL v2");