From patchwork Thu Jun 23 17:45:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9195657 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6CD0A6075A for ; Thu, 23 Jun 2016 17:45:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5FC042844E for ; Thu, 23 Jun 2016 17:45:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54CFE28465; Thu, 23 Jun 2016 17:45:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF2512844E for ; Thu, 23 Jun 2016 17:45:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751950AbcFWRpz (ORCPT ); Thu, 23 Jun 2016 13:45:55 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36141 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751832AbcFWRpx (ORCPT ); Thu, 23 Jun 2016 13:45:53 -0400 Received: by mail-wm0-f65.google.com with SMTP id c82so12822565wme.3 for ; Thu, 23 Jun 2016 10:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MP2uvNZNtni5MavXsgQTB39lMwWG8kF45s41pFj4Ujo=; b=HpnE4oe/1KksINM6Et+FzOVkAnDFMAw6tdp5oilZZQ/0/yYocgig5NsyqsT+G446Re LSka89cRQyq4PM3gbbFXdlAwO9Wa/VsZGx+rwGjIEmAwJKr7ztuExYLd+MXvqRPZyHum s3svUgWAro8DFmPegXQcpTE1zkdG+wyfLXndWbpjLTEpjisE1rFB9AocHyO9thbpoKhz tv8Jovzs0iwoY7LWU/ZqnF/05uA+7KW2583GpApFeFSIYDbIb6sSGNviRsJIXxop/edS IpRmH9dJPxrYbr9schrKF2aigPun3lpM/xx72I0i3SEOu0yZnErNYT1OCNgUfrMlDrsD 2/ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MP2uvNZNtni5MavXsgQTB39lMwWG8kF45s41pFj4Ujo=; b=Shvmhb/c9/ROSuZmQJOEMSzhiUQvL2kcdZFCMG/Kn03RQZsTg80NacXuC3TTgWaSWk AgjYKf3clYzKzgWAgIcybjqZQqTKiZ7egqrs3rfp+5CpW4rU6DGpNyY8VjAIIcVZTUsf QPjTdpkbWYVFJGWdzg0LB2i3FHkMVGFyFdibncZTeKPEE6O4uTjfpeKx+P41VoRTssQQ am7sOSanx4UxXvmc4ficceFzXfEXeGM5XF+Sgvvc5uAyyN61u95C36E8xm2XglNV1Tm6 bpabpisNSI746lCkUd3ablwRHx79hV4KXLHq/JyaanHPcpW4f6nG9J+ykkDMosF+N6z5 j0CA== X-Gm-Message-State: ALyK8tJeqDM1vQt3S1HyyhP5SQZztP32+N5JJchVgTEHlywmoaHEyI5FaVM9RWa0iemeqg== X-Received: by 10.194.47.71 with SMTP id b7mr30976381wjn.107.1466703952085; Thu, 23 Jun 2016 10:45:52 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD3CD1B0478F6703992958538.dip0.t-ipconnect.de. [2003:dc:d3cd:1b04:78f6:7039:9295:8538]) by smtp.googlemail.com with ESMTPSA id ue1sm1117188wjc.44.2016.06.23.10.45.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2016 10:45:51 -0700 (PDT) From: Martin Blumenstingl To: ath9k-devel@qca.qualcomm.com, linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org Cc: nbd@nbd.name, chunkeey@googlemail.com, mark.rutland@arm.com, robh+dt@kernel.org, Martin Blumenstingl Subject: [PATCH RFC v2 2/2] ath9k: parse the device configuration from an OF node Date: Thu, 23 Jun 2016 19:45:36 +0200 Message-Id: <20160623174536.5967-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160623174536.5967-1-martin.blumenstingl@googlemail.com> References: <20160623174536.5967-1-martin.blumenstingl@googlemail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This makes it possible to configure ath9k based devices using devicetree. That makes some out-of-tree "convert devicetree to ath9k_platform_data glue"-code obsolete. Signed-off-by: Martin Blumenstingl --- changes in v1 -> v2: - use vendor prefix "qca" instead of "ath" - use of_device_is_available instead of simply checking if "np" is NULL - removed code which read some properties twice drivers/net/wireless/ath/ath9k/init.c | 61 +++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index a0f4a52..2b5e3db 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include @@ -555,6 +557,61 @@ static int ath9k_init_platform(struct ath_softc *sc) return 0; } +static int ath9k_of_init(struct ath_softc *sc) +{ + struct device_node *np = sc->dev->of_node; + struct ath_hw *ah = sc->sc_ah; + struct ath_common *common = ath9k_hw_common(ah); + const char *mac, *eeprom_name; + int led_pin, ret; + u32 gpio_data; + + if (!of_device_is_available(np)) + return 0; + + ath_dbg(common, CONFIG, "parsing configuration from OF node\n"); + + if (!of_property_read_u32(np, "qca,led-pin", &led_pin)) + ah->led_pin = led_pin; + + if (!of_property_read_u32(np, "qca,gpio-mask", &gpio_data)) + ah->gpio_mask = gpio_data; + + if (!of_property_read_u32(np, "qca,gpio-val", &gpio_data)) + ah->gpio_val = gpio_data; + + if (of_property_read_bool(np, "qca,clk-25mhz")) + ah->is_clk_25mhz = true; + + if (of_property_read_bool(np, "qca,led-active-high")) + ah->config.led_active_high = true; + + if (of_property_read_bool(np, "qca,disable-2ghz")) + ah->disable_2ghz = true; + + if (of_property_read_bool(np, "qca,disable-5ghz")) + ah->disable_5ghz = true; + + if (of_property_read_bool(np, "qca,check-eeprom-endianness")) + ah->ah_flags &= ~AH_NO_EEP_SWAP; + else + ah->ah_flags |= AH_NO_EEP_SWAP; + + if (!of_property_read_string(np, "qca,eeprom-name", &eeprom_name)) { + ret = ath9k_eeprom_request(sc, eeprom_name); + if (ret) + return ret; + } + + mac = of_get_mac_address(np); + if (mac) + ether_addr_copy(common->macaddr, mac); + + ah->ah_flags &= ~AH_USE_EEPROM; + + return 0; +} + static int ath9k_init_softc(u16 devid, struct ath_softc *sc, const struct ath_bus_ops *bus_ops) { @@ -611,6 +668,10 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, if (ret) return ret; + ret = ath9k_of_init(sc); + if (ret) + return ret; + if (ath9k_led_active_high != -1) ah->config.led_active_high = ath9k_led_active_high == 1;