From patchwork Mon Mar 4 05:04:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 224585 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8FC722C0303 for ; Mon, 4 Mar 2013 16:06:47 +1100 (EST) Received: from localhost ([::1]:57324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCNbp-0002ch-Mw for incoming@patchwork.ozlabs.org; Mon, 04 Mar 2013 00:06:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCNbP-0002U3-Td for qemu-devel@nongnu.org; Mon, 04 Mar 2013 00:06:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCNbK-0008Vi-VD for qemu-devel@nongnu.org; Mon, 04 Mar 2013 00:06:19 -0500 Received: from mail-da0-f43.google.com ([209.85.210.43]:57307) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCNbK-0008VW-P9 for qemu-devel@nongnu.org; Mon, 04 Mar 2013 00:06:14 -0500 Received: by mail-da0-f43.google.com with SMTP id u36so2352499dak.2 for ; Sun, 03 Mar 2013 21:06:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references:x-gm-message-state; bh=jINAKK8szVRFnE+V2DeFVakwYbCozy8lSZ9ZAXVxycQ=; b=kk064Wr+tuwp9OOZ8Z+eW7MPItsxcVPDg+yW0hpZQnUJoh7bza9Fq9+Zl+zSz5bywW w+qqINN0GTGSeEyjKhLmIi8WaGaCCAqvqGff5XlJdGMwfP2DkofXpO6hbtMYYNWBHJuJ oKnsFH4I7RM1O+5QJuu8ZPltVgjF161VSzcAzCFHFMUIkFaBFNrRph3iSLWZkUtYyZL5 FPRIW4HUukcjBeP1O77fdIxzku9BV0d/R+FNAZbf2Hu/tqcHLs4EilTsgUCUvo5lX7Z2 BB1w/QpcpgaE8EqlQj/Q6UtZFfI7Ls2+27cIWYrEjnpcZLJeNT7T4vZsqVUJxnAo+Mo7 y+HQ== X-Received: by 10.66.163.131 with SMTP id yi3mr30175596pab.128.1362373574145; Sun, 03 Mar 2013 21:06:14 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPS id hp7sm20955979pbc.8.2013.03.03.21.06.11 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Sun, 03 Mar 2013 21:06:13 -0800 (PST) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2013 15:04:52 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQnP44US0GwI02OaBDZzKoI5XTGl4QIQba2HI9AbF9sQmKCUpXobRSljrfls/nvCkOXBEBfG X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.43 Cc: edgar.iglesias@gmail.com, Peter Crosthwaite , Nathan Rossi , peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH v2 2/5] xilinx_spips: Fix bus setup conditional check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Nathan Rossi The R_LQPSI_CFG register has the LQSPI_CFG_SEP_BUS and LQSPI_CFG_TWO_MEM bits. Signed-off-by: Nathan Rossi Signed-off-by: Peter Crosthwaite --- hw/xilinx_spips.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xilinx_spips.c b/hw/xilinx_spips.c index 3eee828..03797c3 100644 --- a/hw/xilinx_spips.c +++ b/hw/xilinx_spips.c @@ -143,8 +143,8 @@ typedef struct { static inline int num_effective_busses(XilinxSPIPS *s) { - return (s->regs[R_LQSPI_STS] & LQSPI_CFG_SEP_BUS && - s->regs[R_LQSPI_STS] & LQSPI_CFG_TWO_MEM) ? s->num_busses : 1; + return (s->regs[R_LQSPI_CFG] & LQSPI_CFG_SEP_BUS && + s->regs[R_LQSPI_CFG] & LQSPI_CFG_TWO_MEM) ? s->num_busses : 1; } static void xilinx_spips_update_cs_lines(XilinxSPIPS *s)