From patchwork Wed May 25 03:23:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyrone Ting X-Patchwork-Id: 576099 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 16247C43217 for ; Wed, 25 May 2022 03:24:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237659AbiEYDYV (ORCPT ); Tue, 24 May 2022 23:24:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235866AbiEYDYT (ORCPT ); Tue, 24 May 2022 23:24:19 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD019644C4; Tue, 24 May 2022 20:24:18 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id pq9-20020a17090b3d8900b001df622bf81dso3878072pjb.3; Tue, 24 May 2022 20:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MM5thYIrVi5i+cbkS2jxRX5IeuN8MkqxSCa5bh/mFUY=; b=Hm5LlEOqZKRdMEJ7rR3UUsd0kmUPrw/9YZ1mxm2xfajaeZt9jGE8zamIJlJdCAPkt3 VfMesPwd2acs2hYX1HTcVCeOD9Dii0Krkg+zZ44JxkTanTuzVi6In3rKxfqlDcsp+Z/2 c5huv57tYpvfCtJandPFSMQg4bxP+WVoh+T4sa8T4zz+TXsLqPMCBFbmgV8KFSfebYDv 7Lf8Y9x41x/0e5pIe+YaBr2PZCs+3A0rFVwPrztTRdjUaBErkl6xbzbjE2Vvgg7wQUeZ q1FgA+B0TTjlp7N/DiB1ojDVJ7J5gC4/P5vQenBgbTn+SiTEgJvOPFnZGqtRN9elaq+6 nDOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MM5thYIrVi5i+cbkS2jxRX5IeuN8MkqxSCa5bh/mFUY=; b=RjC/FcCd2HoA9SphMQMXrxaRAkAlU30Wg0L1jlsiP5S5r81z7O8EFcckj6fDLQEcCd W3brubxiHTRs3hcM7Bmu78ZQaKN4/MkI/AM/MG2rSxOgOHONnFb7UPhAcQXGZQRnH0kL GRpnFfjhuFRlb4Zdn1ZQtZ4C/vIubmKLI1YD3MfsaLVCfoKrpP6aJ3TVKeMHy4vYXoXS tK5c7rsfltzeI0fzIOqekNY0rdaSS59tjhITOaPaU/FEbUwT8+yfMBhaZrN36bmodcxm FHrxSrLwqMNzqeme6LcfSEtRQRlohSzwgIVbm9RB0WVDghRVfL8kFzVoDl/TTzTKKg7c YN7A== X-Gm-Message-State: AOAM531RNpF85NWCZ8b4FkkxL3ElGUI1HODGUUbs3yk3kdXc1YG0EAP8 BjZRLdAGWKIyfsFIbkGT+Q== X-Google-Smtp-Source: ABdhPJzJfJSQYDPh4Yk/ZMRkRZvA2bfaM9uQZ22E296JR5L5v5r+FkeTB87jGcpTcqLEzIUMainZ/A== X-Received: by 2002:a17:90a:4803:b0:1dc:b4c9:1958 with SMTP id a3-20020a17090a480300b001dcb4c91958mr7872647pjh.61.1653449058229; Tue, 24 May 2022 20:24:18 -0700 (PDT) Received: from localhost (220-133-130-217.hinet-ip.hinet.net. [220.133.130.217]) by smtp.gmail.com with ESMTPSA id q14-20020a17090a178e00b001df3a251cc2sm322188pja.4.2022.05.24.20.24.17 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 May 2022 20:24:17 -0700 (PDT) From: Tyrone Ting To: avifishman70@gmail.com, tmaimon77@gmail.com, tali.perry1@gmail.com, venture@google.com, yuenn@google.com, benjaminfair@google.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, wsa@kernel.org, andriy.shevchenko@linux.intel.com, jarkko.nikula@linux.intel.com, semen.protsenko@linaro.org, jie.deng@intel.com, jsd@semihalf.com, sven@svenpeter.dev, lukas.bulwahn@gmail.com, olof@lixom.net, arnd@arndb.de, warp5tw@gmail.com, tali.perry@nuvoton.com, Avi.Fishman@nuvoton.com, tomer.maimon@nuvoton.com, KWLIU@nuvoton.com, JJLIU0@nuvoton.com, kfting@nuvoton.com Cc: openbmc@lists.ozlabs.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 1/5] dt-bindings: i2c: npcm: support NPCM845 Date: Wed, 25 May 2022 11:23:37 +0800 Message-Id: <20220525032341.3182-2-warp5tw@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220525032341.3182-1-warp5tw@gmail.com> References: <20220525032341.3182-1-warp5tw@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Tyrone Ting Add compatible and nuvoton,sys-mgr description for NPCM i2c module. Signed-off-by: Tyrone Ting Reviewed-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml b/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml index 128444942aec..09d2591e1fa3 100644 --- a/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml +++ b/Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml @@ -7,17 +7,18 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: nuvoton NPCM7XX I2C Controller Device Tree Bindings description: | - The NPCM750x includes sixteen I2C bus controllers. All Controllers support - both master and slave mode. Each controller can switch between master and slave - at run time (i.e. IPMB mode). Each controller has two 16 byte HW FIFO for TX and - RX. + I2C bus controllers of the NPCM series support both master and + slave mode. Each controller can switch between master and slave at run time + (i.e. IPMB mode). HW FIFO for TX and RX are supported. maintainers: - Tali Perry properties: compatible: - const: nuvoton,npcm750-i2c + enum: + - nuvoton,npcm750-i2c + - nuvoton,npcm845-i2c reg: maxItems: 1 @@ -36,6 +37,10 @@ properties: default: 100000 enum: [100000, 400000, 1000000] + nuvoton,sys-mgr: + $ref: /schemas/types.yaml#/definitions/phandle + description: The phandle of system manager register node. + required: - compatible - reg @@ -44,6 +49,15 @@ required: allOf: - $ref: /schemas/i2c/i2c-controller.yaml# + - if: + properties: + compatible: + contains: + const: nuvoton,npcm845-i2c + + then: + required: + - nuvoton,sys-mgr unevaluatedProperties: false @@ -57,6 +71,7 @@ examples: clock-frequency = <100000>; interrupts = ; compatible = "nuvoton,npcm750-i2c"; + nuvoton,sys-mgr = <&gcr>; }; ... From patchwork Wed May 25 03:23:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyrone Ting X-Patchwork-Id: 576098 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 5883BC433EF for ; Wed, 25 May 2022 03:24:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242343AbiEYDYg (ORCPT ); Tue, 24 May 2022 23:24:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241178AbiEYDYY (ORCPT ); Tue, 24 May 2022 23:24:24 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA372719E3; Tue, 24 May 2022 20:24:22 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id gk22so88285pjb.1; Tue, 24 May 2022 20:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0rffUNaGY9JVFcRgt64Xz6CcZdQ3YWgSvvOXYBNVtz8=; b=jKuli6//St0+LziZumcEVU9gK0gJSh/AzpWH/KvZOrjGADjGd6q9QqwOD441webjpK gilAjG+LuVOpD5IOFK/83ezJe7pJ1xqeoRB4UvizS6FSRJdbXVn2SzPhhAsakxycJwyn 7GpFGlNuuN9u8cwWO24d/KKSp0P81EbToYQUryYUC6uqU2aEmdYMj935T+wh9nVI7KZm phcqaebLfwXYhPlJYL2KvrRvV/iV6MH4KGFT7f2eaDjIIdP/B4tUYjWXq9CoX2quPY3w CTPyYOnMOliR0s4mXNMyyGCBhUjg/CB3CecF3CxL995slIZGw57pNDs5Qnw+edU1DIPT j8xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0rffUNaGY9JVFcRgt64Xz6CcZdQ3YWgSvvOXYBNVtz8=; b=KvxhFifVnRS6fIQVEkAGYA+qa2PNDTyMbkhOp3T8d39b8nQiC98Uqtyat1NTHjUDfP j6WDBuZuPDDx4u+Ax08535w5fO2DUQxFm5wv5UVCAiic+oWJfviF/V3TGoNuMROJeLBX BT5DcE2wrbzSjwvcnvh6A9QEscCSZZgf07Gt+oEiG8/pnhiP1H9Iz7/Fbf4RQU7uzcS9 jUSt93Bf914PofBPFUJxBRxrDRd0hPDfL0LI2xiw0BCpcT6N3Xrw0QZpeTSyR3331J1K 2KqA7ejuLfcDB+zuwsGSAdt/g25L+1j7JZudG4c2qxheB9Cqu0FpXkqt0K+RqRkEtzKV RmoA== X-Gm-Message-State: AOAM530J329K4HfNdEZM3PuwDksF6ZIw2+BPVYSRS+yRbEnpc7vGORo2 jGfOLJKFH6S5e8tM3x61sg== X-Google-Smtp-Source: ABdhPJwAu5NH9jyXsBMmzbw6/e/vdCqMz64XE5Xk0CvUDXMx3MBbQxxY2jDtg1yuSX72ujd35ZM00Q== X-Received: by 2002:a17:90a:8807:b0:1df:78c7:c215 with SMTP id s7-20020a17090a880700b001df78c7c215mr7941634pjn.234.1653449061947; Tue, 24 May 2022 20:24:21 -0700 (PDT) Received: from localhost (220-133-130-217.hinet-ip.hinet.net. [220.133.130.217]) by smtp.gmail.com with ESMTPSA id c21-20020a62e815000000b00518e3256022sm711553pfi.104.2022.05.24.20.24.21 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 May 2022 20:24:21 -0700 (PDT) From: Tyrone Ting To: avifishman70@gmail.com, tmaimon77@gmail.com, tali.perry1@gmail.com, venture@google.com, yuenn@google.com, benjaminfair@google.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, wsa@kernel.org, andriy.shevchenko@linux.intel.com, jarkko.nikula@linux.intel.com, semen.protsenko@linaro.org, jie.deng@intel.com, jsd@semihalf.com, sven@svenpeter.dev, lukas.bulwahn@gmail.com, olof@lixom.net, arnd@arndb.de, warp5tw@gmail.com, tali.perry@nuvoton.com, Avi.Fishman@nuvoton.com, tomer.maimon@nuvoton.com, KWLIU@nuvoton.com, JJLIU0@nuvoton.com, kfting@nuvoton.com Cc: openbmc@lists.ozlabs.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 3/5] i2c: npcm: Correct slave role behavior Date: Wed, 25 May 2022 11:23:39 +0800 Message-Id: <20220525032341.3182-4-warp5tw@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220525032341.3182-1-warp5tw@gmail.com> References: <20220525032341.3182-1-warp5tw@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Tali Perry Correct the slave transaction logic to be compatible with the generic slave backend driver. Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver") Signed-off-by: Tali Perry Signed-off-by: Tyrone Ting --- drivers/i2c/busses/i2c-npcm7xx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index b5cc83e51029..b4d218c6c8fb 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -915,11 +915,15 @@ static int npcm_i2c_slave_get_wr_buf(struct npcm_i2c *bus) for (i = 0; i < I2C_HW_FIFO_SIZE; i++) { if (bus->slv_wr_size >= I2C_HW_FIFO_SIZE) break; - i2c_slave_event(bus->slave, I2C_SLAVE_READ_REQUESTED, &value); + if (bus->state == I2C_SLAVE_MATCH) { + i2c_slave_event(bus->slave, I2C_SLAVE_READ_REQUESTED, &value); + bus->state = I2C_OPER_STARTED; + } else { + i2c_slave_event(bus->slave, I2C_SLAVE_READ_PROCESSED, &value); + } ind = (bus->slv_wr_ind + bus->slv_wr_size) % I2C_HW_FIFO_SIZE; bus->slv_wr_buf[ind] = value; bus->slv_wr_size++; - i2c_slave_event(bus->slave, I2C_SLAVE_READ_PROCESSED, &value); } return I2C_HW_FIFO_SIZE - ret; } @@ -967,7 +971,6 @@ static void npcm_i2c_slave_xmit(struct npcm_i2c *bus, u16 nwrite, if (nwrite == 0) return; - bus->state = I2C_OPER_STARTED; bus->operation = I2C_WRITE_OPER; /* get the next buffer */ From patchwork Wed May 25 03:23:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyrone Ting X-Patchwork-Id: 576097 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 86E77C433EF for ; Wed, 25 May 2022 03:24:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243500AbiEYDYm (ORCPT ); Tue, 24 May 2022 23:24:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242864AbiEYDYh (ORCPT ); Tue, 24 May 2022 23:24:37 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A87471DA8; Tue, 24 May 2022 20:24:26 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id y1so2081462pfr.6; Tue, 24 May 2022 20:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NK0b08wKodTidGQbJ6ZwixKVSwwf1GDBnVR4pQHKSOM=; b=ZNb5OBFWkdlzavtDQbaXzKhfGhiojpEdFaXBJ6LVM1bMxooZmZvyTqSPrYrb0Qh+TH IDAH0t7FUlbcHYve9GhLhOTHqQaXlgJhgQwrk2zjoxrzC4IHqrXfVio77Vrpuj9wvJPL UNk3RMKhCfpfzQaTmsD469ozLhT4hYQznyVuHTk/CsZxSm1magE2nOKBf8uIlDbkBvoD KeWNsW4PRHIhd4RRMfyF4LeCEmgtM4QBex6amk/Ax41Z9+Fpsqz2Fq2DIgwxzXKW44Mk GU8YrvCexQ0z2tvGC/gAkku8MJTDlHzHeoq+0SGLQQLDRHUac5eK0SfDmetwBmrdQc62 muQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NK0b08wKodTidGQbJ6ZwixKVSwwf1GDBnVR4pQHKSOM=; b=nXYNJM9/28cioPiI+OT4yeubHkHtWlrqaxqCql0LZmaoTpHOpNY5c50mHNueoF5BxR VGH2D/Qlk563QxUvMtYh5m83oI4WC7PzTpLbebHIvf2D95x4uLFvz7HVlnSlbNK2wSNd nFaw2wkX+oiuK12I+E5jBCvvELNa8O5VNhmRo5scpL29XxaQhzmy2pcIS4mF7QtkGedO RDt77bwnP8v+KZWm2sOYqSLpMlFzr6w7OF9EOUVhLXiSVO7ZlBTevYkWd8K9dMnFfPNX /UjOBNkpx13inuXuFvd7lCVaBpdldRbSqDiLzkxZE2qVZKDA7kqMFhPTfiCQgNipG66s Q3Qw== X-Gm-Message-State: AOAM531wT6rkhqSGOXjbasUSG4wQX/WEOwdd58GJugjk87EVH/q64Ofo yM/grI4qXCYJ5clKI2Iicw== X-Google-Smtp-Source: ABdhPJxV22rPnTpeEJI47XYFMMdxEpkOc4Zu6BY3qj12o/0OYPLWPEsrUzcR9a7YgCbueyIKAHz/Lg== X-Received: by 2002:aa7:9819:0:b0:518:4654:cf68 with SMTP id e25-20020aa79819000000b005184654cf68mr28288713pfl.28.1653449065644; Tue, 24 May 2022 20:24:25 -0700 (PDT) Received: from localhost (220-133-130-217.hinet-ip.hinet.net. [220.133.130.217]) by smtp.gmail.com with ESMTPSA id c2-20020a170902848200b00161996b9a66sm7969391plo.233.2022.05.24.20.24.25 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 May 2022 20:24:25 -0700 (PDT) From: Tyrone Ting To: avifishman70@gmail.com, tmaimon77@gmail.com, tali.perry1@gmail.com, venture@google.com, yuenn@google.com, benjaminfair@google.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, wsa@kernel.org, andriy.shevchenko@linux.intel.com, jarkko.nikula@linux.intel.com, semen.protsenko@linaro.org, jie.deng@intel.com, jsd@semihalf.com, sven@svenpeter.dev, lukas.bulwahn@gmail.com, olof@lixom.net, arnd@arndb.de, warp5tw@gmail.com, tali.perry@nuvoton.com, Avi.Fishman@nuvoton.com, tomer.maimon@nuvoton.com, KWLIU@nuvoton.com, JJLIU0@nuvoton.com, kfting@nuvoton.com Cc: openbmc@lists.ozlabs.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 5/5] i2c: npcm: Capitalize the one-line comment Date: Wed, 25 May 2022 11:23:41 +0800 Message-Id: <20220525032341.3182-6-warp5tw@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220525032341.3182-1-warp5tw@gmail.com> References: <20220525032341.3182-1-warp5tw@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Tyrone Ting Make the one-line comments capital in the driver to get the comment style consistent. Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver") Signed-off-by: Tyrone Ting --- drivers/i2c/busses/i2c-npcm7xx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index 86fd942ea648..7d863edc14e4 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -680,7 +680,7 @@ static void npcm_i2c_reset(struct npcm_i2c *bus) } #endif - /* clear status bits for spurious interrupts */ + /* Clear status bits for spurious interrupts */ npcm_i2c_clear_master_status(bus); bus->state = I2C_IDLE; @@ -1252,7 +1252,7 @@ static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus) } /* SDAST */ /* - * if irq is not one of the above, make sure EOB is disabled and all + * If irq is not one of the above, make sure EOB is disabled and all * status bits are cleared. */ if (ret == IRQ_NONE) { @@ -1506,7 +1506,7 @@ static void npcm_i2c_irq_handle_nack(struct npcm_i2c *bus) npcm_i2c_clear_master_status(bus); readx_poll_timeout_atomic(ioread8, bus->reg + NPCM_I2CCST, val, !(val & NPCM_I2CCST_BUSY), 10, 200); - /* verify no status bits are still set after bus is released */ + /* Verify no status bits are still set after bus is released */ npcm_i2c_clear_master_status(bus); } bus->state = I2C_IDLE; @@ -1974,7 +1974,7 @@ static int npcm_i2c_init_module(struct npcm_i2c *bus, enum i2c_mode mode, npcm_i2c_reset(bus); - /* check HW is OK: SDA and SCL should be high at this point. */ + /* Check HW is OK: SDA and SCL should be high at this point. */ if ((npcm_i2c_get_SDA(&bus->adap) == 0) || (npcm_i2c_get_SCL(&bus->adap) == 0)) { dev_err(bus->dev, "I2C%d init fail: lines are low\n", bus->num); dev_err(bus->dev, "SDA=%d SCL=%d\n", npcm_i2c_get_SDA(&bus->adap), @@ -2034,7 +2034,7 @@ static irqreturn_t npcm_i2c_bus_irq(int irq, void *dev_id) return IRQ_HANDLED; } #endif - /* clear status bits for spurious interrupts */ + /* Clear status bits for spurious interrupts */ npcm_i2c_clear_master_status(bus); return IRQ_HANDLED; @@ -2216,7 +2216,7 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, (bus->data->rxf_ctl_last_pec & ioread8(bus->reg + NPCM_I2CRXF_CTL))) npcm_i2c_reset(bus); - /* after any xfer, successful or not, stall and EOB must be disabled */ + /* After any xfer, successful or not, stall and EOB must be disabled */ npcm_i2c_stall_after_start(bus, false); npcm_i2c_eob_int(bus, false);