]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
phy: rcar-gen3-usb2: add extcon support
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Fri, 29 Apr 2016 08:52:25 +0000 (14:22 +0530)
committerKishon Vijay Abraham I <kishon@ti.com>
Sat, 30 Apr 2016 14:42:26 +0000 (20:12 +0530)
This patch adds extcon support for otg related channel.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
drivers/phy/Kconfig
drivers/phy/phy-rcar-gen3-usb2.c

index a72d73cdaef384b364fad1867f27280efddbb8eb..447cb7c1a18dbdc0d5f11c31f083c7d013a165f2 100644 (file)
@@ -121,6 +121,7 @@ config PHY_RCAR_GEN2
 config PHY_RCAR_GEN3_USB2
        tristate "Renesas R-Car generation 3 USB 2.0 PHY driver"
        depends on ARCH_RENESAS
+       depends on EXTCON
        select GENERIC_PHY
        help
          Support for USB 2.0 PHY found on Renesas R-Car generation 3 SoCs.
index 7b14244be285731d161423226d28616abeee90d8..76bb88f0700a72b8d06480daf4d8e2aa8b0b51de 100644 (file)
@@ -12,6 +12,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/extcon.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
@@ -77,6 +78,7 @@
 
 struct rcar_gen3_chan {
        void __iomem *base;
+       struct extcon_dev *extcon;
        struct phy *phy;
        struct regulator *vbus;
        bool has_otg;
@@ -127,6 +129,9 @@ static void rcar_gen3_init_for_host(struct rcar_gen3_chan *ch)
        rcar_gen3_set_linectrl(ch, 1, 1);
        rcar_gen3_set_host_mode(ch, 1);
        rcar_gen3_enable_vbus_ctrl(ch, 1);
+
+       extcon_set_cable_state_(ch->extcon, EXTCON_USB_HOST, true);
+       extcon_set_cable_state_(ch->extcon, EXTCON_USB, false);
 }
 
 static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch)
@@ -134,6 +139,9 @@ static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch)
        rcar_gen3_set_linectrl(ch, 0, 1);
        rcar_gen3_set_host_mode(ch, 0);
        rcar_gen3_enable_vbus_ctrl(ch, 0);
+
+       extcon_set_cable_state_(ch->extcon, EXTCON_USB_HOST, false);
+       extcon_set_cable_state_(ch->extcon, EXTCON_USB, true);
 }
 
 static bool rcar_gen3_check_vbus(struct rcar_gen3_chan *ch)
@@ -272,6 +280,12 @@ static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = {
 };
 MODULE_DEVICE_TABLE(of, rcar_gen3_phy_usb2_match_table);
 
+static const unsigned int rcar_gen3_phy_cable[] = {
+       EXTCON_USB,
+       EXTCON_USB_HOST,
+       EXTCON_NONE,
+};
+
 static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -297,11 +311,23 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
        /* call request_irq for OTG */
        irq = platform_get_irq(pdev, 0);
        if (irq >= 0) {
+               int ret;
+
                irq = devm_request_irq(dev, irq, rcar_gen3_phy_usb2_irq,
                                       IRQF_SHARED, dev_name(dev), channel);
                if (irq < 0)
                        dev_err(dev, "No irq handler (%d)\n", irq);
                channel->has_otg = true;
+               channel->extcon = devm_extcon_dev_allocate(dev,
+                                                       rcar_gen3_phy_cable);
+               if (IS_ERR(channel->extcon))
+                       return PTR_ERR(channel->extcon);
+
+               ret = devm_extcon_dev_register(dev, channel->extcon);
+               if (ret < 0) {
+                       dev_err(dev, "Failed to register extcon\n");
+                       return ret;
+               }
        }
 
        /* devm_phy_create() will call pm_runtime_enable(dev); */