linux-kernel - [PATCH] ARM: at91/tc: fix clock source id for tc block

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1364921211-15756-1-git-send-email-linux-arm@overkiz.com>
Date:	Tue,  2 Apr 2013 18:46:51 +0200
From:	Boris BREZILLON <linux-arm@...rkiz.com>
To:	Nicolas Ferre <nicolas.ferre@...el.com>
Cc:	Arnd Bergmann <arnd@...db.de>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Grant Likely <grant.likely@...retlab.ca>,
	Rob Herring <rob.herring@...xeda.com>,
	linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
	Andrew Victor <linux@...im.org.za>,
	Jean-Christophe Plagniol-Villard <plagnioj@...osoft.com>,
	Boris BREZILLON <linux-arm@...rkiz.com>
Subject: [PATCH] ARM: at91/tc: fix clock source id for tc block > 1

This patch fixes wrong clock request for TC block 2.
The second block was using t0_clk, t1_clk and t2_clk clks instead of
t3_clk, t4_clk and t5_clk clks.


Signed-off-by: Boris BREZILLON <linux-arm@...rkiz.com>
---
 drivers/misc/atmel_tclib.c |   24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c
index c8d8e38..768a988 100644
--- a/drivers/misc/atmel_tclib.c
+++ b/drivers/misc/atmel_tclib.c
@@ -142,6 +142,8 @@ static int __init tc_probe(struct platform_device *pdev)
 	struct atmel_tc *tc;
 	struct clk	*clk;
 	int		irq;
+	char		clk_id[7];
+	int		clk_offset;
 
 	if (!platform_get_resource(pdev, IORESOURCE_MEM, 0))
 		return -EINVAL;
@@ -156,25 +158,31 @@ static int __init tc_probe(struct platform_device *pdev)
 
 	tc->pdev = pdev;
 
-	clk = clk_get(&pdev->dev, "t0_clk");
-	if (IS_ERR(clk)) {
-		kfree(tc);
-		return -EINVAL;
-	}
-
 	/* Now take SoC information if available */
 	if (pdev->dev.of_node) {
 		const struct of_device_id *match;
 		match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node);
 		if (match)
 			tc->tcb_config = match->data;
+		clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb");
+	} else
+		clk_offset = pdev->id;
+	clk_offset *= 3;
+
+	snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++);
+	clk = clk_get(&pdev->dev, clk_id);
+	if (IS_ERR(clk)) {
+		kfree(tc);
+		return -EINVAL;
 	}
 
 	tc->clk[0] = clk;
-	tc->clk[1] = clk_get(&pdev->dev, "t1_clk");
+	snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++);
+	tc->clk[1] = clk_get(&pdev->dev, clk_id);
 	if (IS_ERR(tc->clk[1]))
 		tc->clk[1] = clk;
-	tc->clk[2] = clk_get(&pdev->dev, "t2_clk");
+	snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++);
+	tc->clk[2] = clk_get(&pdev->dev, clk_id);
 	if (IS_ERR(tc->clk[2]))
 		tc->clk[2] = clk;
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/