From patchwork Tue May 10 05:24:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Goswami, Sanket" X-Patchwork-Id: 571493 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99528C433F5 for ; Tue, 10 May 2022 05:25:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236717AbiEJF3u (ORCPT ); Tue, 10 May 2022 01:29:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236707AbiEJF3r (ORCPT ); Tue, 10 May 2022 01:29:47 -0400 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07on2041.outbound.protection.outlook.com [40.107.95.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 946113BF90 for ; Mon, 9 May 2022 22:25:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QVd0uqbUF+lOCNMvJiiWwRYxAyxbzhzQPObwELNik7k4WrRjQimfkKR1dsRxedBQ1meE1168VlT9AZTzFaHhrvDdcLEcImbSoDCB8oSic4/6W9rVG75Z6TL4XpxC9kD4RzRnhUyQBy0ACnKobT5G+vEASIfSK+bxP8BN0AKPwiaF2ZzywyIwScxxP1SczAoP+qQwr5i/RaP8+Gty5qXSxpao4e+RPyXxVrMOBJ82aBx1i9woXrqOZywdxQWqLanAUcW+K3roCBIngdE5S1845oYH6DDkWsNxtWx4gIqyIH+Tlc9Rqyask/cfBKcEd0kY0PoEV9N2q+NivlSIjRyfEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IVR6QcctdzpYsMcx3CKYOzyP0E/LHE55ITo6BR8cdFo=; b=UIyYk6w2l+lbmSyMt2Z9anvHm8nDDqll7za7bdn93va1r+tAin0RQG9E78d8PKpdui4j7vM/65U44aVN0Iipm0jbMZmPs5gwRnSiXeYhC2G6GV3B+EpW7S+Bm4UWwxwoaRFE1vDJz2J6OWJJoG07OBE1LDF91B5qPoREDxFkO/wQzltrc6pvRXVyZ4EOmo1z/jZDOS5750rscPoryPTXmYHobhhrQuEt2HYATRoc6BqGj25+IgyRbqQGk0b+0aVv+1HDNhkicYu0LM/Y2EKVQx+W0nQGWKHmCP9juzA9L3A2d/W8jbLix+HiP3MMsoiJyjbLvFRXESlLPlPORNYdlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux.intel.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IVR6QcctdzpYsMcx3CKYOzyP0E/LHE55ITo6BR8cdFo=; b=L2g89gs4DtfmhgIzhvbjys/XfRcvN5p8zB2sw9bPExbrPNWbkquafEgxmt9WqBtwF6stVLzGmAB01sdX8pNy7cQ+a2FLcnE2eD3TuAE6e14gJUaEHeMk7aPJEBmRezjZr4AhgqVBeK4ImZWWnn9FYNlsvDjhqLt4KajRf3zitfk= Received: from DS7PR05CA0097.namprd05.prod.outlook.com (2603:10b6:8:56::26) by PH0PR12MB5607.namprd12.prod.outlook.com (2603:10b6:510:142::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.18; Tue, 10 May 2022 05:25:41 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:8:56:cafe::c0) by DS7PR05CA0097.outlook.office365.com (2603:10b6:8:56::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Tue, 10 May 2022 05:25:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Tue, 10 May 2022 05:25:41 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 10 May 2022 00:25:38 -0500 From: Sanket Goswami To: , , , CC: Sanket Goswami Subject: [PATCH 1/2] ucsi_ccg: ACPI based I2c client enumeration for AMD ASICs Date: Tue, 10 May 2022 10:54:36 +0530 Message-ID: <20220510052437.3212186-2-Sanket.Goswami@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220510052437.3212186-1-Sanket.Goswami@amd.com> References: <20220510052437.3212186-1-Sanket.Goswami@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 538bf712-1b35-4b0e-381c-08da3245863a X-MS-TrafficTypeDiagnostic: PH0PR12MB5607:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FaLrGOw/XDLAfYlvgPwz85BPBClchurCLaGdKmC58of6/Pw/HcMXBYU+ihMvcQZ/xTkGDJ0JvJLpNdHAn4qpdlfTOX8MfbsG+mK6fbWoWT9AEtxEUwQ409FzwxliYjvXDy4GusvQdz+r9HSODeTpbbnlKJEkWJkQPRMZNk33ndzgT8y+FE7jAPRVY1OuwAS5XmZyt3WEMtlVSLQfxZ9sQq8RigZXDYdRJn6uXTkHJu0CdvCnHn4pjKwjjmkI7s/eTD2JZliIvmenRj4s4tk/ZgqOLXcGqPBIgh9BT+BuNNG4GKbvwilVU8qNw6OHjZHhNMP3AefYIuDq+kI4s3Cxoe+lVZyJtjUXLQHubjRNMSWpo5OU7nuEa3SMcJHqrMfVq6eK47SF6MZYKaCOhfJvoPPCo+6SGNYRhu6EhK5fMh4fAu+/AV4ZOfEZvWZ9Yv7X9EwtHdv4xqrPP8LzXJDGBcuGDSJtnrmKpwpk6ynkqHU1xymI0lTRcKONfYgE1VCqAJi2znnlZjvy/XxaUtDGYj3RCW4H71UtzxgQYArXRiLQFu7cygb5sNrO81kd4CuE6+q5uEkqDkyNV4K3OMjByLryBJUTwpkpNyimY7N78nz+ogea3YS9dCcQL0AJnMjzP80MxabxRgXDMEdXObydT7kwekzzQOXqr5etDR7C5S6HrBAXH+38lp1w5Mz89XkqAflKh30/IZP4kskYxLxM/Q== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(7696005)(508600001)(1076003)(8936002)(16526019)(81166007)(2906002)(186003)(36756003)(316002)(336012)(47076005)(426003)(2616005)(5660300002)(70206006)(82310400005)(70586007)(86362001)(4326008)(8676002)(356005)(40460700003)(36860700001)(110136005)(26005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 05:25:41.1503 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 538bf712-1b35-4b0e-381c-08da3245863a X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5607 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Some of the AMD platforms have Cypress CCGX PD controller connected to system I2C i.e designware I2C controller. Added support to enumerate the CCGX client by adding ACPI ID to the firmware. Signed-off-by: Sanket Goswami --- drivers/usb/typec/ucsi/ucsi_ccg.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index 6db7c8ddd51c..7585599bacfd 100644 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -1418,6 +1418,12 @@ static const struct i2c_device_id ucsi_ccg_device_id[] = { }; MODULE_DEVICE_TABLE(i2c, ucsi_ccg_device_id); +static const struct acpi_device_id amd_i2c_ucsi_match[] = { + {"AMDI0042"}, + {} +}; +MODULE_DEVICE_TABLE(acpi, amd_i2c_ucsi_match); + static int ucsi_ccg_resume(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -1459,6 +1465,7 @@ static struct i2c_driver ucsi_ccg_driver = { .name = "ucsi_ccg", .pm = &ucsi_ccg_pm, .dev_groups = ucsi_ccg_groups, + .acpi_match_table = amd_i2c_ucsi_match, }, .probe = ucsi_ccg_probe, .remove = ucsi_ccg_remove, From patchwork Tue May 10 05:24:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Goswami, Sanket" X-Patchwork-Id: 571765 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4578EC433EF for ; Tue, 10 May 2022 05:25:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236716AbiEJF3t (ORCPT ); Tue, 10 May 2022 01:29:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236710AbiEJF3r (ORCPT ); Tue, 10 May 2022 01:29:47 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2083.outbound.protection.outlook.com [40.107.243.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 744895A594 for ; Mon, 9 May 2022 22:25:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jjFLtrW2tSKj2gWHls1WZV3QQ8Nk2GpclQHmXiMg/YW8IuiHlK/zW+e0n68sMAUUpQBzOw1q3kbZrji0Q4NWluxLSOzPyVDRrktDyRLR1LJJBmL9NoaVodYRoHDQFxnIyxycjmYL38EFIh1QtNUPDHseGO9SV6GriZqHJdo/TQ6Vu+OYm8wcJ0KiQnBMZv6krUqSaXloL/UYAN7AjTf6AmQxkdufwoy0IKuCdd4K5G8dz2/Zv/VSyc3xOZqMP9WdzIMrdG+CuD8Tc9sWp++AsGAw13OH+xsNVGjcETCGZzj5qYepqJf4lx3/YRnGGIZpAELPTewRu6uDxWOQl9/0Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mbYAJD/8Z43wEqURSoC5ssua5a5Ap+UPDqwevh8yLks=; b=X/UzZp0uD5Bw2ezrkJnEP6+09bqLN/m+K3LjUPMjhImnoKJtb2GnUqI/V9VMzMJVYDuBNWD6CbskmVoz5IOHB6iz/OHg1ROo/YBKk/XxALenB6Cee/cZEQfhHKtBsc+CZstv5mA8euj9UEYmzlKAmJ8xchQvik/AcgpWFJ+t7pGYAA9cdq0uI7ltSMbldS5im6rVEt+MR8PMO1UOJ+CU9OtoKt0NjQL5FhR0oBkX+qgEC+fSCnWt6OLKMOSWci2QdQGdkYLbvrHl1Up4eE3t12M2/BuV9lfdCOSJVVsv+DtSUEW9dbRQYkTp75aO8+X1X2lVF4V9qNK/xU4lw/sqLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux.intel.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mbYAJD/8Z43wEqURSoC5ssua5a5Ap+UPDqwevh8yLks=; b=yZWsrAIbmK0IqHuDB5NPHRqbjBDZtQ4FeO9OiivBMnbRljJxGYALSv3mI2rGro3jFB4kubCNtsquwQ6Mc3ywOKWf1aVoNimNpkyxShGbPW3EXzBQuOVA5mMcH7iAYomzhHzNwzNfHSBX8Xx3o6HYS6eOlIINCtewr021QhRMu84= Received: from DM6PR06CA0052.namprd06.prod.outlook.com (2603:10b6:5:54::29) by BL0PR12MB4932.namprd12.prod.outlook.com (2603:10b6:208:1c2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.22; Tue, 10 May 2022 05:25:45 +0000 Received: from DM6NAM11FT046.eop-nam11.prod.protection.outlook.com (2603:10b6:5:54:cafe::fd) by DM6PR06CA0052.outlook.office365.com (2603:10b6:5:54::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.20 via Frontend Transport; Tue, 10 May 2022 05:25:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT046.mail.protection.outlook.com (10.13.172.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Tue, 10 May 2022 05:25:45 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 10 May 2022 00:25:43 -0500 From: Sanket Goswami To: , , , CC: Sanket Goswami Subject: [PATCH 2/2] ucsi_ccg: Do not hardcode interrupt polarity and type Date: Tue, 10 May 2022 10:54:37 +0530 Message-ID: <20220510052437.3212186-3-Sanket.Goswami@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220510052437.3212186-1-Sanket.Goswami@amd.com> References: <20220510052437.3212186-1-Sanket.Goswami@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e810f01-ec9e-4302-64ed-08da324588b6 X-MS-TrafficTypeDiagnostic: BL0PR12MB4932:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mpYeBo2mzfY+tNm8peFEleawg1NPcGubBOWcxkigKUEsOLcU0rzyK98rLH7bOjq3sCYLL/Yg+jh0przWhlEhi6QXhPsFOeHnsWrI6rheGeSuQkxlP+7Qbt9XAR1s02M5jL3n7feCJEA1WV5tiSe4qcLVYirtd3xQwsri/+onwN3246dvtHLTrSiq0rF/xGiQ5suJ8BvVVNHt1d04+N6tCHZFK/9E2BuaxTMi6XcHNCfNP2PhKq6BWRj6onTxeAz6mGfA3O28EFW2Rs9F88P2iHWPe/vERCMxq4zJci4dkbJN/apH7WhQfoMSIhdR2LNm9aoH2DgXIC4u7cpTG6Z+0XQxar2y9RKo+3FTRxYJppGAXBQrZ9k/c+bMElaumi+FwLUSjhqTqiLqLH5o/HHh64uTVTqNuyDC5qPq+AH1eGCAsb5l9d/D3g6vseQta09EhPb1sk2gJj5LIxKGHpqktNw+1VkHlTpzDLshNMbcOfuBXRaJm2J/yQfl/d1Z+cIU375ZqE/jKzr/kkXRpnuAsuNgIvDjU5/10A1sWlf3viyfYP9Vlfop8vhElQgdSpO/c1IQetPrqrurJQidHNGFv7ZJhxhGv42dchsRlEcgwH8FhaTEiJKiqd6PG4y099sof8ZZQ12pjmvqfzYJ53PotgEItE5mMrn5a5CEgv1jdMIllKqgS7wrZ7Obn1cqWbTQdjmiG720TgMp4I37gFCSMg== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(186003)(8676002)(47076005)(2616005)(426003)(336012)(70586007)(83380400001)(70206006)(4326008)(508600001)(1076003)(6666004)(86362001)(26005)(82310400005)(316002)(7696005)(110136005)(16526019)(40460700003)(36860700001)(356005)(81166007)(8936002)(36756003)(2906002)(5660300002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 05:25:45.3196 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e810f01-ec9e-4302-64ed-08da324588b6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT046.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4932 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The current implementation supports only Level trigger with ACTIVE HIGH. Some of the AMD platforms have different PD firmware implementation which needs different polarity. This patch checks the polarity and type based on the device properties set and registers the interrupt handler accordingly. Signed-off-by: Sanket Goswami --- drivers/usb/typec/ucsi/ucsi_ccg.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index 7585599bacfd..0db935bd8473 100644 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -20,6 +20,7 @@ #include #include "ucsi.h" +#define INTR_POL_TYPE BIT(0) enum enum_fw_mode { BOOT, /* bootloader */ @@ -1324,6 +1325,8 @@ static int ucsi_ccg_probe(struct i2c_client *client, struct device *dev = &client->dev; struct ucsi_ccg *uc; int status; + /* Keep the IRQ type and polarity default as Level trigger Active High */ + int irqtype = IRQF_TRIGGER_HIGH; uc = devm_kzalloc(dev, sizeof(*uc), GFP_KERNEL); if (!uc) @@ -1366,8 +1369,12 @@ static int ucsi_ccg_probe(struct i2c_client *client, ucsi_set_drvdata(uc->ucsi, uc); + status = (uintptr_t)device_get_match_data(dev); + if (status & INTR_POL_TYPE) + irqtype = IRQF_TRIGGER_FALLING; + status = request_threaded_irq(client->irq, NULL, ccg_irq_handler, - IRQF_ONESHOT | IRQF_TRIGGER_HIGH, + IRQF_ONESHOT | irqtype, dev_name(dev), uc); if (status < 0) { dev_err(uc->dev, "request_threaded_irq failed - %d\n", status); @@ -1419,7 +1426,7 @@ static const struct i2c_device_id ucsi_ccg_device_id[] = { MODULE_DEVICE_TABLE(i2c, ucsi_ccg_device_id); static const struct acpi_device_id amd_i2c_ucsi_match[] = { - {"AMDI0042"}, + {"AMDI0042", INTR_POL_TYPE}, {} }; MODULE_DEVICE_TABLE(acpi, amd_i2c_ucsi_match);