From patchwork Mon Apr 25 09:06:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 92713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4F45AB6F57 for ; Mon, 25 Apr 2011 19:08:39 +1000 (EST) Received: from localhost ([::1]:53617 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEHmW-0004tl-Aj for incoming@patchwork.ozlabs.org; Mon, 25 Apr 2011 05:08:36 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEHkm-0002S9-Cc for qemu-devel@nongnu.org; Mon, 25 Apr 2011 05:06:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QEHkl-0001DO-GQ for qemu-devel@nongnu.org; Mon, 25 Apr 2011 05:06:48 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:46862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEHkl-0001Bo-CG for qemu-devel@nongnu.org; Mon, 25 Apr 2011 05:06:47 -0400 Received: by mail-ww0-f53.google.com with SMTP id 40so1884678wwj.10 for ; Mon, 25 Apr 2011 02:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=WM8I7aDFAd8EoBQZ2Z6SWqLPLnyJfifXdTK8D6oSOG4=; b=eFQoJPTNyT6TVg/KZnDzx5enxCZdIQZh8G4A/sngavlhC1BPkj5pxh0QtahdeL/BvO GMLPxDiF5mdWO1vOHDsv/hW6rOK1GubwBa5m31/mADBbiiwCGYTDlZrOhEcEx0JQOodh /jhKIBpNUug6HeuH2Xf0qNgwn2E41DmvDwChk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; b=oPUKb/zkzpb5cOHeJvrqMX0TQZvrLzuhEIlFtBrcSvmpk/u8W9vQsKmrdat6WnmZOs zzNOqGX2JzBqB60OgrkrR+MhNm3Aoe/q92c7e/KzpTSFGges/pqz/nu4Seso0zs+MZxS icyc7FxDV3iUrygWS+rV+dqSCgatXmlM2UMiI= Received: by 10.227.176.68 with SMTP id bd4mr3856737wbb.86.1303722407146; Mon, 25 Apr 2011 02:06:47 -0700 (PDT) Received: from doriath.ww600.siemens.net ([91.213.169.4]) by mx.google.com with ESMTPS id z13sm3157009wbd.46.2011.04.25.02.06.45 (version=SSLv3 cipher=OTHER); Mon, 25 Apr 2011 02:06:46 -0700 (PDT) From: Dmitry Eremin-Solenikov To: qemu-devel@nongnu.org Date: Mon, 25 Apr 2011 13:06:32 +0400 Message-Id: <1303722395-10791-6-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1303722395-10791-1-git-send-email-dbaryshkov@gmail.com> References: <1303722395-10791-1-git-send-email-dbaryshkov@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Subject: [Qemu-devel] [RESEND][PATCH 6/9] pxa: change order of pcmcia devices instantiation, so that the socket 0 will be default 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 Signed-off-by: Dmitry Eremin-Solenikov --- hw/pxa2xx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c index 6ae8c8c..dc44864 100644 --- a/hw/pxa2xx.c +++ b/hw/pxa2xx.c @@ -2176,8 +2176,8 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision) qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1)); } - s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000, 0); s->pcmcia[1] = pxa2xx_pcmcia_init(0x30000000, 1); + s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000, 0); sysbus_create_simple("pxa2xx_rtc", 0x40900000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM)); @@ -2312,8 +2312,8 @@ PXA2xxState *pxa255_init(unsigned int sdram_size) qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1)); } - s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000, 0); s->pcmcia[1] = pxa2xx_pcmcia_init(0x30000000, 1); + s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000, 0); sysbus_create_simple("pxa2xx_rtc", 0x40900000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM));