vserver 1.9.5.x5

[linux-2.6.git] / arch / arm / mach-pxa / generic.c

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 3f4755f..b1575b8 100644 (file)
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -49,6 +49,10 @@ void pxa_gpio_mode(int gpio_mode)
        int gafr;
 
        local_irq_save(flags);
+       if (gpio_mode & GPIO_DFLT_LOW)
+               GPCR(gpio) = GPIO_bit(gpio);
+       else if (gpio_mode & GPIO_DFLT_HIGH)
+               GPSR(gpio) = GPIO_bit(gpio);
        if (gpio_mode & GPIO_MD_MASK_DIR)
                GPDR(gpio) |= GPIO_bit(gpio);
        else
@@ -88,7 +92,7 @@ EXPORT_SYMBOL(pxa_set_cken);
  */
 static struct map_desc standard_io_desc[] __initdata = {
  /* virtual     physical    length      type */
-  { 0xf2000000, 0x40000000, 0x01800000, MT_DEVICE }, /* Devs */
+  { 0xf2000000, 0x40000000, 0x02000000, MT_DEVICE }, /* Devs */
   { 0xf4000000, 0x44000000, 0x00100000, MT_DEVICE }, /* LCD */
   { 0xf6000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Mem Ctl */
   { 0xf8000000, 0x4c000000, 0x00100000, MT_DEVICE }, /* USB host */
@@ -134,7 +138,6 @@ void __init pxa_set_mci_info(struct pxamci_platform_data *info)
 {
        pxamci_device.dev.platform_data = info;
 }
-EXPORT_SYMBOL(pxa_set_mci_info);
 
 
 static struct pxa2xx_udc_mach_info pxa_udc_info;
@@ -143,7 +146,6 @@ void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)
 {
        memcpy(&pxa_udc_info, info, sizeof *info);
 }
-EXPORT_SYMBOL(pxa_set_udc_info);
 
 static struct resource pxa2xx_udc_resources[] = {
        [0] = {
@@ -177,7 +179,6 @@ void __init set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info)
 {
        memcpy(&pxa_fb_info,hard_pxa_fb_info,sizeof(struct pxafb_mach_info));
 }
-EXPORT_SYMBOL(set_pxa_fb_info);
 
 static struct resource pxafb_resources[] = {
        [0] = {