From patchwork Wed Dec 23 17:25:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 560670 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E2603140BF4 for ; Thu, 24 Dec 2015 04:26:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b=LNQtBXpc; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6FAC52805AA; Wed, 23 Dec 2015 18:25:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id AAB3B280342 for ; Wed, 23 Dec 2015 18:25:36 +0100 (CET) X-policyd-weight: using cached result; rate: -5.5 Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 23 Dec 2015 18:25:36 +0100 (CET) Received: by mail-wm0-f46.google.com with SMTP id l126so158301550wml.1 for ; Wed, 23 Dec 2015 09:25:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=IM54G/FfOr5wJeZIDzEQNbCmvwPuOd5gkQsgaaj37qw=; b=LNQtBXpcYhS3MVbshSRERa/RumEIEcQpOM2O9dzpZ0JxUNKRP+wnE16fslnwFywJCW KVhTf5GIC63z8IxfeWkSQFX8UNccW0tN5m+pkRUXqi5kBF/43umYvdGtS077o5aDntNs I+pffG4wWZFjO6HmcdjkBOkoOBAPxdv4XSGsDOsfZg1GYnz2mPhEtkcRQM4/bnuuXCXZ niSJmEWr0oQ8DYzanOSGsJVkqlHX2JFhmuxWANbBJK0IIIq05jxGkY4GVZve5TxxQAFm eo99PnrnZXW2nGIymcl+8pbM/LFv6CM7iu9L+iiYtBu0fQ2dCLua4mpgpvoKtCjq261x YH6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=IM54G/FfOr5wJeZIDzEQNbCmvwPuOd5gkQsgaaj37qw=; b=hN7Wa8tP0koody2f4XlJhcLArU94l0JJDAUc85ViBho43rGGxcExTTopW2fQ01dOvd KhA3k6V7SccafRFR7xep9H7omijO5g+ZP2cusqh/5IY7JGWg+7+YMkGs/MhzXFtTzgkg 6tKXYjhTBeLz5vG1TyLkLlNhtqO6BjT6qjsdjNrahHxvyMpn3IafG4gq8QCG+UVuzXd+ 14CzuAMiUKSBO4X/hTOUiZICmBZ3481Orm6nrRq+CK7PQz/cQcUeUj4QR10H85EDVv2s GM/JmE3LTM18d1Q9v6Dzov2jNFcuA7rZWlY490gTQ+8zy75/UzYb59ybbwBPWO8+PPcF wiIg== X-Gm-Message-State: ALoCoQlmlt9jSUulb8Vt828vOyKXa9WqC5lx5BPXbXAVi3+EBxio7W/zhZ8AEecSW3A4BfECFFMiZcfelLN/BXtUtmcHfBDj9g== X-Received: by 10.28.50.193 with SMTP id y184mr36638781wmy.26.1450891556028; Wed, 23 Dec 2015 09:25:56 -0800 (PST) Received: from desktop.wvd.kresin.me (p54AF4BC9.dip0.t-ipconnect.de. [84.175.75.201]) by smtp.gmail.com with ESMTPSA id h5sm38260495wjz.21.2015.12.23.09.25.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Dec 2015 09:25:55 -0800 (PST) From: Mathias Kresin To: openwrt-devel@lists.openwrt.org Date: Wed, 23 Dec 2015 18:25:51 +0100 Message-Id: <1450891551-16573-1-git-send-email-openwrt@kresin.me> X-Mailer: git-send-email 1.9.1 Subject: [OpenWrt-Devel] [PATCH] lantiq: fix PCI_DEVICE_ID_LANTIQ_PCIE X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" It's not necessary to define PCI_* if pci_ids.h is included a few lines above. The change to pci_ids.h doesn't look intentional to me, especially since the former value is added to the top of ifxmips_fixup_pcie.c. Both changes were introduced with the kernel 4.1 support patches and were not present in the 3.18 patches. Signed-off-by: Mathias Kresin --- .../patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch index e65e982..1b78acd 100644 --- a/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch @@ -89,7 +89,7 @@ Signed-off-by: John Crispin obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o --- /dev/null +++ b/arch/mips/pci/fixup-lantiq-pcie.c -@@ -0,0 +1,82 @@ +@@ -0,0 +1,74 @@ +/****************************************************************************** +** +** FILE NAME : ifxmips_fixup_pcie.c @@ -124,14 +124,6 @@ Signed-off-by: John Crispin + +#include "pcie-lantiq.h" + -+#define PCI_VENDOR_ID_INFINEON 0x15D1 -+#define PCI_DEVICE_ID_INFINEON_DANUBE 0x000F -+#define PCI_DEVICE_ID_INFINEON_PCIE 0x0011 -+#define PCI_VENDOR_ID_LANTIQ 0x1BEF -+#define PCI_DEVICE_ID_LANTIQ_PCIE 0x0011 -+ -+ -+ +static void +ifx_pcie_fixup_resource(struct pci_dev *dev) +{ @@ -5533,7 +5525,7 @@ Signed-off-by: John Crispin +#define PCI_DEVICE_ID_INFINEON_DANUBE 0x000F +#define PCI_DEVICE_ID_INFINEON_PCIE 0x0011 +#define PCI_VENDOR_ID_LANTIQ 0x1BEF -+#define PCI_DEVICE_ID_LANTIQ_PCIE 0x00 ++#define PCI_DEVICE_ID_LANTIQ_PCIE 0x0011 + #define PCI_VENDOR_ID_WINBOND 0x10ad #define PCI_DEVICE_ID_WINBOND_82C105 0x0105