From patchwork Tue Apr 15 06:41:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 3989691 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 84AB6BFF02 for ; Tue, 15 Apr 2014 07:25:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AC2B820211 for ; Tue, 15 Apr 2014 07:25:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9D38201FB for ; Tue, 15 Apr 2014 07:25:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751997AbaDOHYn (ORCPT ); Tue, 15 Apr 2014 03:24:43 -0400 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76]:36238 "EHLO mirror2.csie.ntu.edu.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751172AbaDOHWV (ORCPT ); Tue, 15 Apr 2014 03:22:21 -0400 Received: from wens by mirror2.csie.ntu.edu.tw with local (Exim 4.82) (envelope-from ) id 1WZx3u-0004jb-5D; Tue, 15 Apr 2014 14:41:42 +0800 From: Chen-Yu Tsai To: Linus Walleij , Johannes Berg , "John W. Linville" , Maxime Ripard Cc: Chen-Yu Tsai , Arnd Bergmann , Heikki Krogerus , Mika Westerberg , Alexandre Courbot , Stephen Warren , linux-gpio@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com Subject: [PATCH 6/7] net: rfkill: gpio: add clock-frequency device tree property Date: Tue, 15 Apr 2014 14:41:40 +0800 Message-Id: <1397544101-18135-7-git-send-email-wens@csie.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1397544101-18135-1-git-send-email-wens@csie.org> References: <1397544101-18135-1-git-send-email-wens@csie.org> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some devices, such as Broadcom Bluetooth devices, require a specific clock rate for the clock tied to the rfkill device. Add a clock-frequency property so we can specify this from the device tree. Signed-off-by: Chen-Yu Tsai --- Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt | 2 ++ net/rfkill/rfkill-gpio.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt b/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt index a23da65..67b5edb 100644 --- a/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt +++ b/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt @@ -11,6 +11,7 @@ Required properties: Optional properties: - clocks : phandle to clock to enable/disable +- clock-frequency : desired clock rate for the given clock Example: @@ -21,4 +22,5 @@ Example: gpios = <&pio 7 18 0>; gpio-names = "reset"; clocks = <&clk_out_a>; + clock-frequency = <32678>; }; diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index a174359..14ac8c1 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -38,6 +38,7 @@ struct rfkill_gpio_data { struct rfkill *rfkill_dev; struct clk *clk; + uint32_t clk_frequency; bool clk_enabled; }; @@ -90,6 +91,7 @@ static int rfkill_gpio_dt_probe(struct device *dev, rfkill->name = np->name; of_property_read_string(np, "rfkill-name", &rfkill->name); of_property_read_u32(np, "rfkill-type", &rfkill->type); + of_property_read_u32(np, "clock-frequency", &rfkill->clk_frequency); return 0; } @@ -122,6 +124,9 @@ static int rfkill_gpio_probe(struct platform_device *pdev) rfkill->clk = devm_clk_get(&pdev->dev, NULL); + if (!IS_ERR(rfkill->clk) && rfkill->clk_frequency > 0) + clk_set_rate(rfkill->clk, rfkill->clk_frequency); + gpio = devm_gpiod_get_index(&pdev->dev, "reset", 0); if (!IS_ERR(gpio)) { ret = gpiod_direction_output(gpio, 0);