From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGYBT-00006c-Gy for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:12:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGYBE-0000TV-TJ for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:12:47 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:32917 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGYBE-0000Q8-Lf for qemu-devel@nongnu.org; Fri, 15 Mar 2013 13:12:32 -0400 From: Peter Maydell Date: Fri, 15 Mar 2013 16:56:37 +0000 Message-Id: <1363366599-24238-16-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1363366599-24238-1-git-send-email-peter.maydell@linaro.org> References: <1363366599-24238-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 15/17] xilinx_spips: Fix bus setup conditional check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , Blue Swirl Cc: qemu-devel@nongnu.org, Paul Brook 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 Message-id: d76c8e364c80a42352ae4f0661aff2cd17ad32a4.1362373359.git.peter.crosthwaite@xilinx.com Signed-off-by: Peter Maydell --- hw/xilinx_spips.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xilinx_spips.c b/hw/xilinx_spips.c index 853f4e0..efa1449 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) -- 1.7.9.5