From patchwork Thu Jun 23 15:13:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9195443 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 E64986075A for ; Thu, 23 Jun 2016 15:13:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D67B02844A for ; Thu, 23 Jun 2016 15:13:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA01528461; Thu, 23 Jun 2016 15:13:41 +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 6B66C2844A for ; Thu, 23 Jun 2016 15:13:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751175AbcFWPNj (ORCPT ); Thu, 23 Jun 2016 11:13:39 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34258 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750972AbcFWPNi (ORCPT ); Thu, 23 Jun 2016 11:13:38 -0400 Received: by mail-wm0-f66.google.com with SMTP id 187so11790136wmz.1 for ; Thu, 23 Jun 2016 08:13:37 -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=NEMJmsXgAT30U7JX4+dS+qMKcDjxuLIOnaxzh9ZDiw8=; b=IjCj/Uhg6dawE1UtpzlDFJOU2+idWsH1EDHuo/JmUAJSVGmKIF5oy0cDNjtMcrmcgN nIHyPsjbWw9lsJr4n9vE8NyGPIlOxDTvwl1vv6aqkvwXMh3wewJhjej1QV6HpZrADrNv I2zMab4/pd4eFHJXIqJGWXGfn48kUFUk5O8UZLH05ADZyzkZIeZwzoyI/a7h3Ice2gOn T+Tsed99LD3edeUQ0k8QJma1qOU+HyGJi/7lGxoG6NOgXalR+CohveRjz8mTsTVA0XRz QacbH54oF672f92eiEJxMmlc4qiHIUrZ17ApFMwCtxKndNlsje01NN+NvfD37mPYUxiC GODg== 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=NEMJmsXgAT30U7JX4+dS+qMKcDjxuLIOnaxzh9ZDiw8=; b=WCh/FDeMKUYqdQsymiyynzCa2q04/Fk5s+awIX2VFv0odNqNX7g6BNkxp3qcRhurqu +eEtrJ8l+0aQEWJoLkQ7oBycUVTAGYt7yACwEtSuHC/g4aIaLobVjgnNgaffhbKGfzPN 33hbk08MohVqo7UN0bOnYqZGUFoF7UfeQR0YeYKcr9Fc5B1JMHL6zlZQj0JdrfG3u/06 br7ESGfvxBnJgUIznWizLCR4e3f9BrXFd35cE5xjKjqcAjxYEv5+nToVrBsZ9xmYvInq WiO5BR3mhThhHtkUoTeXUKSPK8EJe/fQH6JM0LOMUBGZvXbsVXYlX+4S0UL6nvIxPfn4 abGA== X-Gm-Message-State: ALyK8tLPH2AFoW59m4NXG/JexzF8xhNPnhivjOOwrE9J83kULsZHVL5zmfmqEhuK6Iff4Q== X-Received: by 10.194.88.5 with SMTP id bc5mr32792338wjb.100.1466694816863; Thu, 23 Jun 2016 08:13:36 -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 w81sm4303961wmg.20.2016.06.23.08.13.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2016 08:13:36 -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, Martin Blumenstingl Subject: [PATCH 1/2] ath9k: parse the device configuration from an OF node Date: Thu, 23 Jun 2016 17:13:27 +0200 Message-Id: <20160623151328.24061-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160623151328.24061-1-martin.blumenstingl@googlemail.com> References: <20160623151328.24061-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 --- drivers/net/wireless/ath/ath9k/init.c | 70 +++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index a0f4a52..0f76137 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,70 @@ 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 (!np) + return 0; + + ath_dbg(common, CONFIG, "parsing configuration from OF node\n"); + + if (!of_property_read_u32(np, "ath,led-pin", &led_pin)) + ah->led_pin = led_pin; + + if (!of_property_read_u32(np, "ath,gpio-mask", &gpio_data)) + ah->gpio_mask = gpio_data; + + if (!of_property_read_u32(np, "ath,gpio-val", &gpio_data)) + ah->gpio_val = gpio_data; + + if (of_property_read_bool(np, "ath,clk-25mhz")) + ah->is_clk_25mhz = true; + + if (!of_property_read_u32(np, "ath,gpio-mask", &gpio_data)) + ah->gpio_mask = gpio_data; + + if (!of_property_read_u32(np, "ath,gpio-val", &gpio_data)) + ah->gpio_val = gpio_data; + + if (of_property_read_bool(np, "ath,clk-25mhz")) + ah->is_clk_25mhz = true; + + if (of_property_read_bool(np, "ath,led-active-high")) + ah->config.led_active_high = true; + + if (of_property_read_bool(np, "ath,disable-2ghz")) + ah->disable_2ghz = true; + + if (of_property_read_bool(np, "ath,disable-5ghz")) + ah->disable_5ghz = true; + + if (of_property_read_bool(np, "ath,check-eeprom-endianness")) + ah->ah_flags &= ~AH_NO_EEP_SWAP; + else + ah->ah_flags |= AH_NO_EEP_SWAP; + + if (!of_property_read_string(np, "ath,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 +677,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;