r3573 - branches/src/target/kernel/2.6.24.x/patches

laforge at sita.openmoko.org laforge at sita.openmoko.org
Wed Dec 5 14:34:42 CET 2007


Author: laforge
Date: 2007-12-05 14:34:37 +0100 (Wed, 05 Dec 2007)
New Revision: 3573

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
   branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
   branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch
Log:
gta01/gta02/hxd8:
* convert to new s3c2410fb platform data
* remove deprecated SA_INTERRUPT flag from request_irq()


Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch	2007-12-05 08:14:34 UTC (rev 3572)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch	2007-12-05 13:34:37 UTC (rev 3573)
@@ -1,11 +1,11 @@
 This patch adds support for the FIC GTA01 machine type to the ARM port of
 the linux kernel.
 
-Index: linux-2.6.22/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6/arch/arm/mach-s3c2410/Kconfig
 ===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6.22/arch/arm/mach-s3c2410/Kconfig
-@@ -110,5 +110,12 @@
+--- linux-2.6.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6/arch/arm/mach-s3c2410/Kconfig
+@@ -116,5 +116,12 @@
  	help
  	   Say Y here if you are using the Armzone QT2410
  
@@ -18,20 +18,20 @@
 +
  endmenu
  
-Index: linux-2.6.22/arch/arm/mach-s3c2410/Makefile
+Index: linux-2.6/arch/arm/mach-s3c2410/Makefile
 ===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2410/Makefile
-+++ linux-2.6.22/arch/arm/mach-s3c2410/Makefile
-@@ -29,3 +29,4 @@
+--- linux-2.6.orig/arch/arm/mach-s3c2410/Makefile
++++ linux-2.6/arch/arm/mach-s3c2410/Makefile
+@@ -30,3 +30,4 @@
  obj-$(CONFIG_BAST_PC104_IRQ)	+= bast-irq.o
  obj-$(CONFIG_MACH_VR1000)	+= mach-vr1000.o usb-simtec.o
  obj-$(CONFIG_MACH_QT2410)	+= mach-qt2410.o
 +obj-$(CONFIG_MACH_NEO1973_GTA01)+= mach-gta01.o
-Index: linux-2.6.22/arch/arm/mach-s3c2410/mach-gta01.c
+Index: linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -0,0 +1,755 @@
++++ linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
+@@ -0,0 +1,760 @@
 +/*
 + * linux/arch/arm/mach-s3c2410/mach-gta01.c
 + *
@@ -309,24 +309,22 @@
 +/* LCD driver info */
 +
 +/* Configuration for 480x640 toppoly TD028TTEC1 */
-+static struct s3c2410fb_mach_info gta01_lcd_cfg __initdata = {
-+	.regs	= {
-+		.lcdcon1	= S3C2410_LCDCON1_TFT16BPP |
-+				  S3C2410_LCDCON1_TFT |
-+				  S3C2410_LCDCON1_CLKVAL(0x01),	/* HCLK/4 */
++static struct s3c2410fb_display gta01_displays[] __initdata =  {
++	{
++		.type		= S3C2410_LCDCON1_TFT,
++		.width		= 480,
++		.height		= 640,
++		.xres		= 480,
++		.yres		= 640,
++		.bpp		= 16,
 +
-+		.lcdcon2	= S3C2410_LCDCON2_VBPD(1) |	/* 2 */
-+				  S3C2410_LCDCON2_LINEVAL(639) |/* 640 */
-+				  S3C2410_LCDCON2_VFPD(15) |	/* 16 */
-+				  S3C2410_LCDCON2_VSPW(1),	/* 2 */
-+
-+		.lcdcon3	= S3C2410_LCDCON3_HBPD(7) |	/* 8 */
-+				  S3C2410_LCDCON3_HOZVAL(479) |	/* 480 */
-+				  S3C2410_LCDCON3_HFPD(103),	/* 104 */
-+
-+		.lcdcon4	= S3C2410_LCDCON4_MVAL(0) |
-+				  S3C2410_LCDCON4_HSPW(7),	/* 8 */
-+
++		.pixclock	= 40000,	/* HCLK/4 */
++		.left_margin	= 104,
++		.right_margin	= 8,
++		.hsync_len	= 8,
++		.upper_margin	= 16,
++		.lower_margin	= 2,
++		.vsync_len	= 2,
 +		.lcdcon5	= S3C2410_LCDCON5_FRM565 |
 +				  S3C2410_LCDCON5_INVVCLK |
 +				  S3C2410_LCDCON5_INVVLINE |
@@ -334,31 +332,38 @@
 +				  S3C2410_LCDCON5_PWREN |
 +				  S3C2410_LCDCON5_HWSWP,
 +	},
++	{
++		.type		= S3C2410_LCDCON1_TFT,
++		.width		= 240,
++		.height		= 320,
++		.xres		= 240,
++		.yres		= 320,
++		.bpp		= 16,
 +
-+	.lpcsel		= ((0xCE6) & ~7) | 1<<4,
-+	.type		= S3C2410_LCDCON1_TFT,
-+
-+	.width		= 480,
-+	.height		= 640,
-+
-+	.xres		= {
-+		.min	= 240,
-+		.max	= 480,
-+		.defval	= 480,
++		.pixclock	= 40000,	/* HCLK/4 */
++		.left_margin	= 104,
++		.right_margin	= 8,
++		.hsync_len	= 8,
++		.upper_margin	= 16,
++		.lower_margin	= 2,
++		.vsync_len	= 2,
++		.lcdcon5	= S3C2410_LCDCON5_FRM565 |
++				  S3C2410_LCDCON5_INVVCLK |
++				  S3C2410_LCDCON5_INVVLINE |
++				  S3C2410_LCDCON5_INVVFRAME |
++				  S3C2410_LCDCON5_PWREN |
++				  S3C2410_LCDCON5_HWSWP,
 +	},
++};
 +
-+	.yres		= {
-+		.min	= 320,
-+		.max	= 640,
-+		.defval = 640,
-+	},
++static struct s3c2410fb_mach_info gta01_lcd_cfg __initdata = {
++	.displays	= gta01_displays,
++	.num_displays	= ARRAY_SIZE(gta01_displays),
++	.default_display= 1,
 +
-+	.bpp		= {
-+		.min	= 1,
-+		.max	= 16,
-+		.defval = 16,
-+	},
++	.lpcsel		= ((0xCE6) & ~7) | 1<<4,
 +};
++
 +static struct platform_device *gta01_devices[] __initdata = {
 +	&s3c_device_usb,
 +	&s3c_device_lcd,
@@ -772,7 +777,7 @@
 +
 +	set_irq_type(GTA01_IRQ_MODEM, IRQT_RISING);
 +	request_irq(GTA01_IRQ_MODEM, gta01_modem_irq,
-+		    SA_INTERRUPT, "modem", NULL);
++		    IRQF_TRIGGER_RISING, "modem", NULL);
 +	enable_irq_wake(GTA01_IRQ_MODEM);
 +}
 +
@@ -787,10 +792,10 @@
 +MACHINE_END
 +
 +
-Index: linux-2.6.22/include/asm-arm/arch-s3c2410/gta01.h
+Index: linux-2.6/include/asm-arm/arch-s3c2410/gta01.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22/include/asm-arm/arch-s3c2410/gta01.h
++++ linux-2.6/include/asm-arm/arch-s3c2410/gta01.h
 @@ -0,0 +1,70 @@
 +#ifndef _GTA01_H
 +#define _GTA01_H

Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2007-12-05 08:14:34 UTC (rev 3572)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch	2007-12-05 13:34:37 UTC (rev 3573)
@@ -1,7 +1,7 @@
-Index: linux-2.6.22/arch/arm/mach-s3c2440/mach-gta02.c
+Index: linux-2.6/arch/arm/mach-s3c2440/mach-gta02.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22/arch/arm/mach-s3c2440/mach-gta02.c
++++ linux-2.6/arch/arm/mach-s3c2440/mach-gta02.c
 @@ -0,0 +1,636 @@
 +/*
 + * linux/arch/arm/mach-s3c2440/mach-gta02.c
@@ -626,7 +626,7 @@
 +
 +	set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
 +	request_irq(GTA02_IRQ_MODEM, gta02_modem_irq,
-+		    SA_INTERRUPT, "modem", NULL);
++		    IRQF_TRIGGER_RISING, "modem", NULL);
 +	enable_irq_wake(GTA02_IRQ_MODEM);
 +}
 +
@@ -639,10 +639,10 @@
 +	.init_machine	= gta02_machine_init,
 +	.timer		= &s3c24xx_timer,
 +MACHINE_END
-Index: linux-2.6.22/include/asm-arm/arch-s3c2410/gta02.h
+Index: linux-2.6/include/asm-arm/arch-s3c2410/gta02.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22/include/asm-arm/arch-s3c2410/gta02.h
++++ linux-2.6/include/asm-arm/arch-s3c2410/gta02.h
 @@ -0,0 +1,97 @@
 +#ifndef _GTA02_H
 +#define _GTA02_H
@@ -741,10 +741,10 @@
 +#define GTA02v3_IRQ_nGSM_OC	IRQ_EINT19	/* v3 + v4 only */
 +
 +#endif /* _GTA02_H */
-Index: linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+Index: linux-2.6/arch/arm/mach-s3c2440/Kconfig
 ===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2440/Kconfig
-+++ linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+--- linux-2.6.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6/arch/arm/mach-s3c2440/Kconfig
 @@ -74,5 +74,12 @@
  	help
  	   Say Y here if you are using the FIC Neo1973 GSM Phone
@@ -758,19 +758,19 @@
 +
  endmenu
  
-Index: linux-2.6.22/arch/arm/mach-s3c2440/Makefile
+Index: linux-2.6/arch/arm/mach-s3c2440/Makefile
 ===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2440/Makefile
-+++ linux-2.6.22/arch/arm/mach-s3c2440/Makefile
+--- linux-2.6.orig/arch/arm/mach-s3c2440/Makefile
++++ linux-2.6/arch/arm/mach-s3c2440/Makefile
 @@ -22,3 +22,4 @@
  obj-$(CONFIG_ARCH_S3C2440)	+= mach-smdk2440.o
  obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
  obj-$(CONFIG_MACH_HXD8)		+= mach-hxd8.o
 +obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-Index: linux-2.6.22/arch/arm/common/gta01_pm_bt.c
+Index: linux-2.6/arch/arm/common/gta01_pm_bt.c
 ===================================================================
---- linux-2.6.22.orig/arch/arm/common/gta01_pm_bt.c
-+++ linux-2.6.22/arch/arm/common/gta01_pm_bt.c
+--- linux-2.6.orig/arch/arm/common/gta01_pm_bt.c
++++ linux-2.6/arch/arm/common/gta01_pm_bt.c
 @@ -19,22 +19,40 @@
  #include <linux/pcf50606.h>
  
@@ -889,10 +889,10 @@
  	/* we pull reset to low to make sure that the chip doesn't
  	 * drain power through the reset line */
  	s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-Index: linux-2.6.22/arch/arm/common/gta01_pm_gsm.c
+Index: linux-2.6/arch/arm/common/gta01_pm_gsm.c
 ===================================================================
---- linux-2.6.22.orig/arch/arm/common/gta01_pm_gsm.c
-+++ linux-2.6.22/arch/arm/common/gta01_pm_gsm.c
+--- linux-2.6.orig/arch/arm/common/gta01_pm_gsm.c
++++ linux-2.6/arch/arm/common/gta01_pm_gsm.c
 @@ -19,8 +19,14 @@
  #include <linux/errno.h>
  
@@ -1001,23 +1001,23 @@
  MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
 -MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GSM Management");
 +MODULE_DESCRIPTION("FIC Neo1973 GSM Power Management");
-Index: linux-2.6.22/drivers/leds/leds-gta01.c
+Index: linux-2.6/drivers/leds/leds-gta01.c
 ===================================================================
---- linux-2.6.22.5-moko.orig/drivers/leds/leds-gta01.c
-+++ linux-2.6.22.5-moko/drivers/leds/leds-gta01.c
-@@ -111,7 +110,7 @@
- 	struct gta01_vib_priv *vp;
+--- linux-2.6.orig/drivers/leds/leds-gta01.c
++++ linux-2.6/drivers/leds/leds-gta01.c
+@@ -110,7 +110,7 @@
  	struct resource *r;
+ 	int rc;
  
 -	if (!machine_is_neo1973_gta01())
 +	if (!machine_is_neo1973_gta01() && !machine_is_neo1973_gta02())
  		return -EIO;
  
  	r = platform_get_resource(pdev, 0, 0);
-Index: linux-2.6.22/sound/soc/s3c24xx/neo1973_wm8753.c
+Index: linux-2.6/sound/soc/s3c24xx/neo1973_wm8753.c
 ===================================================================
---- linux-2.6.22.orig/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ linux-2.6.22/sound/soc/s3c24xx/neo1973_wm8753.c
+--- linux-2.6.orig/sound/soc/s3c24xx/neo1973_wm8753.c
++++ linux-2.6/sound/soc/s3c24xx/neo1973_wm8753.c
 @@ -670,6 +670,12 @@
  {
  	int ret;

Modified: branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch	2007-12-05 08:14:34 UTC (rev 3572)
+++ branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch	2007-12-05 13:34:37 UTC (rev 3573)
@@ -1,8 +1,8 @@
 This patch adds another machine, the FIC HXD8
-Index: linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+Index: linux-2.6/arch/arm/mach-s3c2440/Kconfig
 ===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2440/Kconfig
-+++ linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+--- linux-2.6.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6/arch/arm/mach-s3c2440/Kconfig
 @@ -67,6 +67,12 @@
  	default y if ARCH_S3C2440
  	select CPU_S3C2440
@@ -16,20 +16,20 @@
  
  endmenu
  
-Index: linux-2.6.22/arch/arm/mach-s3c2440/Makefile
+Index: linux-2.6/arch/arm/mach-s3c2440/Makefile
 ===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2440/Makefile
-+++ linux-2.6.22/arch/arm/mach-s3c2440/Makefile
+--- linux-2.6.orig/arch/arm/mach-s3c2440/Makefile
++++ linux-2.6/arch/arm/mach-s3c2440/Makefile
 @@ -21,3 +21,4 @@
  obj-$(CONFIG_MACH_RX3715)	+= mach-rx3715.o
  obj-$(CONFIG_ARCH_S3C2440)	+= mach-smdk2440.o
  obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
 +obj-$(CONFIG_MACH_HXD8)		+= mach-hxd8.o
-Index: linux-2.6.22/arch/arm/mach-s3c2440/mach-hxd8.c
+Index: linux-2.6/arch/arm/mach-s3c2440/mach-hxd8.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22/arch/arm/mach-s3c2440/mach-hxd8.c
-@@ -0,0 +1,399 @@
++++ linux-2.6/arch/arm/mach-s3c2440/mach-hxd8.c
+@@ -0,0 +1,380 @@
 +/* linux/arch/arm/mach-s3c2440/mach-hxd8.c
 + *
 + * S3C2440 Machine Support for the FIC HXD8
@@ -279,53 +279,34 @@
 +
 +/* LCD driver info */
 +
-+static struct s3c2410fb_mach_info hxd8_lcd_cfg __initdata = {
-+	.regs	= {
++static struct s3c2410fb_display hxd8_displays[] __initdata =  {
++	{
++		.type		= S3C2410_LCDCON1_TFT,
++		.width		= 480,
++		.height		= 272,
++		.xres		= 480,
++		.yres		= 272,
++		.bpp		= 16,
 +
-+		.lcdcon1	= S3C2410_LCDCON1_TFT24BPP |
-+				  S3C2410_LCDCON1_TFT |
-+				  S3C2410_LCDCON1_CLKVAL(0x05),
-+
-+		.lcdcon2	= S3C2410_LCDCON2_VBPD(1) |
-+				  S3C2410_LCDCON2_LINEVAL(271) |
-+				  S3C2410_LCDCON2_VFPD(1) |
-+				  S3C2410_LCDCON2_VSPW(9),
-+
-+		.lcdcon3	= S3C2410_LCDCON3_HBPD(1) |
-+				  S3C2410_LCDCON3_HOZVAL(479) |
-+				  S3C2410_LCDCON3_HFPD(1),
-+
-+		.lcdcon4	= S3C2410_LCDCON4_MVAL(0) |
-+				  S3C2410_LCDCON4_HSPW(40),
-+
++		.pixclock	= 40000,	/* HCLK/4 */
++		.left_margin	= 2,
++		.right_margin	= 2,
++		.hsync_len	= 41,
++		.upper_margin	= 2,
++		.lower_margin	= 2,
++		.vsync_len	= 10,
 +		.lcdcon5	= S3C2410_LCDCON5_FRM565 |
 +				  S3C2410_LCDCON5_INVVLINE |
 +				  S3C2410_LCDCON5_INVVFRAME,
 +	},
++};
 +
-+	.lpcsel		= ((0xCE6) & ~7),
-+	.type		= S3C2410_LCDCON1_TFT,
++static struct s3c2410fb_mach_info hxd8_lcd_cfg __initdata = {
++	.displays	= hxd8_displays,
++	.num_displays	= ARRAY_SIZE(hxd8_displays),
++	.default_display = 1,
 +
-+	.width		= 480,
-+	.height		= 272,
-+
-+	.xres		= {
-+		.min	= 480,
-+		.max	= 480,
-+		.defval	= 480,
-+	},
-+
-+	.yres		= {
-+		.min	= 272,
-+		.max	= 272,
-+		.defval = 272,
-+	},
-+
-+	.bpp		= {
-+		.min	= 16,
-+		.max	= 32,
-+		.defval = 32,
-+	},
++	.lpcsel		= ((0xCE6) & ~7),
 +};
 +
 +static struct platform_device hxd8_pm_gsm_dev = {
@@ -429,10 +410,10 @@
 +	.init_machine	= hxd8_machine_init,
 +	.timer		= &s3c24xx_timer,
 +MACHINE_END
-Index: linux-2.6.22/include/asm-arm/arch-s3c2440/hxd8.h
+Index: linux-2.6/include/asm-arm/arch-s3c2440/hxd8.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22/include/asm-arm/arch-s3c2440/hxd8.h
++++ linux-2.6/include/asm-arm/arch-s3c2440/hxd8.h
 @@ -0,0 +1,16 @@
 +#ifndef _HXD8_H
 +#define _HXD8_H





More information about the commitlog mailing list