From patchwork Fri Jan 17 06:47:30 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: 3502181 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 E7B8FC02DC for ; Fri, 17 Jan 2014 06:55:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C75D2018B for ; Fri, 17 Jan 2014 06:55:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33F352017D for ; Fri, 17 Jan 2014 06:55:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752059AbaAQGz3 (ORCPT ); Fri, 17 Jan 2014 01:55:29 -0500 Received: from smtp.csie.ntu.edu.tw ([140.112.30.61]:33784 "EHLO smtp.csie.ntu.edu.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751079AbaAQGz2 (ORCPT ); Fri, 17 Jan 2014 01:55:28 -0500 X-Greylist: delayed 472 seconds by postgrey-1.27 at vger.kernel.org; Fri, 17 Jan 2014 01:55:28 EST Received: from mirror2.csie.ntu.edu.tw (mirror2.csie.ntu.edu.tw [140.112.30.76]) by smtp.csie.ntu.edu.tw (Postfix) with ESMTPSA id 66F84205C6; Fri, 17 Jan 2014 14:47:35 +0800 (CST) Received: from wens by mirror2.csie.ntu.edu.tw with local (Exim 4.82) (envelope-from ) id 1W43DL-0008WL-Bd; Fri, 17 Jan 2014 14:47:35 +0800 From: Chen-Yu Tsai To: Johannes Berg , "David S. Miller" Cc: Chen-Yu Tsai , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com, Maxime Ripard , linux-wireless@vger.kernel.org Subject: [PATCH RFC 5/6] net: rfkill: gpio: add clock-frequency device tree property Date: Fri, 17 Jan 2014 14:47:30 +0800 Message-Id: <1389941251-32692-6-git-send-email-wens@csie.org> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1389941251-32692-1-git-send-email-wens@csie.org> References: <1389941251-32692-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.2 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 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 | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt b/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt index 8a07ea4..8b8db0a 100644 --- a/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt +++ b/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt @@ -13,6 +13,7 @@ NAME_reset-gpios, or both, must be defined. Optional properties: - clocks : phandle to clock to enable/disable +- clock-frequency : clock rate to set for the given clock Example: @@ -23,4 +24,5 @@ Example: bluetooth_shutdown-gpios = <0>, <&pio 7 18 0>; bluetooth_reset-gpios = <&pio 7 24 0>; clocks = <&clk_out_a>; + clock-frequency = <32678>; }; diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 48381a8..3092681 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -40,6 +40,7 @@ struct rfkill_gpio_data { char *reset_name; char *shutdown_name; struct clk *clk; + int clk_frequency; bool clk_enabled; }; @@ -92,6 +93,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; } @@ -138,6 +140,8 @@ static int rfkill_gpio_probe(struct platform_device *pdev) snprintf(rfkill->shutdown_name, len + 10, "%s_shutdown", rfkill->name); rfkill->clk = devm_clk_get(&pdev->dev, clk_name); + if (!IS_ERR(rfkill->clk) && rfkill->clk_frequency > 0) + clk_set_rate(rfkill->clk, rfkill->clk_frequency); gpio = devm_gpiod_get_index(&pdev->dev, rfkill->reset_name, 0); if (!IS_ERR(gpio)) {