Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757481AbcJQHMS (ORCPT ); Mon, 17 Oct 2016 03:12:18 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:64100 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756546AbcJQHMI (ORCPT ); Mon, 17 Oct 2016 03:12:08 -0400 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="222509651" Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=<>; From: Yoshihiro Shimoda To: CC: , , Yoshihiro Shimoda Subject: [PATCH] phy: rcar-gen3-usb2: add sysfs for usb role swap Date: Mon, 17 Oct 2016 16:10:48 +0900 Message-ID: <1476688248-983-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0067.jpnprd01.prod.outlook.com (10.165.51.155) To SIXPR06MB0560.apcprd06.prod.outlook.com (10.160.238.153) X-MS-Office365-Filtering-Correlation-Id: 3e583766-f961-414f-f08d-08d3f65ce5d8 X-Microsoft-Exchange-Diagnostics: 1;SIXPR06MB0560;2:DwHR6+/S5Uy32QfAx4kLufowf4kCL9ZiIzMSXi27tRTY8yzH6ieJ5oR6sew9VFR8dFlrwXhXwrK30cuQ4+7+XiTzKwRKWxWie4v9vmpaJJ4SSQoKFQnfQtlw/C2oaepYRSyGLW3mcZie28ZwZV0CRkobxRMEnNnfrPQtRlLXWcGSQGGdOkqK7AIaqpfgaghFMM1PnES4jgIlyYG7ae7V8g==;3:WDaBttnPj/UZ5MihJnOgzLSxG2d480XoHh6hFq5MeaD92IOA/x9aKVaLVd1GoG4kbRd4vOYb4XGMtfjq3eYIAJ/OnU6GfmB3xg9UPygzQkvVZNa8Aug1tKIxywdL7YyaG2Rc7xnoCqFDceXczm0k/A==;25:1eypWcgbLRDiOYGRhFaHHdhaBvhcvWIKdei52q7FHsUDU6SnEV4j854cvjX/jJYc0oZ7cDBQyC6b4IDczNBpZ45D1zkeS8JHG8q8P4iwZ+WD2UKn493hWGcCKNSha4u0lrd4OH+1JtQWsZBL/WsxuLNCX/eQMaXN5gBVEPhrzsj9KwX/oOi/eERvZuf8zeW/6frrC8xBrRYXgikYFzXJIGxYCvtN5/v8nDny3YIc+IjFnY2mC+/1xZJYxnA+mzEYtxnxwEX1MnIKUKCXZrO3OGMoMbqqhrDWMw9vbwuJ+Fpi3M2Zw5qBSawx1WM7v83k1ChqQaDSqxLaPJy31lmepIdhKyYdmTKDejSshbsFNPRoE3F3SmD4wyqPaOKmR9tKNVk3WA3aZ59B9Dlh4546UdWcWmgTnqz8iXexO7N+gO6f0QfLlXYF71EHqbYzQMAG X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB0560; X-Microsoft-Exchange-Diagnostics: 1;SIXPR06MB0560;31:gG1wZrvkpoIh5t+hsmCq6GTNtnyCU+KGA2fXi+4gTzdW8CXlBkATqYMvw6ZVVZabORtZa/ZZxxyd4QQuT+CPyWtszOCO1EpXm9YMNINuEVI3BLOeaHNB/As7szZdSzsWme6ZN9QUzYkjIajscZqNBZnIKg4rR2m2NJebawvA/Wnuo4wk3EfYI1f1PtAWqoGfDCpCO5tOBBuOZejG5sAPJBAydbzQcJIaz1/KLORIaLInkgV1vMYD9mRuwPTZizyIUnd74i242fMZMgct8Q6LGw==;20:h7n3BhKrtilifRX60b4x5WNBi1pGcRmZTSu4882rkgdtnXC224zaAXSg757Wjcx3D7lzuXeSPNd7XnqgEScvs0lLc/y+D360xuoMSsNDGBkr3TcwQGD153MOjU8x1CCYN8lmzKQPB0fg1Q3fHh3rSgxA010BvfVVfCZyJyco8dt4YnkwbuQoTTRrSgCvHFMOue8Ze75oBkxZff9TbDRWP/T3NcWyA+3MksD8PRl5z/AaBulKrnZ3wWDHVdwmqoe7m0uKP+cJW5IFs5yVzkJEn9G2hQOlKcf2M0YXKtza6Izh4BQfxB+Ler5o0S9RtWB9Wj7CQWk6Ib+lEWg8zLAMWG0AdZYe3eKRuWTSl+heelfYBobvAxmeRFgO2p7mD0/4Aj06csoAlprPCVHvOrRQX9MzgF3CfmT1vCH4FqJ+SaqJqZapmYizcxnpjwXLrCyf7v6njKQfQh2hVrgxC14vGr0hD5YErEy6rnXdZATbxNHO2KJQAcThPag0GIQWoNpc X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(21532816269658); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026);SRVR:SIXPR06MB0560;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB0560; X-Microsoft-Exchange-Diagnostics: 1;SIXPR06MB0560;4:HWVbLUx2Sf61LsGndEfqX95SbLCC1Ob/LaL0VvZHngNk1xHktede0zd1FSAaKHKgBeXZaNjuWMbAPv1W8+qqmeeh1PoyBbVjYgsrI2HoNO7w3LN0xPMuruapy/TV7mkXSSNpyLtvdRhUF8FUULL1D3HQtO9h4K/4NS37tvfD+159Qm1HQ2urP5RgbRMjlCqWzVRoFRFkV8Oy1rusgjQfd53a9knE+PWKZgfa+eH0ZblDzBEHOmG2F/g6p6OtDJL8qJqeOSg52TZJeZ4hDzXos1okSZSIgF6au7zeDaxikcqNzfr4m4sRUVh0BvLF0MqIFxY/GR9DFkzR3TvWH7KmTVOfGoc9OZ/kYzU/8H8lWwjGILt7Drwz4fAPZsn1vk8ZpmEK49KfbLjw2os/7ORY9Z8SdvtzaZeJatjGVx8A3PR5vh3DtxuWD1el7XCDZO/BKhjSZ9qHQ28XPRqsnDNz9A== X-Forefront-PRVS: 0098BA6C6C X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6069001)(7916002)(199003)(50944005)(189002)(106356001)(110136003)(33646002)(107886002)(8676002)(68736007)(42186005)(586003)(4001430100002)(5003940100001)(66066001)(81156014)(81166006)(78352004)(50226002)(47776003)(36756003)(19580405001)(230783001)(97736004)(48376002)(19580395003)(305945005)(6916009)(92566002)(575784001)(7736002)(229853001)(4326007)(50986999)(2351001)(6666003)(77096005)(42882006)(7846002)(101416001)(189998001)(2906002)(50466002)(105586002)(5660300001)(6116002)(3846002);DIR:OUT;SFP:1102;SCL:1;SRVR:SIXPR06MB0560;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;A:0;MX:0;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SIXPR06MB0560;23:AdThjYkMXYvRdQxLwuJOg9LtnCgtHlZbl8xTfLu0T?= =?us-ascii?Q?5yBYNnyGNrV9Z6GWuhMMq4Scoj+7H2SQ1AIb2vtNG4wyIfxNdmxyBng94Q0f?= =?us-ascii?Q?z80CNozAGpqHj1Ysoj4NEWfZj8m7CfLKvEsdWJH8ckG2Dd4lZKkfsCnTY+w6?= =?us-ascii?Q?YfYuVlgyIW0TEaDq1DLpfbTDAudAYQgyDmlV8ZTOJhHaTD56SQeUFQRU6Lbf?= =?us-ascii?Q?hLAfHHn1j++VNBEvxd9TpONQ3/0iwIpptQRXQeUTm+bJF7Sq0fRXDLNo7Mr6?= =?us-ascii?Q?LWr6aYwKR8NM25CvbsvcDtyP0ajlBRCCMgEDbEKEy/uFEEbptToHG/4W/MW6?= =?us-ascii?Q?1q7kwSlmDogQBOnibtLytRT3tDfPnb4fQLxhiQHD7xPiRaVbbeM5Ig0zeTWZ?= =?us-ascii?Q?5j0mlNlblx3e+afbn6MZgkoZfSE2iKTyQcXcSliTM22F4Mprv8bGc48goCvi?= =?us-ascii?Q?/6VvHmYAHDOrE9JaEbse16Myj07aWh2K6TkLgz2DxHUy03haC3gb7AFXtOJu?= =?us-ascii?Q?bEFLLqK1aReIOdTDnYGpiI24I9815Fh576di6MjO3CSoJZ2eUaBjA1ZVlTkz?= =?us-ascii?Q?Wd1+Qg7Cfp1DWfQMkkTaDvDpmeIzVSO0BM8VHYTiKDfw+pruAzsA5eiYG6Bp?= =?us-ascii?Q?26gY3LAz5774R1Oj6AUltzjFxSItUcsFI6SehZkLxTuOmHoz/PlbxgYyx//o?= =?us-ascii?Q?dctyLexBvMsG/oPJT1EaGOqBERkl2eNDDvOiIuhmdoiQLQGOmxrCzjpYBZdU?= =?us-ascii?Q?CWkhGt0AioqZAtdiECPia4ruxad8C9Amc+BrEUHK57wJ6K42Gx4uMx4iXLE5?= =?us-ascii?Q?Vy8ElBe625mkV2WYeos4rEyAjfQARKUogjf4/HOq+LJ5Yy8yJXtuSf9EzUc2?= =?us-ascii?Q?3lARD8R8mM6SttjW7ffkUV9OGhB74gaIMe8r2dKcFCfYKsOdRMInfr4jhivk?= =?us-ascii?Q?9ELHiTAxOR0JAFybJW5S0Ovix5p1iRauMGM69m4zaB4hjOOWJOAxkqQ50UBV?= =?us-ascii?Q?jHGhyxwn990ZOxNdLAlLjEwcs5qwjBTM5LDBXfzv0dV3A8DUzdnm1hvIuBVK?= =?us-ascii?Q?C5NdHD0JKANDfFm+GdUaSnE/PPTcjxImlLWLGksOpI/BtGVduAIA3LKZyqYS?= =?us-ascii?Q?cZZid69SnZ8CjRltqCgoQC9sHS3T8Yxbk4LNyV60aYByFdVQSje4k3fOV1yN?= =?us-ascii?Q?oraWVFiHza+7HakQRZvKIBvmqSnyEBG9rfL1J6LAvZiczMn240ylxU068avQ?= =?us-ascii?Q?t7VQJU5szmOwoj4mRs=3D?= X-Microsoft-Exchange-Diagnostics: 1;SIXPR06MB0560;6:o2yqlemrZlWLrWpF45T42D2AZtUMqm33m95BVPS2qJYMmZuTYtTuyncjiG9GkhcHwCIIc9fFcUkApX2ACYTC6OJSe7Jbdf0g0kcM0H9fg3gqTF9U4CarCxaQZNCUddtNx2HjIByYIjtQnY/q16PZ0CnpTkKo/V16wDoiiIcjS03bI5wcmjmIrpnYUQqFtnChrtilFjwiRTvSWSx5iXNPcVQsRQqL4mTnVsOibemeVKWqN7isnJPQCoeUYY3NeCw2BWTXbzIavUk//FNcSjjWpansQ2fzb2MzjSnLnVtcaLT9Oh0GlkLxwgxPGucZfGWK0ZQcXlT66pNw0ApWORVvKoBX6xWylrLTXx099m+p6MQ=;5:65dlmCY9Hg9jgnfdYTvAER4PTQ8F9dgbia5ov/eeFcy+see1EYylTERstj+jn/ABeXN2V0tUzdgG5VaHB04G31+jZElAu9/5zFYql5GtqoYOI02819XqjsjzFungJbc7MA4vlJJZm7b06TrZCCbX5Q==;24:YEPaMX2sfR0xaWIMd24PFegJKn3VYMGDje3hJKiaquNgtGZMyJ1Z8PpXm45XrD4QGqwQ5upuxASol6CdWpNdk0k7lVU+C5oyXbcMJ3S7uTw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SIXPR06MB0560;7:DAX0rwxKeU9kGAJkmEM4d2uIg4G7Qu/rbzJl9DwN9v03AOCUMkSVtajjJyLKF1RzenH/D0MCin0Ae2q9rivp+jVCBaEkbc3cWoL2ADArWIgZQty/7j8lU49OK7E0fuU9jdduG7KhHwF9rjXbiKnHsjYdNe24ImhcT7O6ggmLL1c3uk7+euZktyn1uXAQpUqJV1JxR1PnIkAhBXTgec0XbqKcsylfEw9nJHU9BDSy7b2TbVbqXW+L2/h9hEsCHd+05/HNIx7UbqARzCGSq0V3YE+MAtZ1/Sq901oPKbfouL/uCbTdpOLypbi7lQDbXuDK1l0zZvlbRn3gC2tmuXXHkMevhnpVOaUd9lDRn5vwjJE=;20:PQgKAa/G9eCasP38sVXsFTg2Q349ow/tlbhS3GHvIrX0s6+pDso+6WoRf9c2w0Pyp1ZIFap0L6Bj/ew+GeBpr5a4bj7Ux91JSedFM/eoT26jery3N86XtKCbvepp7R7I92pefLUSlkPM+VMEUh6StfUbjCGuXER/394iTfm4OZ8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2016 07:12:03.7371 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0560 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7403 Lines: 221 This patch adds sysfs "otg_inputs" for usb role swap. This parameter is write-only and if you use them as the following, you can swap the usb role. For example: 1) connect a usb cable using 2 salvator-x boards 2) On A-device (as host), you input the following command: # echo a_bus_req/ > /sys/devices/platform/soc/ee080200.usb-phy/otg_inputs 3) On B-device (as peripheral), you input the following command: # echo b_bus_req > /sys/devices/platform/soc/ee080200.usb-phy/otg_inputs Then, the A-device acts as a peripheral (A-peripheral) and the B-device acts as a host (B-host). Please note that A-device must input the following command if you want the board to act as a host again. (even if you disconnect the usb cable, since id state may be the same, the condition keeps "A-peripheral".) # echo a_bus_drop > /sys/devices/platform/soc/ee080200.usb-phy/otg_inputs Also you can use the following command if you want the B-device board to act as a peripheral again. # echo b_bus_req/ > /sys/devices/platform/soc/ee080200.usb-phy/otg_inputs Signed-off-by: Yoshihiro Shimoda --- This patch is based on the linux-phy.git / phy-for-4.9-resolved_v3 tag. (commit id = c4b0bf82f705747ed7de90c5736b07248cbb29cd) .../ABI/testing/sysfs-platform-phy-rcar-gen3-usb2 | 11 ++ drivers/phy/phy-rcar-gen3-usb2.c | 124 ++++++++++++++++++++- 2 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2 diff --git a/Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2 b/Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2 new file mode 100644 index 0000000..c7e715af --- /dev/null +++ b/Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2 @@ -0,0 +1,11 @@ +What: /sys/devices/platform//otg-inputs +Date: October 2016 +KernelVersion: 4.10 +Contact: Yoshihiro Shimoda +Description: + This write-only file changes the phy mode for role swap of usb. + This file accepts the following strings: + "a_bus_req/" - switching from A-Host to A-Peripheral + "a_bus_drop" - switching from A-Peripheral to A-Host + "b_bus_req" - switching from B-Peripheral to B-Host + "b_bus_req/" - switching from B-Host to B-Peripheral diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c index 3d97ead..80f5bcc 100644 --- a/drivers/phy/phy-rcar-gen3-usb2.c +++ b/drivers/phy/phy-rcar-gen3-usb2.c @@ -70,6 +70,7 @@ #define USB2_LINECTRL1_DP_RPD BIT(18) #define USB2_LINECTRL1_DMRPD_EN BIT(17) #define USB2_LINECTRL1_DM_RPD BIT(16) +#define USB2_LINECTRL1_OPMODE_NODRV BIT(6) /* ADPCTRL */ #define USB2_ADPCTRL_OTGSESSVLD BIT(20) @@ -161,6 +162,43 @@ static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch) schedule_work(&ch->work); } +static void rcar_gen3_init_for_b_host(struct rcar_gen3_chan *ch) +{ + void __iomem *usb2_base = ch->base; + u32 val; + + val = readl(usb2_base + USB2_LINECTRL1); + writel(val | USB2_LINECTRL1_OPMODE_NODRV, usb2_base + USB2_LINECTRL1); + + rcar_gen3_set_linectrl(ch, 1, 1); + rcar_gen3_set_host_mode(ch, 1); + rcar_gen3_enable_vbus_ctrl(ch, 0); + + val = readl(usb2_base + USB2_LINECTRL1); + writel(val & ~USB2_LINECTRL1_OPMODE_NODRV, usb2_base + USB2_LINECTRL1); +} + +static void rcar_gen3_init_for_a_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, 1); +} + +static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch) +{ + void __iomem *usb2_base = ch->base; + u32 val; + + val = readl(usb2_base + USB2_OBINTEN); + writel(val & ~USB2_OBINT_BITS, usb2_base + USB2_OBINTEN); + + rcar_gen3_enable_vbus_ctrl(ch, 0); + rcar_gen3_init_for_host(ch); + + writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN); +} + static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch) { return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG); @@ -174,6 +212,71 @@ static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch) rcar_gen3_init_for_peri(ch); } +/* + * The following table is a state transition for usb phy mode: + * State Event Next state + * disconnected: E1 a_host + * E2 b_peripheral + * A-Device - a_host: E2 b_peripheral + * E3 disconnected + * E4 a_suspend + * A-Device - a_suspend: E2 b_peripheral + * E3 disconnected + * E5 a_host + * E6 a_peripheral + * A-Device - a_peripheral: E2 b_peripheral + * E3 disconnected + * E5 a_host + * B-Device - b_peripheral: E3 disconnected + * E7 b_wait_acon + * B-Device - b_wait_acon E3 disconnected + * E8 b_host + * B-Device - b_host: E3 disconnected + * E9 b_peripheral + * Events: + * E1: ID = 0 && Host detects D+ pull up, E2: ID = 1 && VBUS = 1 + * E3: VBUS = 0 || ID is changed, E4: a_bus_req/ + * E5: a_bus_drop, E6: Turns D+ pull up off + * E7: b_bus_req, E8: Detects D+ pull up + * E9: b_bus_req/ + */ +static ssize_t otg_inputs_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct rcar_gen3_chan *ch = dev_get_drvdata(dev); + bool is_host, is_b_device; + + if (!ch->has_otg || !ch->phy->init_count) + return -EIO; + + is_b_device = rcar_gen3_check_id(ch); /* true = B-Device */ + is_host = !(readl(ch->base + USB2_COMMCTRL) & USB2_COMMCTRL_OTG_PERI); + + if (!strncmp(buf, "a_bus_req/", strlen("a_bus_req/"))) { + if (is_b_device) /* fail if B-device */ + return -ENODEV; + rcar_gen3_init_for_a_peri(ch); + } else if (!strncmp(buf, "a_bus_drop", strlen("a_bus_drop"))) { + if (is_b_device || is_host) /* fail if B-device or A-host */ + return -ENODEV; + rcar_gen3_init_from_a_peri_to_a_host(ch); + } else if (!strncmp(buf, "b_bus_req/", strlen("b_bus_req/"))) { + if (!is_b_device || !is_host) /* fail if A-device or B-peri */ + return -ENODEV; + rcar_gen3_init_for_peri(ch); + } else if (!strncmp(buf, "b_bus_req", strlen("b_bus_req"))) { + if (!is_b_device) /* fail if A-device */ + return -ENODEV; + rcar_gen3_init_for_b_host(ch); + } else { + return -EINVAL; + } + + return count; +} +static DEVICE_ATTR_WO(otg_inputs); + static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch) { void __iomem *usb2_base = ch->base; @@ -351,21 +454,40 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) channel->vbus = NULL; } + platform_set_drvdata(pdev, channel); phy_set_drvdata(channel->phy, channel); provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); - if (IS_ERR(provider)) + if (IS_ERR(provider)) { dev_err(dev, "Failed to register PHY provider\n"); + } else if (channel->has_otg) { + int ret; + + ret = device_create_file(dev, &dev_attr_otg_inputs); + if (ret < 0) + return ret; + } return PTR_ERR_OR_ZERO(provider); } +static int rcar_gen3_phy_usb2_remove(struct platform_device *pdev) +{ + struct rcar_gen3_chan *channel = platform_get_drvdata(pdev); + + if (channel->has_otg) + device_remove_file(&pdev->dev, &dev_attr_otg_inputs); + + return 0; +}; + static struct platform_driver rcar_gen3_phy_usb2_driver = { .driver = { .name = "phy_rcar_gen3_usb2", .of_match_table = rcar_gen3_phy_usb2_match_table, }, .probe = rcar_gen3_phy_usb2_probe, + .remove = rcar_gen3_phy_usb2_remove, }; module_platform_driver(rcar_gen3_phy_usb2_driver); -- 1.9.1