From patchwork Mon Jun 15 17:24:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 49913 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8DEDC211FD for ; Mon, 15 Jun 2015 17:38:10 +0000 (UTC) Received: by wgv5 with SMTP id 5sf26625744wgv.0 for ; Mon, 15 Jun 2015 10:38:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=6TlymGHjTZ5+JQI4JTJ1TA2IKdYjWF9GTOzG1iPr+mg=; b=cPOwtbMYiBGiJ7DqvWQYnE2bo19qZTbp/zl61eg73Q9V7N1gQboHdpzXeSDYLT+lYO C5AtAznNs6taAHF+ghkRACPE+OMX4HHi+tXnOnHKvIr8oF2UOIZgETbFSOlNzKrjY4gn bYLiOYhGscDSFKmb7p3F3S69hGsS9BRReCxnPdWH06cAKRDBJjeR82zLGHeJfD5f4OX8 sIrHGVwj/m0Ou0+zlXqqzqiiQ61g3NKavYLQ3jL75ZegaM/FnQr0z9kIHXH5qyaBhyC8 9yji9GWXpAfzrwpmnVPuwfMZW6NPfwKVIBJN3iCw+u6CSwqcOdi15oOkgLxcibu6aA61 /rYw== X-Gm-Message-State: ALoCoQkbDpNOjOg7hpq7Be1/QN3iU33g93EGP/LQk0vIDYV5VLglfyovS1+ETX91McP6RFlg0/ti X-Received: by 10.112.166.137 with SMTP id zg9mr1122201lbb.11.1434389889634; Mon, 15 Jun 2015 10:38:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.162 with SMTP id g2ls933293lae.80.gmail; Mon, 15 Jun 2015 10:38:09 -0700 (PDT) X-Received: by 10.112.77.103 with SMTP id r7mr1261123lbw.63.1434389889362; Mon, 15 Jun 2015 10:38:09 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id ld3si11007955lac.92.2015.06.15.10.38.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jun 2015 10:38:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbbwc1 with SMTP id wc1so6220727lbb.2 for ; Mon, 15 Jun 2015 10:38:09 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr1370148lbc.32.1434389889243; Mon, 15 Jun 2015 10:38:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1569575lbb; Mon, 15 Jun 2015 10:38:08 -0700 (PDT) X-Received: by 10.55.55.1 with SMTP id e1mr62459048qka.68.1434389887924; Mon, 15 Jun 2015 10:38:07 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d201si13442665qhc.91.2015.06.15.10.38.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Jun 2015 10:38:07 -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; Received: from localhost ([::1]:35719 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4YKl-00053k-4g for patch@linaro.org; Mon, 15 Jun 2015 13:38:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Y8J-0007kV-N0 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4Y8F-0001UV-9M for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:15 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Y8E-0001AA-Sv for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:11 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Z4Y83-0003WO-3L for qemu-devel@nongnu.org; Mon, 15 Jun 2015 18:24:59 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 15 Jun 2015 18:24:44 +0100 Message-Id: <1434389098-13430-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1434389098-13430-1-git-send-email-peter.maydell@linaro.org> References: <1434389098-13430-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 14/28] hw/arm/pxa2xx: Add reset method for pxa2xx_ssp 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The pxa2xx_ssp device was missing a reset method; add one. Signed-off-by: Peter Maydell Reviewed-by: Peter Crosthwaite Message-id: 1434117989-7367-4-git-send-email-peter.maydell@linaro.org --- hw/arm/pxa2xx.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index a015c99..4ab24ca 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -756,6 +756,22 @@ static int pxa2xx_ssp_load(QEMUFile *f, void *opaque, int version_id) return 0; } +static void pxa2xx_ssp_reset(DeviceState *d) +{ + PXA2xxSSPState *s = PXA2XX_SSP(d); + + s->enable = 0; + s->sscr[0] = s->sscr[1] = 0; + s->sspsp = 0; + s->ssto = 0; + s->ssitr = 0; + s->sssr = 0; + s->sstsa = 0; + s->ssrsa = 0; + s->ssacd = 0; + s->rx_start = s->rx_level = 0; +} + static int pxa2xx_ssp_init(SysBusDevice *sbd) { DeviceState *dev = DEVICE(sbd); @@ -2336,8 +2352,10 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) static void pxa2xx_ssp_class_init(ObjectClass *klass, void *data) { SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); sdc->init = pxa2xx_ssp_init; + dc->reset = pxa2xx_ssp_reset; } static const TypeInfo pxa2xx_ssp_info = {