From patchwork Tue Jul 3 10:46:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 10503783 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14E70601D3 for ; Tue, 3 Jul 2018 10:48:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0110228760 for ; Tue, 3 Jul 2018 10:48:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E90092876E; Tue, 3 Jul 2018 10:48:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=2.0 tests=AXB_X_OUTLOOKPROT_ENVSDR, BAYES_00, DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7588028760 for ; Tue, 3 Jul 2018 10:48:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752862AbeGCKsH (ORCPT ); Tue, 3 Jul 2018 06:48:07 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:36489 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752730AbeGCKsB (ORCPT ); Tue, 3 Jul 2018 06:48:01 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 03 Jul 2018 19:47:59 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 19A9C9C734; Tue, 3 Jul 2018 19:47:59 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.51,303,1526310000"; d="scan'208";a="285817328" Received: from mail-os2jpn01lp0143.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.143]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 03 Jul 2018 19:47:58 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Uz4W2WrWnOcVasfkW+UTdoenRNWmdmF10/q8og0ywz8=; b=iCVBRQovmJh47P7PWDv92gdtZLDVG1t1eVCcIM9CavEwDZg/ohgeLY8n0m9keKch07HxHJvx1zyh1jNlrE8GjBDuEc/vEa8yKrwYpn7YXwMU38ZjcyHEROf1o8F6OWiys21OnSzduaMxl2Y/VUZZ/JQ9m4iiWzj0dyXtdnUP/PI= Received: from localhost.localdomain (211.11.155.144) by TYAPR01MB2304.jpnprd01.prod.outlook.com (2603:1096:404:8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Tue, 3 Jul 2018 10:47:57 +0000 From: Yoshihiro Shimoda To: mathias.nyman@intel.com, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Yoshihiro Shimoda Subject: [PATCH 2/3] usb: host: xhci-rcar: Simplify getting the firmware name for R-Car Gen3 Date: Tue, 3 Jul 2018 19:46:57 +0900 Message-Id: <1530614818-7634-3-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1530614818-7634-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1530614818-7634-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY2PR06CA0008.apcprd06.prod.outlook.com (2603:1096:404:42::20) To TYAPR01MB2304.jpnprd01.prod.outlook.com (2603:1096:404:8::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: efaec390-17c1-49d5-b3b7-08d5e0d27026 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(8559017)(8990107)(2017052603328)(7153060)(7193020); SRVR:TYAPR01MB2304; X-Microsoft-Exchange-Diagnostics: 1; TYAPR01MB2304; 3:tiJZszLdN28rJvATFGiVd9bh88yeZgzkTQ4e4IPQu4L3TsJ7VQgbnN96J51UzsOKHBahtTEqVMesW34T1MF1qmlKBiJE8nFHBNiCLqCGit8tFbIRhr1I9yh2qJB//2C8oXpDj1iux9rxqRG/j/qo6meH9j0HwcJGGxwm1KmiPmpeGVX1eFVaFf+jw9hDftS/1wxSoo/OMMAS35rafY01GOR5EEh8CgUjrOpXCaxyYAcjYjo+DaIHngnT35XEv7C1; 25:dhhV7zGJ8MogmWPBFtiA0IBhFdx/KJoM0dLPRQYVpygOYmhPDWk0uzt5AEpeB26t8Ccltce/nltiQzlqTDcg3gaU/3YjjKOhqq6o2Y33xv9qKLyCgJbKLRvUXJ/yxF//PgYIhC7u6FjZh0GiSXIcXuqp2AmKS9YEmcwGYNYPH7y9YuiWabyp8GPA6aS2gL2H2bZ2OHfj7gk2+jnCumsvq6oN4bg09KfKTLMVmIgR28+kAHWVl7Ikg4+HIcPyxn2obbYX8bvwqsMc6rdc8wABOxzsO5OIT7I4YpgvXHvwRQ9WC6zdjIvScd7MK3cnl/O72OulI+ZB3e+RlkaArGTCJA==; 31:cSjBJDevjhZriJ7wLnXanJcQBM6i/VJdysCvXeR9K2SNi2bCYBqCd0jJhXsyNkK5FP2nUy/m+eoCsOE4D/xCbxrLCx5oj+6b+jAX+BBu4XKL9BNHYtvDtpuaQ/X4r/V+yStF2mMDAgTY8K2H4f0b/3sBWWmQ+HkI54oBkxVrUoqBHMcEnfHBU5K+KnHDiYheFw5wzCOQL8tDWrXXBUr3op8GiHttgz25GdYT3/n9c9k= X-MS-TrafficTypeDiagnostic: TYAPR01MB2304: X-Microsoft-Exchange-Diagnostics: 1; TYAPR01MB2304; 20:mRXJNJPQF4cTAlrSGiR18tNkgodfqwYIu+qnzYaIxVO4Q7J4jv9nWk61KJAKHmmgpcVGQy4DRuLZYtvaIbdqVNPSPEkVSAul4N52P9P1zF6xB/snzp/9dKbiH+O4GNxdeb4velh0QGoGxLI2wwmHhe016OVjP3KFkpEg2XQs0iaYO4ZRcLxBySub8pCGgLXx+ilGv/P8Bt5C4ljtBY+BhE3KqK0lE0R9la2DpiatcVtfuXhqKWd6ZIW1vj6tqX5r2ChT4XqD263zRwz9l4YVKGKwAwkBoWjyoSQDzcWjKNgryjQpUVso5AZKESkEwmwmUoe3ewVa74RZ5H+ifbir9AQAjc8SGR/aqcKaiQKHoMN/4OAHFfC4Ky8y4nSmKoM4YoVQ+45CiMGsqlAuAe3tLLSRaFtuNCEkS5ekArNRSC6TXVN8B3T7oUhHkvNnNnBsRYDWJR47bOWgQlDRkIoKK39WW+d8jEbbYELlEViyly5sfZCQpimQaAnfsGBMbP+r; 4:Q0ZuKSpOaQzHGY5kpwnJBvwGJVjMDmY6bSK2EgIlnVq/2gqLGBkK1Uj8+pFAyjXR5X8ySkdIV7qVbpK34IMDYBwiIM+sJh9InzmKKLgUVowXr3ttxgh572Z07hA+JTEwPzv33DzHLUkSJ6boWXJnikszk9Dtkq3ss0rIVvzMhY+WBHMtpL4eT/VA0yGEiKE9eTeAAOZAjJGJFJqQxdaPVk3btUpTijtdjdnjkLrXxZJksYomRooTU61WWpJo7LV/Z14W35kYz7KoIIICnVF4uQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(3231280)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061750153)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:TYAPR01MB2304; BCL:0; PCL:0; RULEID:; SRVR:TYAPR01MB2304; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(136003)(396003)(376002)(366004)(39860400002)(346002)(199004)(189003)(2906002)(50226002)(6506007)(386003)(52116002)(4326008)(47776003)(16586007)(11346002)(68736007)(76176011)(316002)(26005)(2616005)(956004)(498600001)(16526019)(97736004)(5660300001)(6346003)(66066001)(51416003)(486006)(42882007)(476003)(446003)(78352004)(105586002)(305945005)(6486002)(50466002)(48376002)(6512007)(7736002)(36756003)(106356001)(81166006)(25786009)(3846002)(6116002)(8676002)(107886003)(53936002)(8936002)(81156014)(3720700003); DIR:OUT; SFP:1102; SCL:1; SRVR:TYAPR01MB2304; H:localhost.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:0; MX:0; Received-SPF: None (protection.outlook.com: localhost.localdomain does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=<>; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; TYAPR01MB2304; 23:SfZSKbCmFff0sVAs5sNVesiW8xrtT8xswA9+2pabn?= =?us-ascii?Q?rYAbUgwOHaSB9QPQ1W++OCHjtb/vtvqixbWBAlrRrtG32IMZjDHVl6QDR20q?= =?us-ascii?Q?UV5Ktj5exN1DrafE0lxgqPy8fjsqvrB/N+Kc/d6RR5ObLTfxkBjRPc8Cy6kq?= =?us-ascii?Q?Odzd+DLnMaxH8qMSxcQZginQ1sGjujCVbmikmCu9syc6K60MqD8MyJTb4u7i?= =?us-ascii?Q?YKIn5HDTcel3MThdWEZL9Pu/m4KVN0C3ryue/KWT0NgMSbNkR5/O7xN/0o0y?= =?us-ascii?Q?Drg6YYaJclcmyAs0OMFjkMn/lVfCaU4rGoqDsEuHKfBhV2PZ5dZVFPNRbm1E?= =?us-ascii?Q?2cOzVsdxxfRvqbFQk0jBZdslkpJg4j5bHXScPL2JzFh3Tccqqp9oZVmt/n7s?= =?us-ascii?Q?FcmcXmwi6a0mb3mamWV88oavaS99ATlW07xN34p9WeHSnWd1teCRBhI9ing8?= =?us-ascii?Q?EgAdpqS0KU2N/t1iI8KGomZK76H26Pok2U9j5h8Cm+beO84CAl+wNUmQtWed?= =?us-ascii?Q?YHE3kNuYnQsmDkgbZ39kJjOEQwOilRBpneYFuks/ndDIFwS9iE+hjfn7i+Ux?= =?us-ascii?Q?kCSBdWV0M9ZvXDQRQwhpJ/LJS7oBty3ycKpYdH8Nt58DHKP2hkTBlmY441rk?= =?us-ascii?Q?dhGaw8myzqaF6GcByjPzntYnUqe20g+3UUGAvh7hjvJzFiLPrn6qIbDlke6m?= =?us-ascii?Q?Hu0h+TOA2FH7xBdBDFPvDTAgqSFGKyYEZgfMiukVLyQ1v2NKyvFVGD/7Azzf?= =?us-ascii?Q?X6R0q6NFnmjIoxBE9YTKBfT/GJVUbho01T1WBWHh/gRaz4q9VoSWqEanJyyV?= =?us-ascii?Q?okChSgJ2fuQNnx731pJTZVYEI/k2d/UXcOPtZZm0dj/xdRk9j+wjBsP6Rt7c?= =?us-ascii?Q?lmY8RKktXp2yrO6La9/VSjRrEYWdGpEuZ5G4oPDnrmlhpn6/ghHEcwwWKQQ1?= =?us-ascii?Q?lcmph23k0eAX70oLqvWDpr19e5Jl+b2Vst24jX9BcHTGI8JpcZsfVlHuosVI?= =?us-ascii?Q?oRCd3t54I8tnJk0cLZxOP0TT+opklovyOsKdlXwehsyShqwTtYYbA+2GtF3i?= =?us-ascii?Q?H7kZRHqGe5DaMyJvO/WViskXoUpLTT72ieSHiRMUnXKwy+2Uw1iJsnvYyjhJ?= =?us-ascii?Q?Wdlq+lKPi0+x0W1J659D+Nlpr6SVDrt5TSAHOQviRkvOM/19pOs9QbznvRWe?= =?us-ascii?Q?n7jIElTuCW5CElpgIPvcefQh0MfMDg2n6zFKwI72mKPhDVNINh46Q9y+A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: gjolAK0f57GXrrf1MFfePUF/0M/J1UeTHNz3uvwVznQVsj1gG414NKm/7A6UtfAa6S1bBA9l2BuAMAL/Mvozvb8hhfOw0POC8xrnkCVohkHEosQh7QWciZifQp001qmC+iUWeBLOi42RUEzZN5xfHMQ/fKWZt3uayxW1GXEnTUsBGN0V3OmA8o6pEPB336Rks54WR9SY2oAKDxcVk5nEyw3pXfd5mtwMhuVLFJQOOABzT2pMvWi62+vSehUjf4BpVcaXmSVkRQw2IbjpdRxvUUISVpWOPgmX/bpzB5ZQs/nORdEfe1smFq4O78UGbtv9Y1yD5mkd4p1V8nrfg3WdHoRp8nhGtO6ZRpl6iLGWaKQ= X-Microsoft-Exchange-Diagnostics: 1; TYAPR01MB2304; 6:an3dnhGy7UmFrZQ1Knfw9m721pDrcbWHAY8FrkVmEMyYry9D/sfASr89tk6YU+PSwPYEd+BZ6+2rzwoGDgQ9IndyKLvOqQAT/pxSMKOyuv3Hz7xKHtWIJJ7x/4gLdgNOpDMnTBPZiP1kz1UtTMGhUhVukdY22r/VSR5xf+5LD1vH9Lhxk7t+28H+2r270mkHUDHl1nuRMWW2ORMAJ3eyExmhuo7diL/G6VFs5DDuZWftledjrh1BsorCmkjiTq+xHQE3q9ILl8uN36066ZX9bdKec8uSe4cZujaHu/aVe54JU6MJ37c62vBMehJ/HSk73BGRkAvVk9eKCJAGXAYa/YqtMJCml8XNcv2uONO8xtUS5eowlg2BoDaZIFrrzxESVlfsPQjZjdA0YOFIvUhaVzeNV4BbWz0dh+o0+nAugu6U8zrqzfo+rxXaZ8DG+DPBeqf+OpT9miOxrhDUBibs8g==; 5:RH7P/6r1AYrv1o/BYid8uc8J19PXgzCcLJgKu77hHU9j0q4Z+gaBkBIypQPZ6vfkgHwSFvXIL7Ei8gBcUDuGR4RKoWfI4P+HI5kMve2AQpcbqRIwxThOkKEHBYU2ohx9KPMjmx1t2miTrnKdebJKOqlJ0ZPYpBx+D50DgTahqTA=; 24:nKwanX7dASCF3PkG/frBxFWmztTw5M2JiZTyAKxKh2+870JAes3kUkEx3GpEfi+SifD+Jw/mhS1KiR2KIz/DRPJkikbF2Xsn9Np9QPsPnvs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TYAPR01MB2304; 7:Ry8L8xM5z+ypubTydus7r8pe4aXUG31hQrAYX8vngaOVS54k3TWxYKYVlPUXdy9CEYVCvRN/R7IhjVmABGQMJ+M87Sgajy2JTnwR+l17tRC5j9mP3eXbOf5mztFwumSJE5GECKxWXoNt4u7tT1Maah8KznneXLPAZDHGwJlweqL3QeNZZH0LcRgU74ZV+DTFCMXtDVKXcXC2Lj7uI6DjkbOOVdcKq7mxT+xYG9Jv/HI6WjKYZEWtBidBt0rgnSRK; 20:PrpB7jiKiBfZYaGQ4R74kfF23kYpAS2ytpIM9swDXIxtlry7PNutWR80lexqJkRrbnkFVuKfrqqfjRfALh4Tr+Q2cgjwLfzV15Ek4CG9u+xVGsIndlI9xtY+Soi1IjSHPbjgtIIHKHDkfeF5YgJ8o5sc4rW7nf2bkaZSkI10qhI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 10:47:57.1663 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: efaec390-17c1-49d5-b3b7-08d5e0d27026 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAPR01MB2304 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch simplifies getting the firmware name for R-Car Gen3. Almost all R-Car Gen3 USB3.0 Host controllers use "V3". But, r8a7795 ES1.x SoCs only should use "V2". Since the xhci-plat already has the firmware_name of R-Car Gen3 as "V3", the xhci-rcar doesn't need some members of rcar_quirks_match. Signed-off-by: Yoshihiro Shimoda Reviewed-by: Simon Horman --- drivers/usb/host/xhci-rcar.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index f33ffc2..4a22f25 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -17,9 +17,8 @@ #include "xhci-rcar.h" /* -* - The V3 firmware is for r8a7796 (with good performance) and r8a7795 es2.0 -* or later. -* - The V2 firmware can be used on both r8a7795 (es1.x) and r8a7796. +* - The V3 firmware is for almost all R-Car Gen3 (except r8a7795 ES1.x) +* - The V2 firmware is for r8a7795 ES1.x. * - The V2 firmware is possible to use on R-Car Gen2. However, the V2 causes * performance degradation. So, this driver continues to use the V1 if R-Car * Gen2. @@ -75,18 +74,6 @@ .soc_id = "r8a7795", .revision = "ES1.*", .data = (void *)RCAR_XHCI_FIRMWARE_V2, }, - { - .soc_id = "r8a7795", - .data = (void *)RCAR_XHCI_FIRMWARE_V3, - }, - { - .soc_id = "r8a7796", - .data = (void *)RCAR_XHCI_FIRMWARE_V3, - }, - { - .soc_id = "r8a77965", - .data = (void *)RCAR_XHCI_FIRMWARE_V3, - }, { /* sentinel */ }, };