Merge master.kernel.org:/home/rmk/linux-2.6-arm

Minor manual fixups for gfp_t clashes.

6 files changed, 155 insertions, 18 deletions

diff --git a/arch/arm/mach-s3c2410/cpu.h b/arch/arm/mach-s3c2410/cpu.h
index 478c15c0e36a..9cbe5eef492b 100644
--- a/arch/arm/mach-s3c2410/cpu.h
+++ b/arch/arm/mach-s3c2410/cpu.h
@@ -21,7 +21,7 @@
 
 /* todo - fix when rmk changes iodescs to use `void __iomem *` */
 
-#define IODESC_ENT(x) { (unsigned long)S3C24XX_VA_##x, S3C2410_PA_##x, S3C24XX_SZ_##x, MT_DEVICE }
+#define IODESC_ENT(x) { (unsigned long)S3C24XX_VA_##x, __phys_to_pfn(S3C2410_PA_##x), S3C24XX_SZ_##x, MT_DEVICE }
 
 #ifndef MHZ
 #define MHZ (1000*1000)
diff --git a/arch/arm/mach-s3c2410/devs.c b/arch/arm/mach-s3c2410/devs.c
index 0077937a7ab8..08bc7d95a45d 100644
--- a/arch/arm/mach-s3c2410/devs.c
+++ b/arch/arm/mach-s3c2410/devs.c
@@ -47,7 +47,7 @@ struct platform_device *s3c24xx_uart_devs[3];
 static struct resource s3c_usb_resource[] = {
         [0] = {
                 .start = S3C2410_PA_USBHOST,
-                .end   = S3C2410_PA_USBHOST + S3C24XX_SZ_USBHOST,
+                .end   = S3C2410_PA_USBHOST + S3C24XX_SZ_USBHOST - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
@@ -77,7 +77,7 @@ EXPORT_SYMBOL(s3c_device_usb);
 static struct resource s3c_lcd_resource[] = {
         [0] = {
                 .start = S3C2410_PA_LCD,
-                .end   = S3C2410_PA_LCD + S3C24XX_SZ_LCD,
+                .end   = S3C2410_PA_LCD + S3C24XX_SZ_LCD - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
@@ -103,21 +103,25 @@ struct platform_device s3c_device_lcd = {
 
 EXPORT_SYMBOL(s3c_device_lcd);
 
-static struct s3c2410fb_mach_info s3c2410fb_info;
-
-void __init set_s3c2410fb_info(struct s3c2410fb_mach_info *hard_s3c2410fb_info)
+void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *pd)
 {
-        memcpy(&s3c2410fb_info,hard_s3c2410fb_info,sizeof(struct s3c2410fb_mach_info));
-        s3c_device_lcd.dev.platform_data = &s3c2410fb_info;
+        struct s3c2410fb_mach_info *npd;
+
+        npd = kmalloc(sizeof(*npd), GFP_KERNEL);
+        if (npd) {
+                memcpy(npd, pd, sizeof(*npd));
+                s3c_device_lcd.dev.platform_data = npd;
+        } else {
+                printk(KERN_ERR "no memory for LCD platform data\n");
+        }
 }
-EXPORT_SYMBOL(set_s3c2410fb_info);
 
 /* NAND Controller */
 
 static struct resource s3c_nand_resource[] = {
         [0] = {
                 .start = S3C2410_PA_NAND,
-                .end   = S3C2410_PA_NAND + S3C24XX_SZ_NAND,
+                .end   = S3C2410_PA_NAND + S3C24XX_SZ_NAND - 1,
                 .flags = IORESOURCE_MEM,
         }
 };
@@ -136,7 +140,7 @@ EXPORT_SYMBOL(s3c_device_nand);
 static struct resource s3c_usbgadget_resource[] = {
         [0] = {
                 .start = S3C2410_PA_USBDEV,
-                .end   = S3C2410_PA_USBDEV + S3C24XX_SZ_USBDEV,
+                .end   = S3C2410_PA_USBDEV + S3C24XX_SZ_USBDEV - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
@@ -161,7 +165,7 @@ EXPORT_SYMBOL(s3c_device_usbgadget);
 static struct resource s3c_wdt_resource[] = {
         [0] = {
                 .start = S3C2410_PA_WATCHDOG,
-                .end   = S3C2410_PA_WATCHDOG + S3C24XX_SZ_WATCHDOG,
+                .end   = S3C2410_PA_WATCHDOG + S3C24XX_SZ_WATCHDOG - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
@@ -186,7 +190,7 @@ EXPORT_SYMBOL(s3c_device_wdt);
 static struct resource s3c_i2c_resource[] = {
         [0] = {
                 .start = S3C2410_PA_IIC,
-                .end   = S3C2410_PA_IIC + S3C24XX_SZ_IIC,
+                .end   = S3C2410_PA_IIC + S3C24XX_SZ_IIC - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
@@ -211,7 +215,7 @@ EXPORT_SYMBOL(s3c_device_i2c);
 static struct resource s3c_iis_resource[] = {
         [0] = {
                 .start = S3C2410_PA_IIS,
-                .end   = S3C2410_PA_IIS + S3C24XX_SZ_IIS,
+                .end   = S3C2410_PA_IIS + S3C24XX_SZ_IIS -1,
                 .flags = IORESOURCE_MEM,
         }
 };
@@ -265,7 +269,7 @@ EXPORT_SYMBOL(s3c_device_rtc);
 static struct resource s3c_adc_resource[] = {
         [0] = {
                 .start = S3C2410_PA_ADC,
-                .end   = S3C2410_PA_ADC + S3C24XX_SZ_ADC,
+                .end   = S3C2410_PA_ADC + S3C24XX_SZ_ADC - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
@@ -288,7 +292,7 @@ struct platform_device s3c_device_adc = {
 static struct resource s3c_sdi_resource[] = {
         [0] = {
                 .start = S3C2410_PA_SDI,
-                .end   = S3C2410_PA_SDI + S3C24XX_SZ_SDI,
+                .end   = S3C2410_PA_SDI + S3C24XX_SZ_SDI - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
@@ -465,7 +469,7 @@ EXPORT_SYMBOL(s3c_device_timer3);
 static struct resource s3c_camif_resource[] = {
         [0] = {
                 .start = S3C2440_PA_CAMIF,
-                .end   = S3C2440_PA_CAMIF + S3C2440_SZ_CAMIF,
+                .end   = S3C2440_PA_CAMIF + S3C2440_SZ_CAMIF - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c
index 94f1776cf312..23ea3d5fa09c 100644
--- a/arch/arm/mach-s3c2410/gpio.c
+++ b/arch/arm/mach-s3c2410/gpio.c
@@ -30,6 +30,7 @@
  *      04-Oct-2004  BJD  Added irq filter controls for GPIO
  *      05-Nov-2004  BJD  EXPORT_SYMBOL() added for all code
  *      13-Mar-2005  BJD  Updates for __iomem
+ *      26-Oct-2005  BJD  Added generic configuration types
  */
 
 
@@ -58,6 +59,27 @@ void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function)
                 mask = 3 << S3C2410_GPIO_OFFSET(pin)*2;
         }
 
+        switch (function) {
+        case S3C2410_GPIO_LEAVE:
+                mask = 0;
+                function = 0;
+                break;
+
+        case S3C2410_GPIO_INPUT:
+        case S3C2410_GPIO_OUTPUT:
+        case S3C2410_GPIO_SFN2:
+        case S3C2410_GPIO_SFN3:
+                if (pin < S3C2410_GPIO_BANKB) {
+                        function &= 1;
+                        function <<= S3C2410_GPIO_OFFSET(pin);
+                } else {
+                        function &= 3;
+                        function <<= S3C2410_GPIO_OFFSET(pin)*2;
+                }
+        }
+
+        /* modify the specified register wwith IRQs off */
+
         local_irq_save(flags);
 
         con  = __raw_readl(base + 0x00);
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 7b51bfd0ba6d..c1b5c63ec24a 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -32,6 +32,7 @@
  *     25-Jul-2005 BJD  Removed ASIX static mappings
  *     27-Jul-2005 BJD  Ensure maximum frequency of i2c bus
  *     20-Sep-2005 BJD  Added static to non-exported items
+ *     26-Oct-2005 BJD  Added FB platform data
 */
 
 #include <linux/kernel.h>
@@ -61,8 +62,10 @@
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-mem.h>
 #include <asm/arch/regs-lcd.h>
+
 #include <asm/arch/nand.h>
 #include <asm/arch/iic.h>
+#include <asm/arch/fb.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
@@ -399,6 +402,38 @@ static struct s3c2410_platform_i2c bast_i2c_info = {
         .max_freq       = 130*1000,
 };
 
+
+static struct s3c2410fb_mach_info __initdata bast_lcd_info = {
+        .width          = 640,
+        .height         = 480,
+
+        .xres           = {
+                .min            = 320,
+                .max            = 1024,
+                .defval         = 640,
+        },
+
+        .yres           = {
+                .min            = 240,
+                .max            = 600,
+                .defval         = 480,
+        },
+
+        .bpp            = {
+                .min            = 4,
+                .max            = 16,
+                .defval         = 8,
+        },
+
+        .regs           = {
+                .lcdcon1        = 0x00000176,
+                .lcdcon2        = 0x1d77c7c2,
+                .lcdcon3        = 0x013a7f13,
+                .lcdcon4        = 0x00000057,
+                .lcdcon5        = 0x00014b02,
+        }
+};
+
 /* Standard BAST devices */
 
 static struct platform_device *bast_devices[] __initdata = {
@@ -454,6 +489,10 @@ static void __init bast_map_io(void)
         usb_simtec_init();
 }
 
+static void __init bast_init(void)
+{
+        s3c24xx_fb_set_platdata(&bast_lcd_info);
+}
 
 MACHINE_START(BAST, "Simtec-BAST")
         /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
@@ -463,5 +502,6 @@ MACHINE_START(BAST, "Simtec-BAST")
         .boot_params    = S3C2410_SDRAM_PA + 0x100,
         .map_io         = bast_map_io,
         .init_irq       = s3c24xx_init_irq,
+        .init_machine   = bast_init,
         .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index fb3cb01266e5..7efeaaad2361 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -25,6 +25,7 @@
  *     14-Jan-2005 BJD  Added clock init
  *     10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA
  *     20-Sep-2005 BJD  Added static to non-exported items
+ *     26-Oct-2005 BJD  Changed name of fb init call
 */
 
 #include <linux/kernel.h>
@@ -164,7 +165,7 @@ static void __init h1940_init_irq(void)
 
 static void __init h1940_init(void)
 {
-        set_s3c2410fb_info(&h1940_lcdcfg);
+        s3c24xx_fb_set_platdata(&h1940_lcdcfg);
 }
 
 MACHINE_START(H1940, "IPAQ-H1940")
diff --git a/arch/arm/mach-s3c2410/mach-smdk2440.c b/arch/arm/mach-s3c2410/mach-smdk2440.c
index 722ef46b630a..6950e61b7914 100644
--- a/arch/arm/mach-s3c2410/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2440.c
@@ -19,6 +19,7 @@
  *      10-Mar-2005 LCVR  Replaced S3C2410_VA by S3C24XX_VA
  *      14-Mar-2005 BJD   void __iomem fixes
  *      20-Sep-2005 BJD   Added static to non-exported items
+ *      26-Oct-2005 BJD   Added framebuffer data
 */
 
 #include <linux/kernel.h>
@@ -41,7 +42,10 @@
 //#include <asm/debug-ll.h>
 #include <asm/arch/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-lcd.h>
+
 #include <asm/arch/idle.h>
+#include <asm/arch/fb.h>
 
 #include "s3c2410.h"
 #include "s3c2440.h"
@@ -86,6 +90,70 @@ static struct s3c2410_uartcfg smdk2440_uartcfgs[] = {
         }
 };
 
+/* LCD driver info */
+
+static struct s3c2410fb_mach_info smdk2440_lcd_cfg __initdata = {
+        .regs   = {
+
+                .lcdcon1        = S3C2410_LCDCON1_TFT16BPP |
+                                  S3C2410_LCDCON1_TFT |
+                                  S3C2410_LCDCON1_CLKVAL(0x04),
+
+                .lcdcon2        = S3C2410_LCDCON2_VBPD(7) |
+                                  S3C2410_LCDCON2_LINEVAL(319) |
+                                  S3C2410_LCDCON2_VFPD(6) |
+                                  S3C2410_LCDCON2_VSPW(3),
+
+                .lcdcon3        = S3C2410_LCDCON3_HBPD(19) |
+                                  S3C2410_LCDCON3_HOZVAL(239) |
+                                  S3C2410_LCDCON3_HFPD(7),
+
+                .lcdcon4        = S3C2410_LCDCON4_MVAL(0) |
+                                  S3C2410_LCDCON4_HSPW(3),
+
+                .lcdcon5        = S3C2410_LCDCON5_FRM565 |
+                                  S3C2410_LCDCON5_INVVLINE |
+                                  S3C2410_LCDCON5_INVVFRAME |
+                                  S3C2410_LCDCON5_PWREN |
+                                  S3C2410_LCDCON5_HWSWP,
+        },
+
+#if 0
+        /* currently setup by downloader */
+        .gpccon         = 0xaa940659,
+        .gpccon_mask    = 0xffffffff,
+        .gpcup          = 0x0000ffff,
+        .gpcup_mask     = 0xffffffff,
+        .gpdcon         = 0xaa84aaa0,
+        .gpdcon_mask    = 0xffffffff,
+        .gpdup          = 0x0000faff,
+        .gpdup_mask     = 0xffffffff,
+#endif
+
+        .lpcsel         = ((0xCE6) & ~7) | 1<<4,
+
+        .width          = 240,
+        .height         = 320,
+
+        .xres           = {
+                .min    = 240,
+                .max    = 240,
+                .defval = 240,
+        },
+
+        .yres           = {
+                .min    = 320,
+                .max    = 320,
+                .defval = 320,
+        },
+
+        .bpp            = {
+                .min    = 16,
+                .max    = 16,
+                .defval = 16,
+        },
+};
+
 static struct platform_device *smdk2440_devices[] __initdata = {
         &s3c_device_usb,
         &s3c_device_lcd,
@@ -121,6 +189,8 @@ static void __init smdk2440_machine_init(void)
         s3c2410_gpio_setpin(S3C2410_GPF6, 0);
         s3c2410_gpio_setpin(S3C2410_GPF7, 0);
 
+        s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg);
+
         s3c2410_pm_init();
 }