Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756057Ab3D1KYz (ORCPT ); Sun, 28 Apr 2013 06:24:55 -0400 Received: from mail-ee0-f42.google.com ([74.125.83.42]:55633 "EHLO mail-ee0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755892Ab3D1KYv (ORCPT ); Sun, 28 Apr 2013 06:24:51 -0400 From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: Stephen Rothwell , Grant Likely , Rob Herring , Rob Landley , Mike Turquette , Stephen Warren , Thierry Reding , Dom Cobley , Linus Walleij , Arnd Bergmann , Andrew Morton , Pawel Moll , Mark Brown , Russell King - ARM Linux , Rabeeh Khoury , Daniel Mack , Jean-Francois Moine , Lars-Peter Clausen , Guenter Roeck , Michal Bachraty , Marek Belisko , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] clk: si5351: Allow to build without CONFIG_OF Date: Sun, 28 Apr 2013 12:24:41 +0200 Message-Id: <1367144681-14248-1-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2706 Lines: 79 In clk-si5351 there was some dependency to CONFIG_OF that permitted the use of the driver on !CONFIG_OF platforms. This patch adds proper #ifdef around of_clk_add_provider and removes the dependency on CONFIG_OF. Signed-off-by: Sebastian Hesselbarth --- Note: This patch is based upon v3.9-rc8 with clk-si5351 v8 plus two fixes by Marek Belisko applied. It has been compile-tested on x86_64 allmodconfig. Cc: Stephen Rothwell Cc: Grant Likely Cc: Rob Herring Cc: Rob Landley Cc: Mike Turquette Cc: Stephen Warren Cc: Thierry Reding Cc: Dom Cobley Cc: Linus Walleij Cc: Arnd Bergmann Cc: Andrew Morton Cc: Pawel Moll Cc: Mark Brown Cc: Russell King - ARM Linux Cc: Rabeeh Khoury Cc: Daniel Mack Cc: Jean-Francois Moine Cc: Lars-Peter Clausen Cc: Guenter Roeck Cc: Michal Bachraty Cc: Marek Belisko Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org --- drivers/clk/Kconfig | 1 - drivers/clk/clk-si5351.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 6412f55..5039e41 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -58,7 +58,6 @@ config COMMON_CLK_MAX77686 config COMMON_CLK_SI5351 tristate "Clock driver for SiLabs 5351A/B/C" depends on I2C - depends on OF select REGMAP_I2C select RATIONAL ---help--- diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c index 8323c31..91c0f01 100644 --- a/drivers/clk/clk-si5351.c +++ b/drivers/clk/clk-si5351.c @@ -1489,12 +1489,14 @@ static int si5351_i2c_probe(struct i2c_client *client, } } +#ifdef CONFIG_OF ret = of_clk_add_provider(client->dev.of_node, of_clk_src_onecell_get, &drvdata->onecell); if (ret) { dev_err(&client->dev, "unable to add clk provider\n"); return ret; } +#endif return 0; } -- 1.7.10.4 -- 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/