Patchwork [RESEND,6/9] pxa: change order of pcmcia devices instantiation, so that the socket 0 will be default

login
register
mail settings
Submitter Dmitry Eremin-Solenikov
Date April 25, 2011, 9:06 a.m.
Message ID <1303722395-10791-6-git-send-email-dbaryshkov@gmail.com>
Download mbox | patch
Permalink /patch/92713/
State New
Headers show

Comments

Dmitry Eremin-Solenikov - April 25, 2011, 9:06 a.m.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 hw/pxa2xx.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

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));