From patchwork Mon Jun 13 21:00:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 581792 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 7F1CCC43334 for ; Mon, 13 Jun 2022 21:18:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351929AbiFMVS5 (ORCPT ); Mon, 13 Jun 2022 17:18:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244742AbiFMVSL (ORCPT ); Mon, 13 Jun 2022 17:18:11 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6C70309; Mon, 13 Jun 2022 14:00:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5657CB81598; Mon, 13 Jun 2022 21:00:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B58AFC34114; Mon, 13 Jun 2022 21:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655154046; bh=qeRciMZ8+GN9aRNLiPL16tbvkPgNHQGPPX68ZXr0H8w=; h=From:To:Cc:Subject:Date:From; b=cH1HY1ZeheBnhLELtecwl/zbtYzor0+cS4PRydzC//tiN73QIqC7IaEcv0V1qlLwa kOsPiLYqj3HI6gDgH0wjH2yYuYPwVXUgFIWoP97ObQ7RwjPMKDc7D5SuJQShAdnL1j MI6YJijlZ0vZhX4/Uuik9iSmaxq/1ihMlbraEdHgxVaazktGGuPrSiJjbwwY6YaiFS wMYDiWJ6Wppeb5549QR00Ib1DfjpoCPlQ6mvI2YbuxkL5rKlYLV4BufVaNf3POQ3WH zFw66jdNs99nwWtNBnogZ5g6zFdVgklR9diVJoJ/0GIi8r5SWt24tR9GCbTXvb7KTJ HxOWrCeG9+KsQ== From: Dinh Nguyen To: jarkko.nikula@linux.intel.com Cc: dinguyen@kernel.org, andriy.shevchenko@linux.intel.com, mika.westerberg@linux.intel.com, robh+dt@kernel.org, krzk+dt@kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCHv3 1/2] i2c: designware: introduce a custom scl recovery for SoCFPGA platforms Date: Mon, 13 Jun 2022 16:00:31 -0500 Message-Id: <20220613210032.773826-1-dinguyen@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org The I2C pins on the SoCFPGA platforms do not go through a GPIO module, thus cannot be recovered by the default method of by doing a GPIO access. Only a reset of the I2C IP block can a recovery be successful. The assignment of the recover_bus needs to get done before the call to devm_gpiod_get_optional(), otherwise, the assignment is not taking place because of an error after returning from devm_gpiod_get_optional(). Signed-off-by: Dinh Nguyen --- v3: simplify the function update commit message v2: remove change to MODEL_MASK s/i2c_custom_scl_recovery/i2c_socfpga_scl_recovery --- drivers/i2c/busses/i2c-designware-core.h | 1 + drivers/i2c/busses/i2c-designware-master.c | 12 ++++++++++++ drivers/i2c/busses/i2c-designware-platdrv.c | 1 + 3 files changed, 14 insertions(+) diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index 70b80e710990..7b22ec1d6a96 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -303,6 +303,7 @@ struct dw_i2c_dev { #define MODEL_MSCC_OCELOT BIT(8) #define MODEL_BAIKAL_BT1 BIT(9) #define MODEL_AMD_NAVI_GPU BIT(10) +#define MODEL_SOCFPGA BIT(11) #define MODEL_MASK GENMASK(11, 8) /* diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c index 44a94b225ed8..502820b812a5 100644 --- a/drivers/i2c/busses/i2c-designware-master.c +++ b/drivers/i2c/busses/i2c-designware-master.c @@ -813,12 +813,24 @@ static void i2c_dw_unprepare_recovery(struct i2c_adapter *adap) i2c_dw_init_master(dev); } +static int i2c_socfpga_scl_recovery(struct i2c_adapter *adap) +{ + i2c_dw_prepare_recovery(adap); + i2c_dw_unprepare_recovery(adap); + return 0; +} + static int i2c_dw_init_recovery_info(struct dw_i2c_dev *dev) { struct i2c_bus_recovery_info *rinfo = &dev->rinfo; struct i2c_adapter *adap = &dev->adapter; struct gpio_desc *gpio; + if ((dev->flags & MODEL_MASK) == MODEL_SOCFPGA) { + rinfo->recover_bus = i2c_socfpga_scl_recovery; + adap->bus_recovery_info = rinfo; + } + gpio = devm_gpiod_get_optional(dev->dev, "scl", GPIOD_OUT_HIGH); if (IS_ERR_OR_NULL(gpio)) return PTR_ERR_OR_ZERO(gpio); diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 70ade5306e45..b33e015e6732 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -153,6 +153,7 @@ static const struct of_device_id dw_i2c_of_match[] = { { .compatible = "snps,designware-i2c", }, { .compatible = "mscc,ocelot-i2c", .data = (void *)MODEL_MSCC_OCELOT }, { .compatible = "baikal,bt1-sys-i2c", .data = (void *)MODEL_BAIKAL_BT1 }, + { .compatible = "intel,socfpga-i2c", .data = (void *)MODEL_SOCFPGA }, {}, }; MODULE_DEVICE_TABLE(of, dw_i2c_of_match);