From patchwork Mon May 31 13:34:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 450565 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74CE2C47083 for ; Mon, 31 May 2021 13:38:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44D9861953 for ; Mon, 31 May 2021 13:38:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232083AbhEaNjH (ORCPT ); Mon, 31 May 2021 09:39:07 -0400 Received: from mo4-p02-ob.smtp.rzone.de ([85.215.255.83]:16610 "EHLO mo4-p02-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232370AbhEaNg5 (ORCPT ); Mon, 31 May 2021 09:36:57 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1622468094; cv=none; d=strato.com; s=strato-dkim-0002; b=Mm4ccRTf4qPETdpv0td27lQMGxExBSb44+JIcH4RFl1sH84W6LMql2MYHrn1tb3WrF j5fNB1Po+P/sW5Zfet8lKfCDq6zhWAmlJM8pmnGepG7BuSqLFCv7f4Z0xNSCv4mCA6Lh nrH9kmJjhsinSeU+9rtW1DYbYVJhKZYovAEldV1bl43Ys0iqyQgB/QibEPbGjrrbNkZ0 BKdKXHY3owGLsUCMdYXzPd4KaGKNFuE3EaNgepWU56F5rJQJgksLoHhIj2enBaCyys1C VNHNOSYoof/TUZQ+C8kAdUoZ6GjbRGT7kjNPZ+3LyLlZ2GJWRqyjjnFeB5iDEv1PRII1 BA+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1622468094; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=K2eJgpXpY/tpzZTBI+UgcYaqxpRI58FPkFkDl3yfQRM=; b=L2QTHmym/F7Lxg3E6KcUa+IxaA7OcknTYd/SwpXFlBBofwwWbmnzYxvI8JIyL+Srog uWIvY19dyb/jacemNW2Uxtth9dY62zME+wO4aVSDobi9zt/lqM8ECizQSA7c7DChh0v0 VAAQoQ7u1IjLVbZHrajedxf0qI3avAC/mBfMctlP3DU4DMw2e4e0oK/xL8c9Hhw3Lq94 1mR9ECuV3nP8nKASWp7uRi4Tzlqib/uePUbxv4rl2sO0VSmk0JUGtVQqX1psRmesh9Tk D0XxX5Vaqs4CmzIh7Tf2RYjFvs1i9P0t3gMrrNINebsmn8XrfLGJFZ4epSnaSr0EHVlH Cf3g== ARC-Authentication-Results: i=1; strato.com; dkim=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1622468094; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=K2eJgpXpY/tpzZTBI+UgcYaqxpRI58FPkFkDl3yfQRM=; b=jtWyRGL4G9GLbyaZPahM0gkJxKnnJzuAdtv4T0LB7epZi2vNFMBdWXKG45lALq1UjQ ItrgLnrmHIFkG5PZoYMiOVTnhZc97c69h5YwZMqZMXTIm5WcmfD6U3SkfzYfN27+UASM 2rRi5JAZ2UBxJwDVeHhx9eZc4crvEGTJgHPpYm/9rIj+mIb1u4Zs4twc9Kaf8qHc2JLp q9AqoBk3if9DGIZ6T0cWH0VP/TSSLHdP4S3fG9ePz47UaFVMKu/mmrj8yFOuTcO2aCfV NYDuxoVididt8fp+ie4mpiA2g72cfJMBWHcVzybZ1L3ADeaq62GAeHVsu6ZI/psE/7qd YpxQ== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXS7IYBkLahKxB526Kcak=" X-RZG-CLASS-ID: mo00 Received: from droid.. by smtp.strato.de (RZmta 47.26.3 DYNA|AUTH) with ESMTPSA id U0b2c9x4VDYsKx9 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 31 May 2021 15:34:54 +0200 (CEST) From: Stephan Gerhold To: Chanwoo Choi , MyungJoo Ham Cc: Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Nikita Travkin , ~postmarketos/upstreaming@lists.sr.ht, Stephan Gerhold Subject: [PATCH v2 2/6] extcon: sm5502: Implement i2c_driver->probe_new() Date: Mon, 31 May 2021 15:34:34 +0200 Message-Id: <20210531133438.3511-3-stephan@gerhold.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531133438.3511-1-stephan@gerhold.net> References: <20210531133438.3511-1-stephan@gerhold.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org sm5022_muic_i2c_probe() does not use the i2c_device_id, so implement i2c_driver->probe_new() instead of probe(). Signed-off-by: Stephan Gerhold --- drivers/extcon/extcon-sm5502.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c index f0d155cf7518..907ecd01ebb7 100644 --- a/drivers/extcon/extcon-sm5502.c +++ b/drivers/extcon/extcon-sm5502.c @@ -563,8 +563,7 @@ static void sm5502_init_dev_type(struct sm5502_muic_info *info) } } -static int sm5022_muic_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int sm5022_muic_i2c_probe(struct i2c_client *i2c) { struct device_node *np = i2c->dev.of_node; struct sm5502_muic_info *info; @@ -704,7 +703,7 @@ static struct i2c_driver sm5502_muic_i2c_driver = { .pm = &sm5502_muic_pm_ops, .of_match_table = sm5502_dt_match, }, - .probe = sm5022_muic_i2c_probe, + .probe_new = sm5022_muic_i2c_probe, .id_table = sm5502_i2c_id, }; From patchwork Mon May 31 13:34:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 450566 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A43B9C4708F for ; Mon, 31 May 2021 13:37:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 848226194F for ; Mon, 31 May 2021 13:37:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232080AbhEaNjD (ORCPT ); Mon, 31 May 2021 09:39:03 -0400 Received: from mo4-p02-ob.smtp.rzone.de ([81.169.146.170]:28316 "EHLO mo4-p02-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232364AbhEaNg6 (ORCPT ); Mon, 31 May 2021 09:36:58 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1622468095; cv=none; d=strato.com; s=strato-dkim-0002; b=ZMN1PWn/TFkfI9Dl6YVPmHIm1UhTF1EJg9KXxSbWUsLbnNWMZR00I8COi3u8WDMByn CEfDJOuq9H82aTFxo3+WZIGxKl8bbT9qsZlfAn59lqQEwY7Vrb1IxZa2sMm/SldFGpTW WBrXoqRmmPyzfGpeS+rTA82KOlO2XBIJzOKiDr/ArooPWyMnj9axtYqV53UrUSrnNSOi nz7Zy3AdWOuNYTHZ8MgGirp3YXBaEQpv4U2rueN/xoVjgN4b5whkwgzY5JL2EzAtaiq/ kKv/teB4C2a+eEHbNUaI4unXNQbe/cvH3X2E06C22me8IYww3KpnpFeGJA8394i2SJBI CQSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1622468095; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=QJ7EL3rdKbTeB2eISpfKJ6qyYsqnmKEy5taAecFN25g=; b=NMxVLxcoFDgEKStNYRv7rXEo98FLcgCfjTw+h8ooJXNjXb3/35Pzo1hCLmRMdnjntN EAHdImqAth9K4F+1LmcAmxVeLFs8ya7Jv7wL69jMERgkltIiGxzm/izZ7AUw68qYCGrR Q0mDw60cZeHsbOaikv1dcdmSeFVuVDnWOQBqlAb4grYlRup2IQ0oOjqZ6XbcEYF9hcNx rrYiOgaYvIfF42jo1RFCxZzHTIyv8C5wIm/F59xC50LzqDLL8WU9N3DS37mYlKh28H+i CXd+P2MDw0/8oMqNhyBywTOYuzClByBr/e5YiZk9vgnhiOoTdccbyZzbusPIJZkt6nPh QceQ== ARC-Authentication-Results: i=1; strato.com; dkim=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1622468095; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=QJ7EL3rdKbTeB2eISpfKJ6qyYsqnmKEy5taAecFN25g=; b=W/8CMJpkxLvLFegqBBZxCvR5VWFJ3g1PJgxETg567ubrIcEL2U6n3RNuG2t8/SGW2F eJ+4KcKy2e6xW+J0kxF///r93M8puqRKOG4AbEOo71fR7tXHLiiLkjIHp+yjGPE3q27s TmJN74fpmPxoUMrkCA/x5kA81jfAPQwn1IWbMwsVQWEbA+HboPOlzzxrWWH3qPbK1sKe 92r7XwxWcuHEYMCTxgZSvYAKSsBCD9DFlp4YJQrcP+TtmTbczzccJVeWHcOcmfwX98F5 LMXt9dt1TapQpZ4lMlNgGJo7K2O50fkhGblAhaL0NlWFJ9wsHhby1es1v6wjzQpwpXbj fSNg== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXS7IYBkLahKxB526Kcak=" X-RZG-CLASS-ID: mo00 Received: from droid.. by smtp.strato.de (RZmta 47.26.3 DYNA|AUTH) with ESMTPSA id U0b2c9x4VDYsKxA (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 31 May 2021 15:34:54 +0200 (CEST) From: Stephan Gerhold To: Chanwoo Choi , MyungJoo Ham Cc: Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Nikita Travkin , ~postmarketos/upstreaming@lists.sr.ht, Stephan Gerhold Subject: [PATCH v2 3/6] extcon: sm5502: Drop invalid register write in sm5502_reg_data Date: Mon, 31 May 2021 15:34:35 +0200 Message-Id: <20210531133438.3511-4-stephan@gerhold.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531133438.3511-1-stephan@gerhold.net> References: <20210531133438.3511-1-stephan@gerhold.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org When sm5502_init_dev_type() iterates over sm5502_reg_data to initialize the registers it is limited by ARRAY_SIZE(sm5502_reg_data). There is no need to add another empty element to sm5502_reg_data. Having the additional empty element in sm5502_reg_data will just result in writing 0xff to register 0x00, which does not really make sense. Fixes: 914b881f9452 ("extcon: sm5502: Add support new SM5502 extcon device driver") Signed-off-by: Stephan Gerhold --- drivers/extcon/extcon-sm5502.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c index 907ecd01ebb7..9f40bb9f1f81 100644 --- a/drivers/extcon/extcon-sm5502.c +++ b/drivers/extcon/extcon-sm5502.c @@ -88,7 +88,6 @@ static struct reg_data sm5502_reg_data[] = { | SM5502_REG_INTM2_MHL_MASK, .invert = true, }, - { } }; /* List of detectable cables */ From patchwork Mon May 31 13:34:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 450564 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06231C47082 for ; Mon, 31 May 2021 13:38:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D67E1613A9 for ; Mon, 31 May 2021 13:38:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231580AbhEaNj7 (ORCPT ); Mon, 31 May 2021 09:39:59 -0400 Received: from mo4-p02-ob.smtp.rzone.de ([85.215.255.80]:12665 "EHLO mo4-p02-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232350AbhEaNgz (ORCPT ); Mon, 31 May 2021 09:36:55 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1622468096; cv=none; d=strato.com; s=strato-dkim-0002; b=CDlKXnxCVJpX5VaZyyVKIdYwX2+CAPl4G0S86ug9RWhIdIuPN1tlO2ux3mJlVQh7L0 UA+8WmYXl5yiQWwB4IZ4R3dnBE+oD2C0mrkPg7Z5NqcqmtSsQapxhR0rfnYt0soFxubH 85RnfvEBnCbgp/IPtxA3TxtdGxkPNEo0lkwonpzNQOcE+C9xsZWpu1TbIP8t8Q+sLJ5n aN/rHT7nZfE1anyUOX4Bli5+EfK0l/QaJuAx8o8okqtaoPfeY8eIkxCq/0MhoN4PvnAI AXvuxEjQeXyIwTfjLl0KAcCF6qGscsSJaONW8zSx2TOiVQB9WmBvMocA8TpUjOw4OS1i qDRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1622468096; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=WusjepEf0ImZGQpetBmFDA0rblZD8nyERdVuhtSp86Q=; b=guwQoK6kE+BoqqqfvO+UdILye34ofV1XkqLTAz60XwTuC0yf8E2IYJ9AdYRZGSjIuW iHqaD87Kivxi6LvYSM9ypVBGMcQI9Lo32UFSlEcxX/zR+5Ulhy4WoT7WdCpuMOitFGkM jrD2GV0fEoDnvaYv3vTQk/vH8Et7U5nYpmn7p40yQniGBCOJv6vofyhngPuQGPWx0lda 2am5b17+E412Noloi7Tc7T+vpp8Wl/znYqueDvFSvEq8QqFi0yWvTVMjyt2HCV9Pa5+Y Z4ZZQwCdN7Nd7x0L4OaeVpWnvvoPeywalBGsGoctQ3fmPGddb/Km/j6LMd36qaH+Nr+4 nqjQ== ARC-Authentication-Results: i=1; strato.com; dkim=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1622468096; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=WusjepEf0ImZGQpetBmFDA0rblZD8nyERdVuhtSp86Q=; b=oEazqH9Kcbio3XlIs+c4mVsCSQAP8f4SqoKbzqDnjS4eSOkd5jJPoDv+vAdRp6GHRo 6DdmxAvuIbO6RLDEKvU7gWaxGBSkJZGmcDWUNJg0xUmaO+cTVxjHe5OLYhXv14jyPzdA SMKWyIjK+V9iBqv3eHEnFv1gIKjXUMGMRusCMsx8A7K4GgwZE/LDXCx/UzvUcAfshVk0 9XqwOm4kPOgi619BVlmVpV2jUmUMe1WYGC9EO61WB8exaIw4pCv5ZCIaDVjJCYM2V3vl 4VHfu9la5UjrdhNip0JTrYmki2cX63Vb7ZyrGi+PgNu05SJqQdLEBVelffzr6HYLBgB1 TQtQ== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXS7IYBkLahKxB526Kcak=" X-RZG-CLASS-ID: mo00 Received: from droid.. by smtp.strato.de (RZmta 47.26.3 DYNA|AUTH) with ESMTPSA id U0b2c9x4VDYtKxC (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 31 May 2021 15:34:55 +0200 (CEST) From: Stephan Gerhold To: Chanwoo Choi , MyungJoo Ham Cc: Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Nikita Travkin , ~postmarketos/upstreaming@lists.sr.ht, Stephan Gerhold Subject: [PATCH v2 5/6] dt-bindings: extcon: sm5502: Document siliconmitus, sm5504-muic Date: Mon, 31 May 2021 15:34:37 +0200 Message-Id: <20210531133438.3511-6-stephan@gerhold.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531133438.3511-1-stephan@gerhold.net> References: <20210531133438.3511-1-stephan@gerhold.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Document support for SM5504 with the new siliconmitus,sm5504-muic compatible. Signed-off-by: Stephan Gerhold --- .../bindings/extcon/siliconmitus,sm5502-muic.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml b/Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml index 0432b0502e0b..fd2e55088888 100644 --- a/Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml +++ b/Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/extcon/siliconmitus,sm5502-muic.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: SM5502 MUIC (Micro-USB Interface Controller) device +title: SM5502/SM5504 MUIC (Micro-USB Interface Controller) device maintainers: - Chanwoo Choi @@ -19,10 +19,12 @@ properties: compatible: enum: - siliconmitus,sm5502-muic + - siliconmitus,sm5504-muic reg: maxItems: 1 - description: I2C slave address of the device. Usually 0x25 for SM5502. + description: I2C slave address of the device. Usually 0x25 for SM5502, + 0x14 for SM5504. interrupts: maxItems: 1 From patchwork Mon May 31 13:34:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 450567 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF10AC47083 for ; Mon, 31 May 2021 13:37:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4962613FF for ; Mon, 31 May 2021 13:37:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231778AbhEaNjA (ORCPT ); Mon, 31 May 2021 09:39:00 -0400 Received: from mo4-p02-ob.smtp.rzone.de ([85.215.255.83]:20758 "EHLO mo4-p02-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232223AbhEaNg6 (ORCPT ); Mon, 31 May 2021 09:36:58 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1622468096; cv=none; d=strato.com; s=strato-dkim-0002; b=hEWPuKC+i7I3gP4Z1bHi7iVtMhC6CgFN/kEkRE2oCx50YoP513RuQAb5IafOtTGKXE AJ/FULuE0tiUjkmloDqe2rmZP4/C+fIyU5cU1Letw9Vvju/TegE/7hpBwOYEYPUjOrSL fMazcCtsAGGRO+Y9CsUTLSKoO5w+6FNhI1gBEw6IZ1rF085/qf7dnPelCOVNMuHoRQb2 kFBebncKeqKt0Un+ilCAB+j7FHfzVRtVvpHXZTMRMvjfvs/390IIu/HmeC+dNB7cR/8Z WZwyc/XnR4NviXoGbK6kAs1N2/5Whyxl3viQ4KtwxvYxHRxWs8fMcVOli8IUY71unH+w 9Zow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1622468096; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=OZTKAVDCehGpRws8WzVlUbUXQ1TXE1JIDeOQ2Sr4spI=; b=gBnCgEIz6RWiYJCEXsF+dXDpZRoxKl5ETpkJkSGk2IH3HwYuZd3MkMuCI9725HRq4u kU8ftp7FBdAYJXFpiuSI3lV7gn6SL1fmVKDeEHPq7C7k5Jb3K8BCYLGaiNZ67opbJBvR yfOI+XCYFhRnhoZgJq1EsWOjr1wRPzQvLldIEuSeeFLz+dpKzp6kdaR5JN1egYlJpZRs MYA6stxstykon9S1t7HW6H0KaEatapAIwZV2UvtRdCiXfbIluvfbbw2tmk8O3/Td/VEy yX42Q3rvRFqRvg40iScfiqA4a+igUPWh2nRjeht+hoxyh5sX8a+PicuvWU+FdR/GwRJP l7Jw== ARC-Authentication-Results: i=1; strato.com; dkim=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1622468096; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=OZTKAVDCehGpRws8WzVlUbUXQ1TXE1JIDeOQ2Sr4spI=; b=JnrepLNbnPGNM/4KvZeKr+YayKzLQzTO4MIB8hrbVNc8ncSD9Kx2r5+7D12cTUrSIq Xy7X2KAJBbXCwe9wEz+yXJRd3XFLzLGW2wOrLWMrnyu6fBpl0tKc8v4HL24AJAdj+IRe zh3DYdyamKdfGxLnZtFQM2C6+XdDbdbVXEmdLKqgPd2Ol6VGxDkSyT9CeuYSzHLw6uNx LJZD5xmsp21TuXKz2VyxGVh4zQIL1RR9b9ffCasgMoWt2D61mPc/CPCzsDKfvI8ix5rd M2JGFp7H4Zfgnes6dGpdEOreMbRW6eBjU/qpNUu+4kSOSdL1pz9Ua1XIHM/DMLk21aB9 +PlA== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXS7IYBkLahKxB526Kcak=" X-RZG-CLASS-ID: mo00 Received: from droid.. by smtp.strato.de (RZmta 47.26.3 DYNA|AUTH) with ESMTPSA id U0b2c9x4VDYuKxD (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 31 May 2021 15:34:56 +0200 (CEST) From: Stephan Gerhold To: Chanwoo Choi , MyungJoo Ham Cc: Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Nikita Travkin , ~postmarketos/upstreaming@lists.sr.ht, Stephan Gerhold Subject: [PATCH v2 6/6] extcon: sm5502: Add support for SM5504 Date: Mon, 31 May 2021 15:34:38 +0200 Message-Id: <20210531133438.3511-7-stephan@gerhold.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531133438.3511-1-stephan@gerhold.net> References: <20210531133438.3511-1-stephan@gerhold.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org SM5504 is another MUIC from Silicon Mitus that is fairly similar to SM5502. They seem to use the same register set, but: - SM5504 has some additional bits in SM5502_REG_CONTROL - SM5504 has a quite different set of interrupts - SM5504 reports USB OTG as dev_type1 = BIT(0) instead of BIT(7) Overall it's minor and we can support this using the existing enum sm5502_types plus a few switch/if statements. Signed-off-by: Stephan Gerhold --- Changes in v2: Fix warning: cast to smaller integer type 'enum sm5502_types' from 'const void *' [-Wvoid-pointer-to-enum-cast] reported by kernel test robot Interestingly enough the register set (and especially the interrupts) also look *very* similar to Richtek RT8973A (extcon-rt8973a) but I didn't investigate this further. Note that the changes in this patch are mostly based on guesswork based on a SM5504 driver from Nitin Chaudhary [1] used in some Samsung vendor kernels, since I was not able to find a public datasheet for SM5504. [1]: https://github.com/NitinChaudharyUSC/MSM8x16_8x26/blob/master/drivers/misc/sm5504.c --- drivers/extcon/Kconfig | 2 +- drivers/extcon/extcon-sm5502.c | 164 +++++++++++++++++++++++++++++---- drivers/extcon/extcon-sm5502.h | 79 ++++++++++++++++ 3 files changed, 228 insertions(+), 17 deletions(-) diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig index e3db936becfd..c69d40ae5619 100644 --- a/drivers/extcon/Kconfig +++ b/drivers/extcon/Kconfig @@ -154,7 +154,7 @@ config EXTCON_RT8973A from abnormal high input voltage (up to 28V). config EXTCON_SM5502 - tristate "Silicon Mitus SM5502 EXTCON support" + tristate "Silicon Mitus SM5502/SM5504 EXTCON support" depends on I2C select IRQ_DOMAIN select REGMAP_I2C diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c index 9f40bb9f1f81..49a35db61112 100644 --- a/drivers/extcon/extcon-sm5502.c +++ b/drivers/extcon/extcon-sm5502.c @@ -40,6 +40,7 @@ struct sm5502_muic_info { struct i2c_client *i2c; struct regmap *regmap; + enum sm5502_types type; struct regmap_irq_chip_data *irq_data; struct muic_irq *muic_irqs; unsigned int num_muic_irqs; @@ -90,6 +91,33 @@ static struct reg_data sm5502_reg_data[] = { }, }; +/* Default value of SM5504 register to bring up MUIC device. */ +static struct reg_data sm5504_reg_data[] = { + { + .reg = SM5502_REG_RESET, + .val = SM5502_REG_RESET_MASK, + .invert = true, + }, { + .reg = SM5502_REG_INTMASK1, + .val = SM5504_REG_INTM1_ATTACH_MASK + | SM5504_REG_INTM1_DETACH_MASK, + .invert = false, + }, { + .reg = SM5502_REG_INTMASK2, + .val = SM5504_REG_INTM2_RID_CHG_MASK + | SM5504_REG_INTM2_UVLO_MASK + | SM5504_REG_INTM2_POR_MASK, + .invert = true, + }, { + .reg = SM5502_REG_CONTROL, + .val = SM5502_REG_CONTROL_MANUAL_SW_MASK + | SM5504_REG_CONTROL_CHGTYP_MASK + | SM5504_REG_CONTROL_USBCHDEN_MASK + | SM5504_REG_CONTROL_ADC_EN_MASK, + .invert = true, + }, +}; + /* List of detectable cables */ static const unsigned int sm5502_extcon_cable[] = { EXTCON_USB, @@ -198,6 +226,55 @@ static const struct regmap_irq_chip sm5502_muic_irq_chip = { .num_irqs = ARRAY_SIZE(sm5502_irqs), }; +/* List of supported interrupt for SM5504 */ +static struct muic_irq sm5504_muic_irqs[] = { + { SM5504_IRQ_INT1_ATTACH, "muic-attach" }, + { SM5504_IRQ_INT1_DETACH, "muic-detach" }, + { SM5504_IRQ_INT1_CHG_DET, "muic-chg-det" }, + { SM5504_IRQ_INT1_DCD_OUT, "muic-dcd-out" }, + { SM5504_IRQ_INT1_OVP_EVENT, "muic-ovp-event" }, + { SM5504_IRQ_INT1_CONNECT, "muic-connect" }, + { SM5504_IRQ_INT1_ADC_CHG, "muic-adc-chg" }, + { SM5504_IRQ_INT2_RID_CHG, "muic-rid-chg" }, + { SM5504_IRQ_INT2_UVLO, "muic-uvlo" }, + { SM5504_IRQ_INT2_POR, "muic-por" }, + { SM5504_IRQ_INT2_OVP_FET, "muic-ovp-fet" }, + { SM5504_IRQ_INT2_OCP_LATCH, "muic-ocp-latch" }, + { SM5504_IRQ_INT2_OCP_EVENT, "muic-ocp-event" }, + { SM5504_IRQ_INT2_OVP_OCP_EVENT, "muic-ovp-ocp-event" }, +}; + +/* Define interrupt list of SM5504 to register regmap_irq */ +static const struct regmap_irq sm5504_irqs[] = { + /* INT1 interrupts */ + { .reg_offset = 0, .mask = SM5504_IRQ_INT1_ATTACH_MASK, }, + { .reg_offset = 0, .mask = SM5504_IRQ_INT1_DETACH_MASK, }, + { .reg_offset = 0, .mask = SM5504_IRQ_INT1_CHG_DET_MASK, }, + { .reg_offset = 0, .mask = SM5504_IRQ_INT1_DCD_OUT_MASK, }, + { .reg_offset = 0, .mask = SM5504_IRQ_INT1_OVP_MASK, }, + { .reg_offset = 0, .mask = SM5504_IRQ_INT1_CONNECT_MASK, }, + { .reg_offset = 0, .mask = SM5504_IRQ_INT1_ADC_CHG_MASK, }, + + /* INT2 interrupts */ + { .reg_offset = 1, .mask = SM5504_IRQ_INT2_RID_CHG_MASK,}, + { .reg_offset = 1, .mask = SM5504_IRQ_INT2_UVLO_MASK, }, + { .reg_offset = 1, .mask = SM5504_IRQ_INT2_POR_MASK, }, + { .reg_offset = 1, .mask = SM5504_IRQ_INT2_OVP_FET_MASK, }, + { .reg_offset = 1, .mask = SM5504_IRQ_INT2_OCP_LATCH_MASK, }, + { .reg_offset = 1, .mask = SM5504_IRQ_INT2_OCP_EVENT_MASK, }, + { .reg_offset = 1, .mask = SM5504_IRQ_INT2_OVP_OCP_EVENT_MASK, }, +}; + +static const struct regmap_irq_chip sm5504_muic_irq_chip = { + .name = "sm5504", + .status_base = SM5502_REG_INT1, + .mask_base = SM5502_REG_INTMASK1, + .mask_invert = false, + .num_regs = 2, + .irqs = sm5504_irqs, + .num_irqs = ARRAY_SIZE(sm5504_irqs), +}; + /* Define regmap configuration of SM5502 for I2C communication */ static bool sm5502_muic_volatile_reg(struct device *dev, unsigned int reg) { @@ -276,9 +353,14 @@ static int sm5502_muic_set_path(struct sm5502_muic_info *info, /* Return cable type of attached or detached accessories */ static unsigned int sm5502_muic_get_cable_type(struct sm5502_muic_info *info) { - unsigned int cable_type, adc, dev_type1; + unsigned int cable_type, adc, dev_type1, otg_dev_type1; int ret; + if (info->type == TYPE_SM5504) + otg_dev_type1 = SM5504_REG_DEV_TYPE1_USB_OTG_MASK; + else + otg_dev_type1 = SM5502_REG_DEV_TYPE1_USB_OTG_MASK; + /* Read ADC value according to external cable or button */ ret = regmap_read(info->regmap, SM5502_REG_ADC, &adc); if (ret) { @@ -301,11 +383,9 @@ static unsigned int sm5502_muic_get_cable_type(struct sm5502_muic_info *info) return ret; } - switch (dev_type1) { - case SM5502_REG_DEV_TYPE1_USB_OTG_MASK: + if (dev_type1 == otg_dev_type1) { cable_type = SM5502_MUIC_ADC_GROUND_USB_OTG; - break; - default: + } else { dev_dbg(info->dev, "cannot identify the cable type: adc(0x%x), dev_type1(0x%x)\n", adc, dev_type1); @@ -358,6 +438,11 @@ static unsigned int sm5502_muic_get_cable_type(struct sm5502_muic_info *info) return ret; } + if (dev_type1 == otg_dev_type1) { + cable_type = SM5502_MUIC_ADC_OPEN_USB_OTG; + break; + } + switch (dev_type1) { case SM5502_REG_DEV_TYPE1_USB_SDP_MASK: cable_type = SM5502_MUIC_ADC_OPEN_USB; @@ -365,9 +450,6 @@ static unsigned int sm5502_muic_get_cable_type(struct sm5502_muic_info *info) case SM5502_REG_DEV_TYPE1_DEDICATED_CHG_MASK: cable_type = SM5502_MUIC_ADC_OPEN_TA; break; - case SM5502_REG_DEV_TYPE1_USB_OTG_MASK: - cable_type = SM5502_MUIC_ADC_OPEN_USB_OTG; - break; default: dev_dbg(info->dev, "cannot identify the cable type: adc(0x%x)\n", @@ -497,6 +579,34 @@ static int sm5502_parse_irq(struct sm5502_muic_info *info, int irq_type) return 0; } +static int sm5504_parse_irq(struct sm5502_muic_info *info, int irq_type) +{ + switch (irq_type) { + case SM5504_IRQ_INT1_ATTACH: + info->irq_attach = true; + break; + case SM5504_IRQ_INT1_DETACH: + info->irq_detach = true; + break; + case SM5504_IRQ_INT1_CHG_DET: + case SM5504_IRQ_INT1_DCD_OUT: + case SM5504_IRQ_INT1_OVP_EVENT: + case SM5504_IRQ_INT1_CONNECT: + case SM5504_IRQ_INT1_ADC_CHG: + case SM5504_IRQ_INT2_RID_CHG: + case SM5504_IRQ_INT2_UVLO: + case SM5504_IRQ_INT2_POR: + case SM5504_IRQ_INT2_OVP_FET: + case SM5504_IRQ_INT2_OCP_LATCH: + case SM5504_IRQ_INT2_OCP_EVENT: + case SM5504_IRQ_INT2_OVP_OCP_EVENT: + default: + break; + } + + return 0; +} + static irqreturn_t sm5502_muic_irq_handler(int irq, void *data) { struct sm5502_muic_info *info = data; @@ -506,7 +616,10 @@ static irqreturn_t sm5502_muic_irq_handler(int irq, void *data) if (irq == info->muic_irqs[i].virq) irq_type = info->muic_irqs[i].irq; - ret = sm5502_parse_irq(info, irq_type); + if (info->type == TYPE_SM5504) + ret = sm5504_parse_irq(info, irq_type); + else + ret = sm5502_parse_irq(info, irq_type); if (ret < 0) { dev_warn(info->dev, "cannot handle is interrupt:%d\n", irq_type); @@ -565,6 +678,7 @@ static void sm5502_init_dev_type(struct sm5502_muic_info *info) static int sm5022_muic_i2c_probe(struct i2c_client *i2c) { struct device_node *np = i2c->dev.of_node; + const struct regmap_irq_chip *irq_chip; struct sm5502_muic_info *info; int i, ret, irq_flags; @@ -579,10 +693,26 @@ static int sm5022_muic_i2c_probe(struct i2c_client *i2c) info->dev = &i2c->dev; info->i2c = i2c; info->irq = i2c->irq; - info->muic_irqs = sm5502_muic_irqs; - info->num_muic_irqs = ARRAY_SIZE(sm5502_muic_irqs); - info->reg_data = sm5502_reg_data; - info->num_reg_data = ARRAY_SIZE(sm5502_reg_data); + info->type = (uintptr_t)device_get_match_data(info->dev); + + switch (info->type) { + case TYPE_SM5502: + irq_chip = &sm5502_muic_irq_chip; + info->muic_irqs = sm5502_muic_irqs; + info->num_muic_irqs = ARRAY_SIZE(sm5502_muic_irqs); + info->reg_data = sm5502_reg_data; + info->num_reg_data = ARRAY_SIZE(sm5502_reg_data); + break; + case TYPE_SM5504: + irq_chip = &sm5504_muic_irq_chip; + info->muic_irqs = sm5504_muic_irqs; + info->num_muic_irqs = ARRAY_SIZE(sm5504_muic_irqs); + info->reg_data = sm5504_reg_data; + info->num_reg_data = ARRAY_SIZE(sm5504_reg_data); + break; + default: + return -EINVAL; + } mutex_init(&info->mutex); @@ -598,8 +728,8 @@ static int sm5022_muic_i2c_probe(struct i2c_client *i2c) /* Support irq domain for SM5502 MUIC device */ irq_flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT | IRQF_SHARED; - ret = devm_regmap_add_irq_chip(info->dev, info->regmap, info->irq, irq_flags, - 0, &sm5502_muic_irq_chip, &info->irq_data); + ret = devm_regmap_add_irq_chip(info->dev, info->regmap, info->irq, + irq_flags, 0, irq_chip, &info->irq_data); if (ret != 0) { dev_err(info->dev, "failed to request IRQ %d: %d\n", info->irq, ret); @@ -660,7 +790,8 @@ static int sm5022_muic_i2c_probe(struct i2c_client *i2c) } static const struct of_device_id sm5502_dt_match[] = { - { .compatible = "siliconmitus,sm5502-muic" }, + { .compatible = "siliconmitus,sm5502-muic", .data = (void *)TYPE_SM5502 }, + { .compatible = "siliconmitus,sm5504-muic", .data = (void *)TYPE_SM5504 }, { }, }; MODULE_DEVICE_TABLE(of, sm5502_dt_match); @@ -692,6 +823,7 @@ static SIMPLE_DEV_PM_OPS(sm5502_muic_pm_ops, static const struct i2c_device_id sm5502_i2c_id[] = { { "sm5502", TYPE_SM5502 }, + { "sm5504", TYPE_SM5504 }, { } }; MODULE_DEVICE_TABLE(i2c, sm5502_i2c_id); diff --git a/drivers/extcon/extcon-sm5502.h b/drivers/extcon/extcon-sm5502.h index ce1f1ec310c4..0ce00274ed86 100644 --- a/drivers/extcon/extcon-sm5502.h +++ b/drivers/extcon/extcon-sm5502.h @@ -10,6 +10,7 @@ enum sm5502_types { TYPE_SM5502, + TYPE_SM5504, }; /* SM5502 registers */ @@ -93,6 +94,13 @@ enum sm5502_reg { #define SM5502_REG_CONTROL_RAW_DATA_MASK (0x1 << SM5502_REG_CONTROL_RAW_DATA_SHIFT) #define SM5502_REG_CONTROL_SW_OPEN_MASK (0x1 << SM5502_REG_CONTROL_SW_OPEN_SHIFT) +#define SM5504_REG_CONTROL_CHGTYP_SHIFT 5 +#define SM5504_REG_CONTROL_USBCHDEN_SHIFT 6 +#define SM5504_REG_CONTROL_ADC_EN_SHIFT 7 +#define SM5504_REG_CONTROL_CHGTYP_MASK (0x1 << SM5504_REG_CONTROL_CHGTYP_SHIFT) +#define SM5504_REG_CONTROL_USBCHDEN_MASK (0x1 << SM5504_REG_CONTROL_USBCHDEN_SHIFT) +#define SM5504_REG_CONTROL_ADC_EN_MASK (0x1 << SM5504_REG_CONTROL_ADC_EN_SHIFT) + #define SM5502_REG_INTM1_ATTACH_SHIFT 0 #define SM5502_REG_INTM1_DETACH_SHIFT 1 #define SM5502_REG_INTM1_KP_SHIFT 2 @@ -123,6 +131,36 @@ enum sm5502_reg { #define SM5502_REG_INTM2_STUCK_KEY_RCV_MASK (0x1 << SM5502_REG_INTM2_STUCK_KEY_RCV_SHIFT) #define SM5502_REG_INTM2_MHL_MASK (0x1 << SM5502_REG_INTM2_MHL_SHIFT) +#define SM5504_REG_INTM1_ATTACH_SHIFT 0 +#define SM5504_REG_INTM1_DETACH_SHIFT 1 +#define SM5504_REG_INTM1_CHG_DET_SHIFT 2 +#define SM5504_REG_INTM1_DCD_OUT_SHIFT 3 +#define SM5504_REG_INTM1_OVP_EVENT_SHIFT 4 +#define SM5504_REG_INTM1_CONNECT_SHIFT 5 +#define SM5504_REG_INTM1_ADC_CHG_SHIFT 6 +#define SM5504_REG_INTM1_ATTACH_MASK (0x1 << SM5504_REG_INTM1_ATTACH_SHIFT) +#define SM5504_REG_INTM1_DETACH_MASK (0x1 << SM5504_REG_INTM1_DETACH_SHIFT) +#define SM5504_REG_INTM1_CHG_DET_MASK (0x1 << SM5504_REG_INTM1_CHG_DET_SHIFT) +#define SM5504_REG_INTM1_DCD_OUT_MASK (0x1 << SM5504_REG_INTM1_DCD_OUT_SHIFT) +#define SM5504_REG_INTM1_OVP_EVENT_MASK (0x1 << SM5504_REG_INTM1_OVP_EVENT_SHIFT) +#define SM5504_REG_INTM1_CONNECT_MASK (0x1 << SM5504_REG_INTM1_CONNECT_SHIFT) +#define SM5504_REG_INTM1_ADC_CHG_MASK (0x1 << SM5504_REG_INTM1_ADC_CHG_SHIFT) + +#define SM5504_REG_INTM2_RID_CHG_SHIFT 0 +#define SM5504_REG_INTM2_UVLO_SHIFT 1 +#define SM5504_REG_INTM2_POR_SHIFT 2 +#define SM5504_REG_INTM2_OVP_FET_SHIFT 4 +#define SM5504_REG_INTM2_OCP_LATCH_SHIFT 5 +#define SM5504_REG_INTM2_OCP_EVENT_SHIFT 6 +#define SM5504_REG_INTM2_OVP_OCP_EVENT_SHIFT 7 +#define SM5504_REG_INTM2_RID_CHG_MASK (0x1 << SM5504_REG_INTM2_RID_CHG_SHIFT) +#define SM5504_REG_INTM2_UVLO_MASK (0x1 << SM5504_REG_INTM2_UVLO_SHIFT) +#define SM5504_REG_INTM2_POR_MASK (0x1 << SM5504_REG_INTM2_POR_SHIFT) +#define SM5504_REG_INTM2_OVP_FET_MASK (0x1 << SM5504_REG_INTM2_OVP_FET_SHIFT) +#define SM5504_REG_INTM2_OCP_LATCH_MASK (0x1 << SM5504_REG_INTM2_OCP_LATCH_SHIFT) +#define SM5504_REG_INTM2_OCP_EVENT_MASK (0x1 << SM5504_REG_INTM2_OCP_EVENT_SHIFT) +#define SM5504_REG_INTM2_OVP_OCP_EVENT_MASK (0x1 << SM5504_REG_INTM2_OVP_OCP_EVENT_SHIFT) + #define SM5502_REG_ADC_SHIFT 0 #define SM5502_REG_ADC_MASK (0x1f << SM5502_REG_ADC_SHIFT) @@ -199,6 +237,9 @@ enum sm5502_reg { #define SM5502_REG_DEV_TYPE1_DEDICATED_CHG_MASK (0x1 << SM5502_REG_DEV_TYPE1_DEDICATED_CHG_SHIFT) #define SM5502_REG_DEV_TYPE1_USB_OTG_MASK (0x1 << SM5502_REG_DEV_TYPE1_USB_OTG_SHIFT) +#define SM5504_REG_DEV_TYPE1_USB_OTG_SHIFT 0 +#define SM5504_REG_DEV_TYPE1_USB_OTG_MASK (0x1 << SM5504_REG_DEV_TYPE1_USB_OTG_SHIFT) + #define SM5502_REG_DEV_TYPE2_JIG_USB_ON_SHIFT 0 #define SM5502_REG_DEV_TYPE2_JIG_USB_OFF_SHIFT 1 #define SM5502_REG_DEV_TYPE2_JIG_UART_ON_SHIFT 2 @@ -277,4 +318,42 @@ enum sm5502_irq { #define SM5502_IRQ_INT2_STUCK_KEY_RCV_MASK BIT(4) #define SM5502_IRQ_INT2_MHL_MASK BIT(5) +/* SM5504 Interrupts */ +enum sm5504_irq { + /* INT1 */ + SM5504_IRQ_INT1_ATTACH, + SM5504_IRQ_INT1_DETACH, + SM5504_IRQ_INT1_CHG_DET, + SM5504_IRQ_INT1_DCD_OUT, + SM5504_IRQ_INT1_OVP_EVENT, + SM5504_IRQ_INT1_CONNECT, + SM5504_IRQ_INT1_ADC_CHG, + + /* INT2 */ + SM5504_IRQ_INT2_RID_CHG, + SM5504_IRQ_INT2_UVLO, + SM5504_IRQ_INT2_POR, + SM5504_IRQ_INT2_OVP_FET, + SM5504_IRQ_INT2_OCP_LATCH, + SM5504_IRQ_INT2_OCP_EVENT, + SM5504_IRQ_INT2_OVP_OCP_EVENT, + + SM5504_IRQ_NUM, +}; + +#define SM5504_IRQ_INT1_ATTACH_MASK BIT(0) +#define SM5504_IRQ_INT1_DETACH_MASK BIT(1) +#define SM5504_IRQ_INT1_CHG_DET_MASK BIT(2) +#define SM5504_IRQ_INT1_DCD_OUT_MASK BIT(3) +#define SM5504_IRQ_INT1_OVP_MASK BIT(4) +#define SM5504_IRQ_INT1_CONNECT_MASK BIT(5) +#define SM5504_IRQ_INT1_ADC_CHG_MASK BIT(6) +#define SM5504_IRQ_INT2_RID_CHG_MASK BIT(0) +#define SM5504_IRQ_INT2_UVLO_MASK BIT(1) +#define SM5504_IRQ_INT2_POR_MASK BIT(2) +#define SM5504_IRQ_INT2_OVP_FET_MASK BIT(4) +#define SM5504_IRQ_INT2_OCP_LATCH_MASK BIT(5) +#define SM5504_IRQ_INT2_OCP_EVENT_MASK BIT(6) +#define SM5504_IRQ_INT2_OVP_OCP_EVENT_MASK BIT(7) + #endif /* __LINUX_EXTCON_SM5502_H */