From patchwork Sun May 25 21:42:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 892565 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 05DF91B4F08; Sun, 25 May 2025 21:43:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748209383; cv=none; b=LgKnUFzm4EtrGXUUGJ7bk3NyD1lWKvaXRXzuN908IBRSna7sxT1RaVdHuc9Nj2hzM33AmYRxhEyAY2QI5U4ehKx5ZJG8g4cFWtRTggbq7e/RFsJJ2r/DFfBbctamAnDdz62qpsEXXBHGJpJDNlDqm4MON5XUnR4Ut3tBMoOQHak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748209383; c=relaxed/simple; bh=LAVh7geJL1PD75mFZMVsyKCNDPWBKX7Jf3cyBhahb+w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i/UrK23ZZvdAFNBGZVjJ95i88HVYV20CqiTs8YSH7Heja/72dNSCL9USYcn4YmLKy/PTCl1U5M0M3UUyP/jCBJtLzr58H4db8LU2daHilecuVs8EYFgCYRMAKAWpHC0gjmWBbDaw4qQ9xoJ4iQfVEfbJdm9iOR6RzvaqhY4go7c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UbAbkQNQ; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UbAbkQNQ" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22c336fcdaaso10021195ad.3; Sun, 25 May 2025 14:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748209380; x=1748814180; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6nQsjeWRBpWxFf7RQtRpXio5qVfPNye6yh/BzrdVEeY=; b=UbAbkQNQYbNjAL6Dl1NfhfzGuIrFrzfJOq+dd4BTt25asmRz2LuoKIHW0m0wGt9t2q hdgLiO2H1IYrvjxtBDBykCmxJGoaNcFpQAlYYXEaXY6Qg66nSBNvA4BWcdSyOMx1OavS b60kZ6WwferY2a20m+QpAP5JiXi6aZbODd10AC3qOpBW1mwJuUDyL3tF/uZvuprAzCOX DSCvripkBH375F0I20XTd2RQEMcRU+ZJMEjXjMuo8nLo9QhtJ7D/ad4yThPq3gpXuZgi zHnIe4g9ssoLPG94KRtiUeGg1JDdJHivltvwpJH5YTfQ5OWE+tF0lFAk1lCEn0qdespC MAmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748209380; x=1748814180; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6nQsjeWRBpWxFf7RQtRpXio5qVfPNye6yh/BzrdVEeY=; b=T7SQ3pJIhHv0U1piUoJ28IKspobsG/96DqQ6Hgphj18pOJHRmMafowRkxUSf8p6Caf eJZ8SQZ034+PUO/rs0LSTlST3EZQ+oLeshifcS1XW0MfMlIGWBnvS3+qR6+GmR+XWH/z 5H31z2DfrWgKOTSc58bIttyPeosw6cMB/Bw3P8O4oPOfC34/IAeIJeL7yS8EA/NHSO8b oUHV7fiv0nLxvu6BzB86V4xvGZsYSCvYn3uevi8SSpr2kWEBkqX7isPo1nRtHEo1TYfD WKIQojSQ8XGNPzsGJ/XFB74DkG4fIZ+F5Gt0K5rbOFe7GrbaLlwvCayZrippsQlpvTYF t+dQ== X-Forwarded-Encrypted: i=1; AJvYcCUEDeo6j0Q2p1iMHlBgTTFLjeRR1j1SBn+sWmpgQgf1/yOLIG0BixETuoUQZWynCUmFH4usN1WzXrlvJw==@vger.kernel.org, AJvYcCW2ROgpPqxLGI/R6EsERc/kpm4ghuyCUOKWQ4931sM0dobBdIo9BGq1lAR0YGBjJ8e0hqvyEnJWP8YJ@vger.kernel.org, AJvYcCXg0B1QZbguBjrGYP8Xmz/ygtA/Ki5FuBHsfj5VGH16uGPqybFQAz69uu86WCuiUuzf9lwSCnF/l+jed7mi@vger.kernel.org X-Gm-Message-State: AOJu0YwMNpoStyeN4aAX1t7mqkSNFwy5UdgG/BVoBFi0YD5cf4EGEQEL RezGPV692ML/606XLAf7AacmKFFP6GsrTz4oWwWmo+BDJIp4nX0X8JJ3aYOeZA== X-Gm-Gg: ASbGncsD0XIkBF6vmJ+QKk0Uz/ELAoq+mEUK0l9zJUsy1YkzZqJLj11BA4TVcxsA8RB MVz8bJyiMd1y11pPy5XAq0/25meQJG9XIhHPCXXJjGSNpXL7IjHOrNYp9QXZtyScvn7zwuOjhN3 UAkWcDipneEWhE7p3eUQtDCVVELpL4fhlyBvCSUAFcECR7BFCXGu7/NAJkMcvec2gf75UjGNTpe XO83KAAuYWji2ZQCJZKyHdMuyCBUkYegYEXl7xDJKAYqyMSr87F8fTM76ABcbB3IhqaXWCwzrYh OVeoZwERUIyewAkd0HGF+TTbRnCd9OVG5fZYfw== X-Google-Smtp-Source: AGHT+IEVMFzOa9R0IaaI+pWRQi5yXsaPBwgS07kdKqjymnhBqQ+PXQxAPwshRfYaPtzKIXazDkvSIA== X-Received: by 2002:a17:902:f551:b0:231:d108:70e with SMTP id d9443c01a7336-23414f779ffmr116961385ad.21.1748209380093; Sun, 25 May 2025 14:43:00 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2340934d91asm35083115ad.166.2025.05.25.14.42.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 14:42:59 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , nbd@nbd.name, Johannes Berg , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Bogendoerfer , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), linux-mips@vger.kernel.org (open list:MIPS) Subject: [PATCHv4 1/5] wifi: ath9k: ahb: reorder declarations Date: Sun, 25 May 2025 14:42:52 -0700 Message-ID: <20250525214256.8637-2-rosenp@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250525214256.8637-1-rosenp@gmail.com> References: <20250525214256.8637-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Easier to look at. Follows netdev style. Also remove ret assignment. Because of all of these devm conversions, ret = 0 is a path that never gets hit. The first time it does it when request_irq fails, but that ends up reassigning it. Signed-off-by: Rosen Penev Reviewed-by: Krzysztof Kozlowski --- drivers/net/wireless/ath/ath9k/ahb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index 49b7ab26c477..d2a97e74f451 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c @@ -71,14 +71,14 @@ static const struct ath_bus_ops ath_ahb_bus_ops = { static int ath_ahb_probe(struct platform_device *pdev) { - void __iomem *mem; - struct ath_softc *sc; - struct ieee80211_hw *hw; const struct platform_device_id *id = platform_get_device_id(pdev); - int irq; - int ret = 0; + struct ieee80211_hw *hw; + struct ath_softc *sc; struct ath_hw *ah; + void __iomem *mem; char hw_name[64]; + int irq; + int ret; if (!dev_get_platdata(&pdev->dev)) { dev_err(&pdev->dev, "no platform data specified\n"); From patchwork Sun May 25 21:42:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 892920 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 89B131B87EB; Sun, 25 May 2025 21:43:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748209383; cv=none; b=dBR4BTnM0vMpba12vqv2567pJ4mbKrjOKJ1m3tdFNQa90+HHpSaa3HffUf8HUNtDcHt4Wofzeph7bZYF9ZYdduW6+wXiApVyJeDO3N4qXnwk233LHJp+TnVBVWLqEhvACRJiKpqjf4hzbGr1GLeBzSfdRWAVGd0L18YbiJO0thw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748209383; c=relaxed/simple; bh=GHzj+vhP0IH7AazDd4aDDdmVsDEWratUTV7OerNI/8A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kbpVnd1C67bJvjgS648YSPDuCE/QA+J8M/b3WHo5xkoobZBXNnrkSvco9cyg+wdGMzbF5JFaGK416FK1xdYFuU4mqisC7IDDqoACnBXylmDkWwF9FuxHBz3eoeAYu2kZ3iY7miH5cVWOrA6d282+KgqYDW0k8mJpNAmqfhUo/Dg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Dm2hJ6zm; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Dm2hJ6zm" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-23278ce78efso8495545ad.2; Sun, 25 May 2025 14:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748209381; x=1748814181; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SQ+RqlSFyQLSDHWP9kEu2/DGiQBnqF1j/beqMyydt5w=; b=Dm2hJ6zmlscoviMrAJeS+RtpeNWYaQPfFlS+7jy3U8RBIstcjEQgX+GriC9ZpM+4M6 uOcn1qq7Plmy00MzZxckqGgmPvu9VzFuZkYeyfemQa1lljeUpQzI4YSPeO57FGBRYhHG 0m2xYEE9lOxg8B2QMUgBkLOVxIcttM8PVv4MzHA1BHxxCIortJUL5ky/Vy3bd1pNydYH o4uEocmMfUBUk69ceneujO6xstYoII+j+8K6384lEskkwn91j6uIppusLXl5Rc8I+/fq u7718+rnkgibKK0RsUSozrBFpOgmO6VFQIsMELRAcXBjD2wFT5N/aJ2Z97CrjIUNN2B5 0NLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748209381; x=1748814181; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SQ+RqlSFyQLSDHWP9kEu2/DGiQBnqF1j/beqMyydt5w=; b=NTya/OAUslkjeLtMHNCljCK1tQYECFk5HV/6bZThUihY/TU1msweormfLPBVXuze2i AWB488MJ0Wg87jdWFLYl/5ygPPVULoH2S9vJpiu2E0zmzJ7OO0k7NXXiIVZfbZYzjMET 00Rl4YrsBLcpcB90Kp6ZWlrmVkQwPpfCokrHzPO4B2DybWIovXIwICN0b4qhiCy/7BVn iUfFNOkIKwhH9RwsR1ISlUWFzJpDg5V4WnuCAD1i6npC6rW6C55cG9OjR4aYh6FUYBe5 pFoQX0PWsACfnV9qd32obEvxQxomJPNhUzr6vQ3iib4aXvs+EtEIgHCs8Jo9B7J+Kcq8 I6Ow== X-Forwarded-Encrypted: i=1; AJvYcCUG1wdF104kNZCDsprduh3yIJ+krvOKgbbaDCOeORnZW9nL0ty/DdN5HxL0rAdpg03cET41gYUPwFmj@vger.kernel.org, AJvYcCVa/Ebyi4oY/cTJPGupDnEd3BBRAYxFwWIcr0kBkCkXfGY7DLqE8PFTqE17cJr9YVox7YFB1auN02B9gQ==@vger.kernel.org, AJvYcCW6BSDu7vLYViIKXGPfb3j6pxCHl69gVxLL8kp3aojy8nWra7O5azcScozURHeQQ984uR+IvH54CQzOaY5U@vger.kernel.org X-Gm-Message-State: AOJu0YztrjBg1wFkSuuhHSO1yWBvY1VkUsVzFOteu8k3OGYvRQNHtihq GK+G44O9NzHXCoRs2KwYlwxXGqovIYixlBH0lfhaOpKcySTlPZ2Yxm/d9MzNrA== X-Gm-Gg: ASbGncslwRQQ9/OgK1leWpdcZWuylGjq1dWltD9R5E/RLapiV3k99b0kiJBlAg2IhcT L8M5RpxES6w/u7FxPiL8CzkhRgCPMRPkHs9IRFgvR+HgTVIBhce8TtqR5hSMOfXOKKahYN+KUrD QpOfT6XzrzV5Zf5RO2XeO4/k74DVRB6gyXyYFoqKH7VmaToDTLzvMrwLq2l/eoLWcXMSBcfORBe RcgAQKx+WirGN3/RrAtMEyp1euagA/iCEz2cJgI27hMw6urkVpzMJtH3NqU8wHWPpjQOo1A6z/N VI8Ny3dT0tG9Smw6CbRB2QdMBvA85GtjxVd49Q== X-Google-Smtp-Source: AGHT+IHF0qg7XRO6cKHYVHl2gLnkwXP4O7TTQlPqXAyq6VAe/C1fzUPEpxgOfK5wJAMscghx9ZZ/OQ== X-Received: by 2002:a17:902:f611:b0:231:d7f9:dc6d with SMTP id d9443c01a7336-23414e9b517mr104887055ad.0.1748209381477; Sun, 25 May 2025 14:43:01 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2340934d91asm35083115ad.166.2025.05.25.14.43.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 14:43:01 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , nbd@nbd.name, Johannes Berg , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Bogendoerfer , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), linux-mips@vger.kernel.org (open list:MIPS) Subject: [PATCHv4 2/5] wifi: ath9k: ahb: reorder includes Date: Sun, 25 May 2025 14:42:53 -0700 Message-ID: <20250525214256.8637-3-rosenp@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250525214256.8637-1-rosenp@gmail.com> References: <20250525214256.8637-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Alphabetic includes are easier to look at and to make further changes to them. Signed-off-by: Rosen Penev --- drivers/net/wireless/ath/ath9k/ahb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index d2a97e74f451..1ffec827ed87 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c @@ -16,10 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include +#include #include #include -#include -#include + #include "ath9k.h" static const struct platform_device_id ath9k_platform_id_table[] = { From patchwork Sun May 25 21:42:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 892564 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F35513FE5; Sun, 25 May 2025 21:43:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748209385; cv=none; b=GYTPBc749QqFYfEUxIZes6c6DOM2nKjdvBiIz1emTS40x0FEyHMBzM6E0EuB4lN3zYMia9xL8PqTT2uES9wOHgYjrk7YD+NRFUagFXoWLtxArmV0oKHBQiw4k/x4F9EWR2QGKYty0su9pIf0/7tZCiCYbnQAEHwwxARTAxZh5ZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748209385; c=relaxed/simple; bh=HryFMxtPGQTUX66WdSMOipC0PhAm8iDYY5ItQB0wHog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CidNDD+YcOkJhL3nOVN7BstNdUpj8DKAoq+74GGvXoa2XWHx4qgR3cz0cTa+BiREU0dUf1jqLuSqMibvF838xbzrtO2X25F0uwetF25RMEBjbrh5ZRDzBBMGYKW7E+0d+iO0TdkpiyDTdxAIl1j7+2C8lXK0EW8yAxtByts3TU0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gigw+IhS; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gigw+IhS" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2346765d5b0so2035425ad.2; Sun, 25 May 2025 14:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748209383; x=1748814183; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MH+ITiCFQ4yVUKo5JFu8IMtQLXqlQ6GPmC9LCOWHvoQ=; b=gigw+IhSF617BAkZN4h0n8dRn3AxTC8dLXpAFR1nKAqNFVLRSNdt2mnZNZDL6LnkCj ebiIPiybe+uiuyXuwUTuRz2yA9rn58EN2OoM0cYhRTW2FuXQbFuzaDQZ8iQAWcDlF9Vx BM4dtAl5hE+H7oDruIizZeatUMufXSDCTfWg8Yrg0y8vxecPDq5v0zzA1cI1nZN85spg uex+8p4HvrBXscxRIaKfm5YTsO+BVlD7UPoBP8sLhLSfVt5LWeLi6ogmjZRv8+Gr2Jp+ m4buF12awwls7wKW5h2u6fH6pOi6lup0qVkNE15BH02P7f9/VXIRZ9jonsCKjYMSUtJa WiJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748209383; x=1748814183; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MH+ITiCFQ4yVUKo5JFu8IMtQLXqlQ6GPmC9LCOWHvoQ=; b=cCyP4gsuktFEwFJEABSzmj7/sNIx1nT1BmOmO2biGuAbhEmDqULkcziKY7ZtUdSBRJ PiMhjFbzjsvUzs+j6z1693qnaUSgPA+uKIr++SrXIsvFgcgbUzCd/z4iAcRJO/pJrVIw 58RkJJF4gY/NSqUpiVl89hzKCKEdJSTHs20PeKV0QEw5DLtsZMhWFXBBIqqsTqbv9gpv KiwFJZDg9imgSpBXCaC1Spra68nn2/O9m4OjkcArCDliwzbBogds1A9Hx0a1JHeioFYI xpE8a4YqdVHpuL4lsa9bmTX5J+xyWL187rtrr/3lqKhyoZPMAZQV1EBSaCxdMG789Zs2 StOA== X-Forwarded-Encrypted: i=1; AJvYcCVnrtua1LIgDrcfv1MveaYnhO00sjXn1kDw3vvPGYxsyZrqGB7QP+SvV+O85XpF6bCRF+zAHvpdwQ5PgQ==@vger.kernel.org, AJvYcCVusfFoFx5y00Fm+FSyviSFNpJD5YMGckSeDko8ePybJ7zbpNe/ph34yzYEoTDSqYs722R7jwWhlLHGmFTi@vger.kernel.org, AJvYcCWk4kmEZOP1lhps6UI1HZAZzJiy8qzgVL3aIZZ9lkBtuqVgtZgt6epz32onusTknf1AsiedK6lON5cl@vger.kernel.org X-Gm-Message-State: AOJu0Ywo3r6o9L26kK8Oif5dzXlKSA3OzTCDqCaT8MVeOVQAGscbIZDt wYyHK6ZbxMebXn8/AR+0X1qHzwjqKLSQAgFyGhLoEJXFVJrgEXdG07/EG9T0AA== X-Gm-Gg: ASbGnctlFY4yo1tWFg4/GCyfuYpj/qDtVGtiHvSX1O/CLgn999otEjd1ebq1JcxI1RL mcPCxY+x7c78a88CnPSeJGTXfMVfwlX2gbw7iUL1U1V2G9vtN2e8TPOiq0pZ0GPUEoWNdqGXYZx jNxHg2ZvO4ZsEHIbMeg4u73DpfpDftX5SWs4BuSn72BNcW74B91p3SuGMkTQmI2EpVkh4M7g0Lr 56KwdmVXYco0p/+xHWrB0G5S1EYVEL0UgWDOO8gg+2QPEH6UCgpufKUpG5yK9KnfTm+7f+Z3Yv/ rPAChA66RcgQj42YzWukIkMDp4uByRq7dgNLUQ== X-Google-Smtp-Source: AGHT+IHVuG0pXGAPSsFdx2JKLQ0D+CIypotEiHKZH0pY71D+4HxUhL2n78R2dpM6unFCJj33MS9OUQ== X-Received: by 2002:a17:902:f787:b0:22e:4a6c:fef2 with SMTP id d9443c01a7336-23414fd47d6mr117312385ad.53.1748209382961; Sun, 25 May 2025 14:43:02 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2340934d91asm35083115ad.166.2025.05.25.14.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 14:43:02 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , nbd@nbd.name, Johannes Berg , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Bogendoerfer , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), linux-mips@vger.kernel.org (open list:MIPS) Subject: [PATCHv4 3/5] dt-bindings: net: wireless: ath9k: add WIFI bindings Date: Sun, 25 May 2025 14:42:54 -0700 Message-ID: <20250525214256.8637-4-rosenp@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250525214256.8637-1-rosenp@gmail.com> References: <20250525214256.8637-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 These are for the wireless chips that come built in with various Atheros/QCA SoCs. dts wise, the difference between pcie and the wmac is AHB > PCIE > WIFI AHB > WIFI These will be used to replace the platform_device code with OF in the following patch. Signed-off-by: Rosen Penev Reviewed-by: Krzysztof Kozlowski --- .../bindings/net/wireless/qca,ath9k.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml b/Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml index 0e5412cff2bc..68d56e5b8680 100644 --- a/Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml +++ b/Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml @@ -12,7 +12,7 @@ maintainers: description: | This node provides properties for configuring the ath9k wireless device. The node is expected to be specified as a child node of the PCI controller - to which the wireless chip is connected. + or AHB bus to which the wireless chip is connected. allOf: - $ref: ieee80211.yaml# @@ -35,6 +35,12 @@ properties: - pci168c,0034 # AR9462 - pci168c,0036 # AR9565 - pci168c,0037 # AR1111 and AR9485 + - qcom,ar9130-wifi + - qcom,ar9330-wifi + - qcom,ar9340-wifi + - qcom,qca9530-wifi + - qcom,qca9550-wifi + - qcom,qca9560-wifi reg: maxItems: 1 @@ -88,3 +94,13 @@ examples: nvmem-cell-names = "mac-address", "calibration"; }; }; + - | + ahb { + #address-cells = <1>; + #size-cells = <1>; + wifi@180c0000 { + compatible = "qcom,ar9130-wifi"; + reg = <0x180c0000 0x230000>; + interrupts = <2>; + }; + }; From patchwork Sun May 25 21:42:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 892919 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E4A21D63C0; Sun, 25 May 2025 21:43:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748209386; cv=none; b=PUhs+gSjNap4aHK5PIab4Ek+Mr0Tojv5Hh0OyrP1ViWG/aJAA39mf9q/1zqJ+J5dN3ieqK/otfYFJDjW4xMT1dXXeYwEEdlTCqmS2oztZx8WjfWSgYBNqxkmwGHmqeDQfjntd6V/xij1BUcpKmIdxrWL5gUGXvnl8aPdAGxmT7s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748209386; c=relaxed/simple; bh=xXYJZa6djdzra6KuG486HyIlMt0+yAuf8QPiZ6/oVJE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wp8h0SZezojidH8jaOKAr60U1mtmclNiTROohWwVT167+q23MkpE8KWme9TxGL0J5QZr17vQ2I/+AK5QiWhL6aXNSacYMyT/m+BYuLeHAR+XmgXz6QZITVz5Na/bksDTGqLuC4ejgAsCY1aC7vVHAATXQrbtdi/+gsLPfyC6yLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=h4xQZxBy; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h4xQZxBy" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-234549aed3cso3397625ad.1; Sun, 25 May 2025 14:43:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748209384; x=1748814184; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BSLUPkGTtkO5bJKFjSRG2EsUIbkTzOUNIX1Qd+hd/9c=; b=h4xQZxByELTFxqzaAaFVT+dh+xBzXBdEK7ClHzUEgFWNrkDzVKgZsusedOSTvTXfWg f3lsAJDTTZncAFKCl29j8htEoc2PkWj9WNhG8ZyFRIVQn69f3yuHEQ+XTUgMMHPNDg3X 678jbQ+rPo1TiRBDJE9RbFaRs5IiRUuJqx2HGiENA0A4YAe3txyETsapnwq1rZC1VNlx xkJ7VGfRKoo2lVQysPTWi8PBgOqPhQ2ZEPD8ecYFKzfIvVHkBc5OFhtP4YathCUhJv+1 xGKjnasRSE92m0TWW466m0x3j6R+wSPnoHPZ1u8VPggTr3Fvo+uYviKsMEyHHL/8wa29 TTng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748209384; x=1748814184; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BSLUPkGTtkO5bJKFjSRG2EsUIbkTzOUNIX1Qd+hd/9c=; b=qbqCgXTtBYi3wgaRkKJf47MKyT3PydQiJN44CKBaWbsbZ85NxzSpMl4lnPmOcDH6+e rpB6LEs/Tt40WqCqZL+8FU8Feaw9B8kJpPfdTX+yZLvEI5GX0Z/LxYl2lkyNcab05jY+ f3Dl833DRy2rk4kC5L7CZCy8giT08rb5VsXGLwqJiUHXPRyCuA3ZzJPIMbFbw+f62EIT +tbA+jd8aHn45L603I4/TlilO9sm/fZQ3/gxffghw81sz16niYakObspUgnMv+hI1Tu6 8Os+fKztzKMc/ux1215WVBn//JCIobSQa6UHieoI3PMdE+bZfmdNfH80r/hGQLcph3YU 3T1g== X-Forwarded-Encrypted: i=1; AJvYcCV+Npc4iu+LktwLJ8pGMvld//pX9mTdf9/pFCQZ9FwTJt7yMv/XVeJpgD9h94m5+YCb2G80zeOuUWElRByM@vger.kernel.org, AJvYcCV6/5ABzxOXNyE9ZBdf3HG4PG8sLiXwxhVhDeGFSbs8GVzrKGsUQDcAlOSMP3AQ7tdRD6j06qyv8bg6qg==@vger.kernel.org, AJvYcCXgpqepDSuGsY6MzOo2hnxURYv4+IZRdYsUfG71UEcFzQnKA7WaxrAT3b8QuLabhRDFC1yxi3k1esw8@vger.kernel.org X-Gm-Message-State: AOJu0YxZXb5zBUBl0kIuThp+z3QWTkMVZnmTYHIwY3ZOTrV9DP0gATG7 U9gowWye/bkCy6NpodPe9NaLIuJgdz0kLyV2H/x3JNeGSfBdpay6kN8N60rZ3A== X-Gm-Gg: ASbGncsXo+gdiWGj3xvnQWm9VA+PJC8eZL3sODpU6Qjmu/oVRbyGhwFKCa2ES/iRPXR QtfOeFD5I3Eb0lmHwee1YJP9tAJsuTRgN+BeIbcpZEjl94MPEQ0sFbo2a3/27qa1OjxA82wYiPL KJXuhlLirejTsGPpXqq9bXWETpWOHzZds8XO1ojtg2+c5CiYbeDUO0xJiSLhfoRgDq7HMQU0BPw aM2qhSGD8JO1pqjta1EmCdcgaqYJDb1OUe0anHEjtURcn8nM6dw2cgiNRLmngMrnPVVs5BWjrla pmkDd3OLnXetCsADAwJyFYIYomk= X-Google-Smtp-Source: AGHT+IF9Q+GLeIaqs42Kqzx//dYC/Cv4WVB3aWHvrJmbmsewdxyM5nPAwmiT9yolYBNGS+Q0JaqV2g== X-Received: by 2002:a17:903:4b0c:b0:231:bc6f:7c69 with SMTP id d9443c01a7336-23414fbcf33mr116363645ad.35.1748209384379; Sun, 25 May 2025 14:43:04 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2340934d91asm35083115ad.166.2025.05.25.14.43.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 14:43:03 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , nbd@nbd.name, Johannes Berg , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Bogendoerfer , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), linux-mips@vger.kernel.org (open list:MIPS) Subject: [PATCHv4 4/5] wifi: ath9k: ahb: replace id_table with of Date: Sun, 25 May 2025 14:42:55 -0700 Message-ID: <20250525214256.8637-5-rosenp@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250525214256.8637-1-rosenp@gmail.com> References: <20250525214256.8637-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since 2b0996c7646 , all of this platform code became no-op with no OF replacement. Not only that, there are no users of AHB here. Add an OF match table that mostly mirrors the original platform device id table. Use a qca prefix as is done for the only other property: qca,no-eeprom. Also used qca prefix for ar9530 as the latter seems to be a mistake. This will be used to add ath9k support for the various ath79 devices here. Signed-off-by: Rosen Penev --- drivers/net/wireless/ath/ath9k/ahb.c | 47 ++++++++-------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index 1ffec827ed87..c5e36f9e7390 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c @@ -19,35 +19,18 @@ #include #include #include +#include #include #include "ath9k.h" -static const struct platform_device_id ath9k_platform_id_table[] = { - { - .name = "ath9k", - .driver_data = AR5416_AR9100_DEVID, - }, - { - .name = "ar933x_wmac", - .driver_data = AR9300_DEVID_AR9330, - }, - { - .name = "ar934x_wmac", - .driver_data = AR9300_DEVID_AR9340, - }, - { - .name = "qca955x_wmac", - .driver_data = AR9300_DEVID_QCA955X, - }, - { - .name = "qca953x_wmac", - .driver_data = AR9300_DEVID_AR953X, - }, - { - .name = "qca956x_wmac", - .driver_data = AR9300_DEVID_QCA956X, - }, +static const struct of_device_id ath9k_of_match_table[] = { + { .compatible = "qcom,ar9130-wifi", .data = (void *)AR5416_AR9100_DEVID }, + { .compatible = "qcom,ar9330-wifi", .data = (void *)AR9300_DEVID_AR9330 }, + { .compatible = "qcom,ar9340-wifi", .data = (void *)AR9300_DEVID_AR9340 }, + { .compatible = "qcom,qca9530-wifi", .data = (void *)AR9300_DEVID_AR953X }, + { .compatible = "qcom,qca9550-wifi", .data = (void *)AR9300_DEVID_QCA955X }, + { .compatible = "qcom,qca9560-wifi", .data = (void *)AR9300_DEVID_QCA956X }, {}, }; @@ -72,20 +55,15 @@ static const struct ath_bus_ops ath_ahb_bus_ops = { static int ath_ahb_probe(struct platform_device *pdev) { - const struct platform_device_id *id = platform_get_device_id(pdev); struct ieee80211_hw *hw; struct ath_softc *sc; struct ath_hw *ah; void __iomem *mem; char hw_name[64]; + u16 dev_id; int irq; int ret; - if (!dev_get_platdata(&pdev->dev)) { - dev_err(&pdev->dev, "no platform data specified\n"); - return -EINVAL; - } - mem = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(mem)) { dev_err(&pdev->dev, "ioremap failed\n"); @@ -118,7 +96,8 @@ static int ath_ahb_probe(struct platform_device *pdev) goto err_free_hw; } - ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops); + dev_id = (u16)(kernel_ulong_t)of_device_get_match_data(&pdev->dev); + ret = ath9k_init_device(dev_id, sc, &ath_ahb_bus_ops); if (ret) { dev_err(&pdev->dev, "failed to initialize device\n"); goto err_irq; @@ -156,11 +135,11 @@ static struct platform_driver ath_ahb_driver = { .remove = ath_ahb_remove, .driver = { .name = "ath9k", + .of_match_table = ath9k_of_match_table, }, - .id_table = ath9k_platform_id_table, }; -MODULE_DEVICE_TABLE(platform, ath9k_platform_id_table); +MODULE_DEVICE_TABLE(of, ath9k_of_match_table); int ath_ahb_init(void) { From patchwork Sun May 25 21:42:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 892563 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5F6E1DE88A; Sun, 25 May 2025 21:43:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748209388; cv=none; b=fjXThG53jS9OFHb5ArD3WO08fjHFJCWeJzPQ8DFUTN0bQ87wAlRM8ooNi7MZ4Niyye8SZnFgaKBkXGVk+wnzqNObCQB3hv7K+jR6Vs5rJm7IUjEVGQzKkSXsOaN9dZpfSf1fyqkQTMbQ8OsjurLIsQtd1I0Ygv2oorzfbrks5tk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748209388; c=relaxed/simple; bh=cdjfEk0TxVg9oDhf1oyxHAvAaDRa1kSzXZ9FYjisPRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kbXV5cB9GAE9FVD53E7PrQx4mR7w5PXST1ftMX5Z7ukcW0fpukPdWYvRMcaGHP4inBthky7jjqxQIUm7Zd+vLXQ/W0B3cFEWsgzd9aPh3PN5J2dIoPIZ9Of4lryUDZRIIZxQ8V5xOM03AUJpPVYF8/3wFDpagxzkohpAscpxM88= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kJ18sf8w; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kJ18sf8w" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-22e09f57ed4so20109885ad.0; Sun, 25 May 2025 14:43:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748209386; x=1748814186; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yGHFb7gUP10OAfy6owXqCDHPUOcpBBdWnzOXMHQ1MBU=; b=kJ18sf8wXsGsGamLvvqggDxZQ0RJvO5fGsEN5gU3e7MyiRZTtSOTM1nwZhjV18jfXb +lYhA/edJfSs+KubPkOgedWieu/B60CiXo9O8Y+aYJHti6yx3RiQTMXZ4xQ4AWnN7iKK ehzPv1QgTW0FkreBQ6mY2WbeWPiOoS0S4qF0IC8S4rf34u0gq4oqUjmEGMJHsywh79AV OD92wN20R0YKV8paEILvNBgRxOZKzIoplBFMqG4pmQJ+a3FlIs9UC/pP64LaHUwiINOO 1hi07nooSRwgkHqR9RNwJ9hkH/bqQ+KQuRQpFwXRAptvOaH7eLBP5JCkORomfxbJ2IMq 1W6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748209386; x=1748814186; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yGHFb7gUP10OAfy6owXqCDHPUOcpBBdWnzOXMHQ1MBU=; b=lZ8FJLKIn0AF6fQv45c4EhfO9xvn/U+phVEbmEm9gE6l6CL0Gl7v3x06dQhth5qD0E vduuCVd7GI9xSnk3nqBfYghRUuHRwHdSxVx06GbiE61voeI9puFyDFCknyIv0CnucvRN 68eHH3yw9e3zLCfg8rtPqfbjj1ZUgAI11/5Kk+B8cfQKIHGU1UO62a5pw/yboQzxD8Cr yfjdrVPTb/UD5UKOgfv19ARMcp9PFPEFxqINIlXiTv2wcXmlfTfxhbVVkw2QEoc0Q5bU gpZN4+hZ+ZHCuqakQvcloipIAFXFoxrb1yfRr+dDEtf1IPinExLAoKzeoLQ/4xXdoLwO nz5g== X-Forwarded-Encrypted: i=1; AJvYcCVQEnTtyB7faSUfxsyZHmklT2AETRLXqIZcg7iYCLp4a2BLmuVL73NY9gNNBP2IXhoESHTNxBl+ytrDWA==@vger.kernel.org, AJvYcCWC8jaEo7Pqg9ZZHwP3vaSHxM/AdT12jhNFcjFVpdKaf66oFykU8s3KGkAtTxKY+iZPZihpuLMd3B/34QqP@vger.kernel.org, AJvYcCWZwYZy28qLwXVeFJJqv3sXbJb9AB0EqP4XaJ0rfRTlfeDaNrcYZICsJN+kWR2shMGzhe5dwieQkQtW@vger.kernel.org X-Gm-Message-State: AOJu0YzcMgf1r6xTLnkBc4rWbWht1BPfS/BXyC9MG2FmuMnebHfCLOgA XPgTbolnO+M0CTVCPmX91XAHgMFmaGgNrX5+LmsTgKy7mu9UjS+ieoFD/czbUw== X-Gm-Gg: ASbGncuinSyRDiGDvkv5KxQBAFsIBKGv1sP7wPXj0Rko7V/FHWMXRNPLmXylTeflqvp mvSuPiBTE4x333O+wOk08B/cCbXc45lIPAf4/H+XZ8JldMrt0QPbF/e8HY3VMpqf4OfUKoZRHwl jyj8/hkJMm2Hwu9hPcxJn3fyBeHTnKAgf9cUq+pxkzxDypMnQ4a1E8oJPAaPM6S8dOOc5bwV6OR hzpt8Ioi+mCw2H+T0L89vR5ALy+tgm52bIe3zBpHg9P+H2isJg//A6vgDi97lHi1QAiwJKZX77I +SjabqS92AUVX0yhsYUka/TE6MA= X-Google-Smtp-Source: AGHT+IGG2n4FFxLaod1P2AsWQRwFGmEd2pPt57Kkzhx7ICSNdABPH0DrtVIa7Anz+1Ewj7mFcWANEw== X-Received: by 2002:a17:903:46ce:b0:233:fd7b:5e0d with SMTP id d9443c01a7336-23414c75f29mr112147665ad.5.1748209385892; Sun, 25 May 2025 14:43:05 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2340934d91asm35083115ad.166.2025.05.25.14.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 14:43:05 -0700 (PDT) From: Rosen Penev To: linux-wireless@vger.kernel.org Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , nbd@nbd.name, Johannes Berg , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Bogendoerfer , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), linux-mips@vger.kernel.org (open list:MIPS) Subject: [PATCHv4 5/5] mips: dts: qca: add wmac support Date: Sun, 25 May 2025 14:42:56 -0700 Message-ID: <20250525214256.8637-6-rosenp@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250525214256.8637-1-rosenp@gmail.com> References: <20250525214256.8637-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Now that OF ahb support was added to the ath9k driver, we can use it to enable and use the SoC wireless found in these chipsets. Signed-off-by: Rosen Penev Reviewed-by: Krzysztof Kozlowski --- arch/mips/boot/dts/qca/ar9132.dtsi | 9 +++++++++ arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331.dtsi | 9 +++++++++ arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331_omega.dts | 4 ++++ .../mips/boot/dts/qca/ar9331_openembed_som9331_board.dts | 4 ++++ arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 4 ++++ 8 files changed, 42 insertions(+) diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi index aa148d51ab68..47bddd36cd94 100644 --- a/arch/mips/boot/dts/qca/ar9132.dtsi +++ b/arch/mips/boot/dts/qca/ar9132.dtsi @@ -155,6 +155,15 @@ spi: spi@1f000000 { #address-cells = <1>; #size-cells = <0>; }; + + wifi: wifi@180c0000 { + compatible = "qcom,ar9130-wifi"; + reg = <0x180c0000 0x230000>; + + interrupts = <2>; + + status = "disabled"; + }; }; usb_phy: usb-phy { diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts index f894fe17816b..a7901bb040ce 100644 --- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts +++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts @@ -108,3 +108,7 @@ partition@2 { }; }; }; + +&wifi { + status = "okay"; +}; diff --git a/arch/mips/boot/dts/qca/ar9331.dtsi b/arch/mips/boot/dts/qca/ar9331.dtsi index 768ac0f869b1..9a2590f490bb 100644 --- a/arch/mips/boot/dts/qca/ar9331.dtsi +++ b/arch/mips/boot/dts/qca/ar9331.dtsi @@ -285,6 +285,15 @@ spi: spi@1f000000 { status = "disabled"; }; + + wifi: wifi@18100000 { + compatible = "qcom,ar9330-wifi"; + reg = <0x18100000 0x20000>; + + interrupts = <2>; + + status = "disabled"; + }; }; usb_phy: usb-phy { diff --git a/arch/mips/boot/dts/qca/ar9331_dpt_module.dts b/arch/mips/boot/dts/qca/ar9331_dpt_module.dts index c857cd22f7db..08e728b8ced8 100644 --- a/arch/mips/boot/dts/qca/ar9331_dpt_module.dts +++ b/arch/mips/boot/dts/qca/ar9331_dpt_module.dts @@ -97,3 +97,7 @@ &phy_port0 { &phy_port4 { status = "okay"; }; + +&wifi { + status = "okay"; +}; diff --git a/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts b/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts index 7affa58d4fa6..37a74aabe4b4 100644 --- a/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts +++ b/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts @@ -98,3 +98,7 @@ spiflash: w25q128@0 { reg = <0>; }; }; + +&wifi { + status = "okay"; +}; diff --git a/arch/mips/boot/dts/qca/ar9331_omega.dts b/arch/mips/boot/dts/qca/ar9331_omega.dts index 8904aa917a6e..1450419024cb 100644 --- a/arch/mips/boot/dts/qca/ar9331_omega.dts +++ b/arch/mips/boot/dts/qca/ar9331_omega.dts @@ -74,3 +74,7 @@ spiflash: w25q128@0 { reg = <0>; }; }; + +&wifi { + status = "okay"; +}; diff --git a/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts b/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts index dc65ebd60bbc..5786a827c000 100644 --- a/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts +++ b/arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts @@ -106,3 +106,7 @@ &phy_port2 { &phy_port4 { status = "okay"; }; + +&wifi { + status = "okay"; +}; diff --git a/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts b/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts index 10b9759228b7..a7108c803eb3 100644 --- a/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts +++ b/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts @@ -114,3 +114,7 @@ spiflash: s25sl032p@0 { reg = <0>; }; }; + +&wifi { + status = "okay"; +};