From patchwork Fri Jun 24 12:34:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9197401 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 5E91F60754 for ; Fri, 24 Jun 2016 12:35:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E3CB1FF60 for ; Fri, 24 Jun 2016 12:35:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 415EC284AE; Fri, 24 Jun 2016 12:35:12 +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 A44391FF60 for ; Fri, 24 Jun 2016 12:35:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751487AbcFXMfE (ORCPT ); Fri, 24 Jun 2016 08:35:04 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33853 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbcFXMfC (ORCPT ); Fri, 24 Jun 2016 08:35:02 -0400 Received: by mail-wm0-f65.google.com with SMTP id 187so4642719wmz.1 for ; Fri, 24 Jun 2016 05:35:01 -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=R8RupeNgqMXMb57H6VG9sTib2AHPqhyy6pT7vhHRmtM=; b=0grr91szZItXzbvRQbtcd8cxwIVd5SfTzK4mo7CYBFuLLxGd5OuQ4vTUCjma3uCnEF FAKNn3+hEkWFgHT8E5HBtpKkqz7XvXNtNxGSBcClzzyxx4iasOLIYFR5sMmALXu9vqXt EV0vBodvv5FM7rXQN4I3qtgV2UXZ4WCYIHKKxeY0VCgJlpaNeULmSiuBBgIs4WxjTy5X wSixvEYD2/IkH2XrKuKH8xJUrLPWojTGunrVZshmGRO8foLKmoO+zlab3pUgarnNezFq EKQoAr/zKJnEJYphf+b9OqKBIfQdND2xxJQ8UDavebkfTmCzaH04PshnxD/qMcxoxGLg kc4A== 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=R8RupeNgqMXMb57H6VG9sTib2AHPqhyy6pT7vhHRmtM=; b=YPBgDFaTKaVELCOKby4PnsrPNOB/e5A53TPcKWuKqCQJ08vgKDIiPKVb6plc1wVon3 xkv2r5SFPjnSVLSJUAxBkoH4RQ917Umb5nGmApX1vagMW/x4avTBlMkYm3iFQQDotJUH gXcCyJnCPdvRCk9Pwz/ULR873IW5nwc+qd0wt6POjbquO6tRJxToHd8Oi9mugflxxhdd kL+WqdmKQaca4U/cCmtNcWa2cw4AB6Ts8Gqvdh1jlYsUqAC88QDRFx6Pndt6bF6RgBbc GfGZRgGgCG+dzbpipcLXiFTkwtEQdq/gdr7Sqc7wCeWFLLZJJutReuXevwHV6rzTGeyI V8/Q== X-Gm-Message-State: ALyK8tIYbLj+ZkjaNCCNGXl8C138dQcl8t5UvnOYWWiYm9eI3nTBJ65yx7z02lMeEBM92w== X-Received: by 10.194.203.233 with SMTP id kt9mr3618973wjc.75.1466771700875; Fri, 24 Jun 2016 05:35:00 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD3CD1B04711E7E5304799B46.dip0.t-ipconnect.de. [2003:dc:d3cd:1b04:711e:7e53:479:9b46]) by smtp.googlemail.com with ESMTPSA id x83sm2942499wmx.9.2016.06.24.05.34.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jun 2016 05:35:00 -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, arend.vanspriel@broadcom.com, Martin Blumenstingl Subject: [PATCH RFC v3 3/3] ath9k: parse the device configuration from an OF node Date: Fri, 24 Jun 2016 14:34:30 +0200 Message-Id: <20160624123430.4097-4-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160624123430.4097-1-martin.blumenstingl@googlemail.com> References: <20160624123430.4097-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 v2 -> v3: - replaced qca,eeprom-name with a boolean "qca,no-eeprom". The name of the eeprom firmware file is now generated based on the following pattern: ath9k-eeprom--.bin drivers/net/wireless/ath/ath9k/init.c | 68 +++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index a0f4a52..9521bc8 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,68 @@ 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); + enum ath_bus_type bus_type = common->bus_ops->ath_bus_type; + const char *mac; + char eeprom_name[100]; + 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_bool(np, "qca,no-eeprom")) { + /* ath9k-eeprom--.bin */ + scnprintf(eeprom_name, sizeof(eeprom_name), + "ath9k-eeprom-%s-%s.bin", + ath_bus_type_to_string(bus_type), dev_name(ah->dev)); + + 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 +675,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;