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 <wens@xxxxxxxx> --- 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); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html