From: NeilBrown <neil@brown.name>
To: Kishon Vijay Abraham I <kishon@ti.com>
Cc: NeilBrown <neilb@suse.de>,
linux-kernel@vger.kernel.org,
GTA04 owners <gta04-owner@goldelico.com>,
Tony Lindgren <tony@atomide.com>, Pavel Machek <pavel@ucw.cz>,
linux-omap@vger.kernel.org
Subject: [PATCH 6/6] phy: twl4030-usb: add extcon to report cable connections.
Date: Thu, 16 Apr 2015 18:03:04 +1000 [thread overview]
Message-ID: <20150416080304.23307.44749.stgit@notabene.brown> (raw)
In-Reply-To: <20150416075945.23307.24424.stgit@notabene.brown>
From: NeilBrown <neilb@suse.de>
Signed-off-by: NeilBrown <neilb@suse.de>
---
drivers/phy/phy-twl4030-usb.c | 67 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 1d6f3e70193e..c42153d43ec2 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -40,6 +40,7 @@
#include <linux/regulator/consumer.h>
#include <linux/err.h>
#include <linux/slab.h>
+#include <linux/extcon.h>
/* Register defines */
@@ -173,6 +174,9 @@ struct twl4030_usb {
enum omap_musb_vbus_id_status linkstat;
bool vbus_supplied;
+ /* cable connection */
+ struct extcon_dev edev;
+
struct delayed_work id_workaround_work;
};
@@ -592,6 +596,54 @@ static ssize_t twl4030_usb_id_show(struct device *dev,
}
static DEVICE_ATTR(id, 0444, twl4030_usb_id_show, NULL);
+static const char *usb_cables[] = {
+ "USB", /* id is floating */
+ "Charger-downstream", /* id is floating and D+ shorted to D- */
+ "USB-Host", /* id is ground */
+ "USB-ACA", /* "Accessory Charger Adapter" id is something else */
+ NULL
+};
+enum {
+ TWL_CABLE_USB,
+ TWL_CABLE_CHARGER, /* Not used - twl4030 can detect charger,
+ * but driver cannot yet */
+ TWL_CABLE_OTG,
+ TWL_CABLE_ACA,
+};
+static u32 all_exclusive[] = {0xFFFFFFFF, 0};
+
+static void twl4030_usb_report_cable(struct twl4030_usb *twl)
+{
+ enum twl4030_id_status sts;
+
+ if (!cable_present(twl->linkstat)) {
+ extcon_set_state(&twl->edev, 0);
+ return;
+ }
+
+ sts = twl4030_get_id(twl);
+
+ switch (sts) {
+ case TWL4030_FLOATING: /* USB downstream */
+ extcon_update_state(&twl->edev,
+ 1<<TWL_CABLE_USB,
+ 1<<TWL_CABLE_USB);
+ break;
+ case TWL4030_GROUND: /* USB host */
+ extcon_update_state(&twl->edev,
+ 1<<TWL_CABLE_OTG,
+ 1<<TWL_CABLE_OTG);
+ break;
+ default: /* Some resistor */
+ extcon_update_state(&twl->edev,
+ 1<<TWL_CABLE_ACA,
+ 1<<TWL_CABLE_ACA);
+ /* An ACA should set port to 'host' mode */
+ twl->linkstat = OMAP_MUSB_ID_GROUND;
+ break;
+ }
+}
+
static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
{
struct twl4030_usb *twl = _twl;
@@ -628,6 +680,7 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
pm_runtime_put_autosuspend(twl->dev);
}
omap_musb_mailbox(status);
+ twl4030_usb_report_cable(twl);
}
/* don't schedule during sleep - irq works right then */
@@ -766,6 +819,20 @@ static int twl4030_usb_probe(struct platform_device *pdev)
}
usb_add_phy_dev(&twl->phy);
+ twl->edev.name = devm_kasprintf(twl->dev, GFP_KERNEL, "%s-usb",
+ dev_name(twl->dev->parent));
+ twl->edev.supported_cable = usb_cables;
+ twl->edev.mutually_exclusive = all_exclusive;
+ twl->edev.print_name = NULL; /* why would you change this? */
+ twl->edev.print_state = NULL; /* probably want to change this */
+
+ twl->edev.dev.parent = &pdev->dev;
+ err = extcon_dev_register(&twl->edev);
+ if (err) {
+ dev_err(&pdev->dev, "register extcon failed\n");
+ return err;
+ }
+
platform_set_drvdata(pdev, twl);
if (device_create_file(&pdev->dev, &dev_attr_vbus))
dev_warn(&pdev->dev, "could not create sysfs file\n");
next prev parent reply other threads:[~2015-04-16 8:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-16 8:03 [PATCH 0/6] Enhancements to twl4030 phy to support better charging NeilBrown
2015-04-16 8:03 ` [PATCH 5/6] phy: twl4030-usb: add support for reading resistor on ID pin NeilBrown
2015-06-01 13:36 ` Kishon Vijay Abraham I
2015-06-01 21:37 ` NeilBrown
2015-06-02 13:49 ` Kishon Vijay Abraham I
2015-06-02 14:06 ` [Gta04-owner] " Dr. H. Nikolaus Schaller
2015-06-02 20:11 ` Pavel Machek
2015-06-02 20:47 ` Dr. H. Nikolaus Schaller
2015-06-06 13:10 ` Pavel Machek
2015-06-08 3:45 ` Felipe Balbi
2015-06-23 9:09 ` [Gta04-owner] " Dr. H. Nikolaus Schaller
2015-04-16 8:03 ` [PATCH 3/6] phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in probe function NeilBrown
2015-04-16 8:03 ` [PATCH 1/6] phy: twl4030-usb: make runtime pm more reliable NeilBrown
2015-04-16 8:03 ` [PATCH 4/6] phy: twl4030-usb: add ABI documentation NeilBrown
2015-04-17 22:14 ` Pavel Machek
2015-04-17 22:34 ` NeilBrown
2015-04-16 8:03 ` NeilBrown [this message]
2015-05-11 13:38 ` [PATCH 6/6] phy: twl4030-usb: add extcon to report cable connections Kishon Vijay Abraham I
2015-05-11 15:58 ` Chanwoo Choi
2015-04-16 8:03 ` [PATCH 2/6] phy: twl4030-usb: remove pointless 'suspended' test in 'suspend' callback NeilBrown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150416080304.23307.44749.stgit@notabene.brown \
--to=neil@brown.name \
--cc=gta04-owner@goldelico.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=neilb@suse.de \
--cc=pavel@ucw.cz \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox