From patchwork Mon Jul 31 12:22:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 109011 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp3584363obm; Mon, 31 Jul 2017 05:23:23 -0700 (PDT) X-Received: by 10.55.55.7 with SMTP id e7mr20238055qka.294.1501503803088; Mon, 31 Jul 2017 05:23:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501503803; cv=none; d=google.com; s=arc-20160816; b=DIlY1GulQDDuyiQQzJohkhyA/Fx4wM0sdDPQAxT92gQhKHpU8hoiJgjRWTkfihQXcx SwXf3EgHlysd4lqD7u5IqFd7MFvH3oStvEj9wCK7VuhzsBE9OEqV3Q7rmt5hOPchM8vK 1tYCS2rXF8DVtZEMMzX6TL/qFJ3id+5lh3soITDD2pcJMWFD/NtX7PEqkRakFLcPU5Qf unGwkIxWXTorrXpFkB74+6YoVuo5Ci3ANlqkTvXqGqOM0wHlwQejui5btaz/1QET8Kfp 048boIYs5vTCZtrvYtIMgaLkI4VJzhewwSzR/tU96Ynyk3mGBevli8d0RO9Uk1mlZT8f X+Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=swBR9ElAWfuGhnlahczzN+xFMM4lodjiweKY4FYYGUo=; b=udV8KzVVt10FW4JWUjq3EdjnQmQjMVi+hUK6xegeWnxKtJJti7boHpSxg2umUVL5LC SPFV++tKIm5umGnTV9XuGmbH4vICcry2mU51UdomV8Ma+A9GDS1j2TfEY9lD9kRfO3xv CNgtP8BseIaMeKWCqStbXWIzMDVAXCPpKgF5rC/eov1cnOGNK8r1p1VzTlo95VKVuYKq XqFd2YkCZU/oqa+GhZxHD2ElE6vLvcA86iS4JDjClL5IwgQrAC3gSF0yLrbdaTK3rFxs 7lIDHfd1LzziQYqw1XaZxledUUfYuU7j9DXQ5DfvOxUsGLmbnGMUvf7xPuBpS4yRdjvt jezA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f92si12586665qtd.528.2017.07.31.05.23.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 31 Jul 2017 05:23:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dc9jE-0001eS-FK for patch@linaro.org; Mon, 31 Jul 2017 08:23:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dc9iq-0001cn-Rc for qemu-devel@nongnu.org; Mon, 31 Jul 2017 08:22:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dc9iq-0003gr-3t for qemu-devel@nongnu.org; Mon, 31 Jul 2017 08:22:56 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37752) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dc9ip-0003ax-TB for qemu-devel@nongnu.org; Mon, 31 Jul 2017 08:22:56 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dc9ij-0000uM-9b for qemu-devel@nongnu.org; Mon, 31 Jul 2017 13:22:49 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 31 Jul 2017 13:22:45 +0100 Message-Id: <1501503765-15639-8-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1501503765-15639-1-git-send-email-peter.maydell@linaro.org> References: <1501503765-15639-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 7/7] hw/mps2_scc: fix incorrect properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Message-id: 20170729234930.725-1-f4bug@amsat.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/misc/mps2-scc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index cc58d26..32be2a9 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -270,9 +270,9 @@ static Property mps2_scc_properties[] = { /* Values for various read-only ID registers (which are specific * to the board model or FPGA image) */ - DEFINE_PROP_UINT32("scc-cfg4", MPS2SCC, aid, 0), + DEFINE_PROP_UINT32("scc-cfg4", MPS2SCC, cfg4, 0), DEFINE_PROP_UINT32("scc-aid", MPS2SCC, aid, 0), - DEFINE_PROP_UINT32("scc-id", MPS2SCC, aid, 0), + DEFINE_PROP_UINT32("scc-id", MPS2SCC, id, 0), /* These are the initial settings for the source clocks on the board. * In hardware they can be configured via a config file read by the * motherboard configuration controller to suit the FPGA image.