From patchwork Fri Jul 21 10:55:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 108466 Delivered-To: patches@linaro.org Received: by 10.182.45.195 with SMTP id p3csp485348obm; Fri, 21 Jul 2017 03:55:11 -0700 (PDT) X-Received: by 10.28.10.208 with SMTP id 199mr4244667wmk.127.1500634511270; Fri, 21 Jul 2017 03:55:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500634511; cv=none; d=google.com; s=arc-20160816; b=gDUbJczopHr6/m6WMPYXOqae/ZWDlGlgSs3HjxRC0akMt9zx6edmRWw2i28H80BMV5 mRBipmaEpA3A/FzOTbSeJ+FrsFv3uk5uQGqiaRRxC997mgfLIZbN1yhTtsVyOzaeyCAG oLRV6p5qpBARkQADl3VucovwxA6VkODPFezTZCxT4BeMtHO9KoqgqNV/bI9I2UqPWH6J 3SRusMHrjkFp8yuY0KXnE9FiJNARAs0YtlB22oKHEFsF+C+aQTb20Ho9utxr1D69EMs2 OLbzjc+Rr+fFASo729MS4U+RyYJvEIEMCEjO8z+G92kdS50H7PIyiqqdtqkDLHle1WuX dwzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=YJplEbi6mMYQ+erUOFBQDFfV+3eaANyMnn5co7WyjU4=; b=aP1bEKmCua/dVj3VgAS775zQJIZ7vrfGQUeloLA46SPZvZZplFwF36H2CwVdL9/AVQ pXey3smggdcEQeKVKLaYPdqlE6lIdwFCOVs1YhcrkaUpf1uAfrPmvmuyyvhrM3qsv9PR 5ZHhk+hpsaFVfAApKuh+M+XtFe+Q87fScyOlqGJXTyWZIDGd5RzRgL3+tfc/Uym6D9dY 8jGq4CyBhhLM5x57vKC3QBWqimF5iUzK3lcOP/rEh8vBRAK+J+xJPyYeqxaruCtYvI2q k/vUo3mj1r9zXBaFYbL9JEqS7QDU/XJk/A6VWnOv4vPp+d++7B8NYX8Wl5JY4TqEIpjb 13MQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id d27si7916004wrb.272.2017.07.21.03.55.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Jul 2017 03:55:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dYVaQ-0000Jb-EQ; Fri, 21 Jul 2017 11:55:10 +0100 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH for-2.10] mps2: Correctly set parent bus for SCC device Date: Fri, 21 Jul 2017 11:55:09 +0100 Message-Id: <1500634509-28011-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 A cut-and-paste error meant that instead of setting the qdev parent bus for the SCC device we were setting it twice for the ARMv7M container device. Fix this bug. Signed-off-by: Peter Maydell --- hw/arm/mps2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index f727b43..abb0ab6 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -303,7 +303,7 @@ static void mps2_common_init(MachineState *machine) object_initialize(&mms->scc, sizeof(mms->scc), TYPE_MPS2_SCC); sccdev = DEVICE(&mms->scc); - qdev_set_parent_bus(armv7m, sysbus_get_default()); + qdev_set_parent_bus(sccdev, sysbus_get_default()); qdev_prop_set_uint32(sccdev, "scc-cfg4", 0x2); qdev_prop_set_uint32(sccdev, "scc-aid", 0x02000008); qdev_prop_set_uint32(sccdev, "scc-id", mmc->scc_id);