From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752579AbbCYJwx (ORCPT ); Wed, 25 Mar 2015 05:52:53 -0400 Received: from www.linutronix.de ([62.245.132.108]:50552 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752375AbbCYJwo (ORCPT ); Wed, 25 Mar 2015 05:52:44 -0400 From: Holger Dengler To: linux-kernel@vger.kernel.org Cc: Peter Mahler , Juergen Bubeck , Benedikt Spranger , Holger Dengler , Samuel Ortiz , Lee Jones Subject: [PATCH 04/11] mfd: flexcard: add clocksrc device Date: Wed, 25 Mar 2015 10:51:53 +0100 Message-Id: <1427277120-16924-5-git-send-email-dengler@linutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427277120-16924-1-git-send-email-dengler@linutronix.de> References: <1427277120-16924-1-git-send-email-dengler@linutronix.de> X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001,URIBL_BLOCKED=0.001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Benedikt Spranger The Flexcard offers a Flexray network synchronized counter with a selectable resolution of 1us, 100ns or 10ns. Add an appropriate MFD-cell to use the counter. Signed-off-by: Holger Dengler Signed-off-by: Benedikt Spranger cc: Samuel Ortiz cc: Lee Jones --- drivers/mfd/flexcard/core.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/drivers/mfd/flexcard/core.c b/drivers/mfd/flexcard/core.c index 6477019..c73ae5c 100644 --- a/drivers/mfd/flexcard/core.c +++ b/drivers/mfd/flexcard/core.c @@ -28,6 +28,29 @@ static DEFINE_IDA(flexcard_ida); static const char drv_name[] = "flexcard"; +static struct resource flexcard_clk_res[] = { + { + .name = "flexcard-clksrc", + .start = 0x700, + .end = 0x713, + .flags = IORESOURCE_MEM, + }, { + .name = "flexcard-reset", + .start = 0x144, + .end = 0x147, + .flags = IORESOURCE_MEM, + }, +}; + +static struct mfd_cell flexcard_clk_dev[] = { + { + .id = 0, + .name = "flexcard-clksrc", + .num_resources = ARRAY_SIZE(flexcard_clk_res), + .resources = flexcard_clk_res, + }, +}; + static int flexcard_tiny_can(struct flexcard_device *priv, int idx, int id, u32 offset) { @@ -111,6 +134,21 @@ static int flexcard_tiny_probe(struct flexcard_device *priv) return mfd_add_devices(&pdev->dev, 0, priv->cells, nr, NULL, 0, NULL); } +static int flexcard_clk_setup(struct flexcard_device *priv) +{ + struct pci_dev *pdev = priv->pdev; + int i; + + for (i = 0; i < ARRAY_SIZE(flexcard_clk_res); i++) + flexcard_clk_res[i].parent = &pdev->resource[0]; + + flexcard_clk_dev[0].id = priv->cardnr; + + return mfd_add_devices(&pdev->dev, 0, flexcard_clk_dev, + ARRAY_SIZE(flexcard_clk_dev), + &pdev->resource[0], 0, NULL); +} + static int flexcard_misc_open(struct inode *inode, struct file *filp) { struct flexcard_device *priv = @@ -233,6 +271,12 @@ static int flexcard_probe(struct pci_dev *pdev, goto out_unmap; } + ret = flexcard_clk_setup(priv); + if (ret) { + dev_err(&pdev->dev, "unable to register clksrc: %d\n", ret); + goto out_remove; + } + ret = misc_register(&priv->dev); if (ret) { dev_err(&pdev->dev, "unable to register miscdevice: %d\n", ret); -- 2.1.4