From patchwork Mon Jul 18 20:05:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Kaloz X-Patchwork-Id: 987602 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6IK5VGr001798 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 18 Jul 2011 20:05:52 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qiu4B-0000xC-Ha; Mon, 18 Jul 2011 20:05:23 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qiu4B-0000nZ-5x; Mon, 18 Jul 2011 20:05:23 +0000 Received: from fep20.mx.upcmail.net ([62.179.121.40]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qiu47-0000nI-P7 for linux-arm-kernel@lists.infradead.org; Mon, 18 Jul 2011 20:05:21 +0000 Received: from edge03.upcmail.net ([192.168.13.238]) by viefep20-int.chello.at (InterMail vM.8.01.02.02 201-2260-120-106-20100312) with ESMTP id <20110718200514.IMIG1387.viefep20-int.chello.at@edge03.upcmail.net>; Mon, 18 Jul 2011 22:05:14 +0200 Received: from ecaz.lan ([80.98.113.80]) by edge03.upcmail.net with edge id 9Y5D1h0031k8B6w03Y5Exb; Mon, 18 Jul 2011 22:05:14 +0200 X-SourceIP: 80.98.113.80 From: Imre Kaloz To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] orion5x: fixup 5181 MPP mask check Date: Mon, 18 Jul 2011 22:05:12 +0200 Message-Id: <1311019512-26799-1-git-send-email-kaloz@openwrt.org> X-Mailer: git-send-email 1.7.1 X-Cloudmark-Analysis: v=1.1 cv=kR4HTYXl3FXdRAFjS5RpcnDbDNViz/VYMWXR75RtSM0= c=1 sm=0 a=T2JN7J5E1C8A:10 a=-dChlVsmAwQA:10 a=jdP34snFAAAA:8 a=qQeJAaRb4C9H3Q8gb4EA:9 a=9mtjllxcxZAA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110718_160520_175755_309A5E0A X-CRM114-Status: UNSURE ( 9.77 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [62.179.121.40 listed in list.dnswl.org] Cc: nico@fluxnic.net X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 18 Jul 2011 20:05:52 +0000 (UTC) During the refactoring of the Orion MPP code, the detection for the 5181l as been used to select the 5181 MPP mask, which is wrong. Select the 5181 mask for all 5181 variants. Signed-off-by: Imre Kaloz --- arch/arm/mach-orion5x/mpp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c index f12c41b..b6ddd7a 100644 --- a/arch/arm/mach-orion5x/mpp.c +++ b/arch/arm/mach-orion5x/mpp.c @@ -24,7 +24,7 @@ static unsigned int __init orion5x_variant(void) orion5x_pcie_id(&dev, &rev); - if (dev == MV88F5181_DEV_ID && rev >= MV88F5181L_REV_A0) + if (dev == MV88F5181_DEV_ID) return MPP_F5181_MASK; if (dev == MV88F5182_DEV_ID)