From patchwork Sat Jul 23 12:20:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 651956 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rxRXR65Fhz9t1V for ; Sat, 23 Jul 2016 22:24:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b=RzxkZ8ub; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bQvvu-0005E4-El; Sat, 23 Jul 2016 12:21:30 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bQvvs-0005Cn-2I for lede-dev@lists.infradead.org; Sat, 23 Jul 2016 12:21:28 +0000 Received: by mail-wm0-x242.google.com with SMTP id o80so9581180wme.0 for ; Sat, 23 Jul 2016 05:21:06 -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 :in-reply-to:references; bh=utIx/frA8B4qRLMcgsaj7rrkdTIdKrNmpHbUIDNtGwQ=; b=RzxkZ8ubWTyOTLrAkB14fLamLwQxKBUUOvwlpFoHInkJPSpPWWvfbSBRWxKFS/+lz8 bqffLLUZo3XrhfEG8wbAEdpKAXllkjj9+/AfI37DYp/744FaNlcdUAhfjxGejD4b0RO4 vfYciTmq4nzubaR5OeBmdlCCX6JieQDOj/8H0P0rua9AM8qKSnxWWJ2vmfEb6WJbtva7 QhWB20TAfcupX0lliSKNR4Hxv90rwS9iP2uErZuFSgmzO03JqQnBLxRlNLAgsRi+G2jc UpyXH6Xo5eYbYuv6ngSWYkA8xq5WrSYbMCpVaPtdqIo9GUseWZpiQo6rIiwcRn3ZGiWw pGqA== 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:in-reply-to:references; bh=utIx/frA8B4qRLMcgsaj7rrkdTIdKrNmpHbUIDNtGwQ=; b=Ku42F5RuZ+JR4xz9Rrl5NNzKaCXiriTPbgq7n06pyUvORhEKKegDkRu4Yrsca3/iR2 WJ2edOeW7uq916b3Wl6U2w78JNlQ/zk6CMFhI+VwFO6M24NRRrip+nyB+YT/0fA4tTWF diWKW/hNKZ+JmaEJYAN0Tw7oezL/xxIyjSpzxQZqIWKluXZGs28gWCi0RdVvExy2E6+/ J2ZJusfBp7Condow/5DRf9SW4a2xfuZOuyFguyPtjf4hy8uAPPA7RyxaptU4PnaY6OYa Mh7WZCe9g2M3vaiAZF+7DcaOnqtXyFdxEKH0CY0LX5Fzk93ORt/hcXBB/8UNlVXzEanG twPg== X-Gm-Message-State: AEkoouvQ2YEyyNFi3aXPOowLRJPVtJ4Tj+XPKKIArhcbm8yAMe1bWdwAf0jgKKsaj7laQg== X-Received: by 10.194.6.229 with SMTP id e5mr5838226wja.85.1469276465540; Sat, 23 Jul 2016 05:21:05 -0700 (PDT) Received: from debian64.daheim ([217.248.142.54]) by smtp.gmail.com with ESMTPSA id iw1sm5649000wjb.20.2016.07.23.05.21.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Jul 2016 05:21:04 -0700 (PDT) From: Christian Lamparter X-Google-Original-From: Christian Lamparter Received: from chuck by debian64.daheim with local (Exim 4.87) (envelope-from ) id 1bQvvO-00033r-0x; Sat, 23 Jul 2016 14:20:58 +0200 To: lede-dev@lists.infradead.org Date: Sat, 23 Jul 2016 14:20:53 +0200 Message-Id: X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160723_052128_302440_1966481F X-CRM114-Status: GOOD ( 11.01 ) X-Spam-Score: -1.7 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]googlemail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 1.0 FREEMAIL_REPLY From and body contain different freemails Subject: [LEDE-DEV] [PATCH 2/2] apm821xx: fix atheros PCIe cards on the MR24 X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chrisrblake93@gmail.com, Christian Lamparter MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The consolidation of the MR24 and WNDR4700 subtargets into the nand subtarget broke MR24's atheros wlan. This was because the wndr4700's board code used a pci_fixup routines to supply the ath9k module with the calibration data. This is not necessary on the MR24 as it has standard mini-pcie ports. Hence the two AR9380 mini-pcie cards do not need any calibration data overrides. Cc: chrisrblake93@gmail.com Signed-off-by: Christian Lamparter --- .../files/arch/powerpc/platforms/44x/wndr4700.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/target/linux/apm821xx/files/arch/powerpc/platforms/44x/wndr4700.c b/target/linux/apm821xx/files/arch/powerpc/platforms/44x/wndr4700.c index 975ac46..f50f43f 100644 --- a/target/linux/apm821xx/files/arch/powerpc/platforms/44x/wndr4700.c +++ b/target/linux/apm821xx/files/arch/powerpc/platforms/44x/wndr4700.c @@ -82,15 +82,18 @@ static struct ath9k_platform_data ar9580_wmac1_data = { .eeprom_name = "pci_wmac0.eeprom", }; -static void load_eeprom_ar9380(struct pci_dev *dev) +static int __init wndr4700_ath9k_eeprom_load(void) { - dev->dev.platform_data = &ar9380_wmac0_data; -} + struct pci_dev *dev; -static void load_eeprom_ar9580(struct pci_dev *dev) -{ - dev->dev.platform_data = &ar9580_wmac1_data; -} + dev = pci_get_device(PCI_VENDOR_ID_ATHEROS, 0x0030, NULL); + if (dev) + dev->dev.platform_data = &ar9380_wmac0_data; -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, 0x0030, load_eeprom_ar9380); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, 0x0033, load_eeprom_ar9580); + dev = pci_get_device(PCI_VENDOR_ID_ATHEROS, 0x0033, NULL); + if (dev) + dev->dev.platform_data = &ar9580_wmac1_data; + + return 0; +} +machine_device_initcall(wndr4700, wndr4700_ath9k_eeprom_load);