From patchwork Mon Apr 11 15:28:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Glauber X-Patchwork-Id: 608850 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qkDXr1chdz9t3g for ; Tue, 12 Apr 2016 01:30:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753055AbcDKPaJ (ORCPT ); Mon, 11 Apr 2016 11:30:09 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35535 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755417AbcDKP3b (ORCPT ); Mon, 11 Apr 2016 11:29:31 -0400 Received: by mail-wm0-f68.google.com with SMTP id a140so22104671wma.2; Mon, 11 Apr 2016 08:29:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=fyOOaaGVHqQ59+XSPW+E3XM80PNcbVDTF6LNWygxe3Q=; b=Z6qwoGxWCS08arOnUTfgvRi0VSfG2BEUlyyG9v5yQS2ywd9VW4iyhLOL5s41N4QLQB x0wuEm6d02z/nZBJZS+XLMcHjpyYTAIZafpOKxKprTKObUhrDZcQ8rVIz9cwZCSZ13GS 417prbAur/LWybIg1g7c+VM/aAJUON63fws5sLiXuzpkLQ3Elsd1Hp/XfP86XA4MyaGD sOBcHg1vcyzvUXfYYddnhqqzpGJ0jsIP/wNxXlKCd1PN2OzFPeXw8RaVc8NQA52jqoVz DvX61WU1DYCqA84e+FPqgYM6XO7kj6DmBq1SNncKOK6UwH5y5B2sgiq6GUm33gkXXG/t 0Gpg== X-Gm-Message-State: AD7BkJKC7/rvtU8QFanBQBJPhTIX87nHjrStTdtlpXLEuOgQ/tSuUgzGD2ju8/oKwTKnhQ== X-Received: by 10.194.20.193 with SMTP id p1mr25866159wje.87.1460388559399; Mon, 11 Apr 2016 08:29:19 -0700 (PDT) Received: from localhost.localdomain (dslb-088-066-101-161.088.066.pools.vodafone-ip.de. [88.66.101.161]) by smtp.gmail.com with ESMTPSA id c187sm14843611wme.16.2016.04.11.08.29.18 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Apr 2016 08:29:18 -0700 (PDT) From: Jan Glauber To: Wolfram Sang Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, David Daney , Jan Glauber Subject: [PATCH v6 19/19] i2c: thunderx: Add smbus alert support Date: Mon, 11 Apr 2016 17:28:50 +0200 Message-Id: <5a3e47c01f7aac0ea967e5b58dd0df0013d1b8f3.1460387640.git.jglauber@cavium.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Add smbus alert interrupt support. Signed-off-by: Jan Glauber --- drivers/i2c/busses/i2c-cavium.h | 6 ++++++ drivers/i2c/busses/i2c-thunderx-core.c | 35 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/drivers/i2c/busses/i2c-cavium.h b/drivers/i2c/busses/i2c-cavium.h index c2e8bdb..ad94abd 100644 --- a/drivers/i2c/busses/i2c-cavium.h +++ b/drivers/i2c/busses/i2c-cavium.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -119,6 +120,11 @@ struct octeon_i2c { #if IS_ENABLED(CONFIG_I2C_THUNDERX) struct msix_entry i2c_msix; #endif + +#if IS_ENABLED(CONFIG_I2C_SMBUS) + struct i2c_smbus_alert_setup alert_data; + struct i2c_client *ara; +#endif }; static inline void writeqflush(u64 val, void __iomem *addr) diff --git a/drivers/i2c/busses/i2c-thunderx-core.c b/drivers/i2c/busses/i2c-thunderx-core.c index 535c823..c493ce5 100644 --- a/drivers/i2c/busses/i2c-thunderx-core.c +++ b/drivers/i2c/busses/i2c-thunderx-core.c @@ -9,9 +9,11 @@ #include #include #include +#include #include #include #include +#include #include #include "i2c-cavium.h" @@ -108,6 +110,35 @@ static void thunder_i2c_clock_disable(struct device *dev, struct clk *clk) devm_clk_put(dev, clk); } +static int thunder_i2c_smbus_setup(struct octeon_i2c *i2c, + struct device_node *node) +{ +#if IS_ENABLED(CONFIG_I2C_SMBUS) + u32 type; + + i2c->alert_data.irq = irq_of_parse_and_map(node, 0); + if (!i2c->alert_data.irq) + return -EINVAL; + + type = irqd_get_trigger_type(irq_get_irq_data(i2c->alert_data.irq)); + i2c->alert_data.alert_edge_triggered = + (type & IRQ_TYPE_LEVEL_MASK) ? 1 : 0; + + i2c->ara = i2c_setup_smbus_alert(&i2c->adap, &i2c->alert_data); + if (!i2c->ara) + return -ENODEV; +#endif + return 0; +} + +static void thunder_i2c_smbus_remove(struct octeon_i2c *i2c) +{ +#if IS_ENABLED(CONFIG_I2C_SMBUS) + if (i2c->ara) + i2c_unregister_device(i2c->ara); +#endif +} + static void thunder_i2c_set_name(struct pci_dev *pdev, struct octeon_i2c *i2c, char *name) { @@ -212,6 +243,9 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev, goto out_irq; } + ret = thunder_i2c_smbus_setup(i2c, node); + if (ret < 0) + dev_info(dev, "Failed to setup smbus alert\n"); dev_info(i2c->dev, "probed\n"); return 0; @@ -242,6 +276,7 @@ static void thunder_i2c_remove_pci(struct pci_dev *pdev) dev = i2c->dev; thunder_i2c_clock_disable(dev, i2c->clk); + thunder_i2c_smbus_remove(i2c); i2c_del_adapter(&i2c->adap); devm_free_irq(dev, i2c->i2c_msix.vector, i2c); pci_disable_msix(pdev);