Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933631AbaDIOCK (ORCPT ); Wed, 9 Apr 2014 10:02:10 -0400 Received: from top.free-electrons.com ([176.31.233.9]:60845 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933350AbaDINvb (ORCPT ); Wed, 9 Apr 2014 09:51:31 -0400 From: Boris BREZILLON To: Randy Dunlap , Maxime Ripard , =?UTF-8?q?Emilio=20L=C3=B3pez?= , Mike Turquette , Linus Walleij Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Boris BREZILLON Subject: [PATCH 04/15] pinctrl: sunxi: specify clk name when retrieving pinctrl pio clk Date: Wed, 9 Apr 2014 15:51:07 +0200 Message-Id: <1397051478-4113-5-git-send-email-boris.brezillon@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397051478-4113-1-git-send-email-boris.brezillon@free-electrons.com> References: <1397051478-4113-1-git-send-email-boris.brezillon@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Specify base pio clk name when retrieving it using the CCF. This way we will avoid conflicts when introducing a second clk for the A31 SoC. Signed-off-by: Boris BREZILLON --- drivers/pinctrl/pinctrl-sunxi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-sunxi.c b/drivers/pinctrl/pinctrl-sunxi.c index f9fabe9..ef16311 100644 --- a/drivers/pinctrl/pinctrl-sunxi.c +++ b/drivers/pinctrl/pinctrl-sunxi.c @@ -878,7 +878,7 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev) goto gpiochip_error; } - clk = devm_clk_get(&pdev->dev, NULL); + clk = devm_clk_get(&pdev->dev, "pio_clk"); if (IS_ERR(clk)) { ret = PTR_ERR(clk); goto gpiochip_error; -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/