r3048 - branches/src/target/kernel/2.6.23.x/patches

shoragan at sita.openmoko.org shoragan at sita.openmoko.org
Wed Sep 26 22:00:34 CEST 2007


Author: shoragan
Date: 2007-09-26 22:00:32 +0200 (Wed, 26 Sep 2007)
New Revision: 3048

Added:
   branches/src/target/kernel/2.6.23.x/patches/neo1973-soc-include-fix.patch
   branches/src/target/kernel/2.6.23.x/patches/s3c2410-nand-include-fix.patch
   branches/src/target/kernel/2.6.23.x/patches/s3c2410-udc-include-fix.patch
Modified:
   branches/src/target/kernel/2.6.23.x/patches/gta01-backlight.patch
   branches/src/target/kernel/2.6.23.x/patches/gta01-core.patch
   branches/src/target/kernel/2.6.23.x/patches/gta01-pcf50606.patch
   branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch
   branches/src/target/kernel/2.6.23.x/patches/gta02-core.patch
   branches/src/target/kernel/2.6.23.x/patches/hxd8-core.patch
   branches/src/target/kernel/2.6.23.x/patches/pcf50633.patch
   branches/src/target/kernel/2.6.23.x/patches/s3c2410_touchscreen.patch
   branches/src/target/kernel/2.6.23.x/patches/series
Log:
Fix includes and follow the api changes

Modified: branches/src/target/kernel/2.6.23.x/patches/gta01-backlight.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/gta01-backlight.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/gta01-backlight.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -1,10 +1,10 @@
 This is a backlight driver for FIC's Neo1973 Phone (codename GTA01)
 
-Index: linux-2.6.21.3-moko/drivers/video/backlight/Kconfig
+Index: linux-2.6.22/drivers/video/backlight/Kconfig
 ===================================================================
---- linux-2.6.21.3-moko.orig/drivers/video/backlight/Kconfig
-+++ linux-2.6.21.3-moko/drivers/video/backlight/Kconfig
-@@ -48,6 +48,14 @@
+--- linux-2.6.22.orig/drivers/video/backlight/Kconfig
++++ linux-2.6.22/drivers/video/backlight/Kconfig
+@@ -54,6 +54,14 @@
  	  If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y to
  	  enable the LCD/backlight driver.
  
@@ -19,10 +19,10 @@
  config BACKLIGHT_HP680
  	tristate "HP Jornada 680 Backlight Driver"
  	depends on BACKLIGHT_CLASS_DEVICE && SH_HP6XX
-Index: linux-2.6.21.3-moko/drivers/video/backlight/Makefile
+Index: linux-2.6.22/drivers/video/backlight/Makefile
 ===================================================================
---- linux-2.6.21.3-moko.orig/drivers/video/backlight/Makefile
-+++ linux-2.6.21.3-moko/drivers/video/backlight/Makefile
+--- linux-2.6.22.orig/drivers/video/backlight/Makefile
++++ linux-2.6.22/drivers/video/backlight/Makefile
 @@ -3,6 +3,7 @@
  obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
  obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
@@ -31,11 +31,11 @@
  obj-$(CONFIG_BACKLIGHT_HP680)	+= hp680_bl.o
  obj-$(CONFIG_BACKLIGHT_LOCOMO)	+= locomolcd.o
  obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
-Index: linux-2.6.21.3-moko/drivers/video/backlight/gta01_bl.c
+Index: linux-2.6.22/drivers/video/backlight/gta01_bl.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21.3-moko/drivers/video/backlight/gta01_bl.c
-@@ -0,0 +1,288 @@
++++ linux-2.6.22/drivers/video/backlight/gta01_bl.c
+@@ -0,0 +1,289 @@
 +/*
 + *  Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
 + *
@@ -73,9 +73,10 @@
 +#include <linux/clk.h>
 +
 +#include <asm/arch/hardware.h>
-+#include <asm/arch/regs-timer.h>
 +#include <asm/arch/gta01.h>
 +
++#include <asm/plat-s3c/regs-timer.h>
++
 +static struct backlight_properties gta01bl_prop;
 +static struct backlight_device *gta01_backlight_device;
 +static struct gta01bl_machinfo *bl_machinfo;

Modified: branches/src/target/kernel/2.6.23.x/patches/gta01-core.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/gta01-core.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/gta01-core.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -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.5-moko/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6.22/arch/arm/mach-s3c2410/Kconfig
 ===================================================================
---- linux-2.6.22.5-moko.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2410/Kconfig
-@@ -109,5 +109,12 @@
+--- linux-2.6.22.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6.22/arch/arm/mach-s3c2410/Kconfig
+@@ -110,5 +110,12 @@
  	help
  	   Say Y here if you are using the Armzone QT2410
  
@@ -18,19 +18,19 @@
 +
  endmenu
  
-Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2410/Makefile
+Index: linux-2.6.22/arch/arm/mach-s3c2410/Makefile
 ===================================================================
---- linux-2.6.22.5-moko.orig/arch/arm/mach-s3c2410/Makefile
-+++ linux-2.6.22.5-moko/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 @@
  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.5-moko/arch/arm/mach-s3c2410/mach-gta01.c
+Index: linux-2.6.22/arch/arm/mach-s3c2410/mach-gta01.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2410/mach-gta01.c
++++ linux-2.6.22/arch/arm/mach-s3c2410/mach-gta01.c
 @@ -0,0 +1,755 @@
 +/*
 + * linux/arch/arm/mach-s3c2410/mach-gta01.c
@@ -88,11 +88,8 @@
 +#include <asm/irq.h>
 +#include <asm/mach-types.h>
 +
-+#include <asm/arch/regs-serial.h>
 +#include <asm/arch/regs-gpio.h>
 +#include <asm/arch/fb.h>
-+#include <asm/arch/udc.h>
-+#include <asm/arch/nand.h>
 +#include <asm/arch/mci.h>
 +#include <asm/arch/ts.h>
 +#include <asm/arch/spi.h>
@@ -101,9 +98,12 @@
 +
 +#include <asm/arch/gta01.h>
 +
++#include <asm/plat-s3c/regs-serial.h>
++#include <asm/plat-s3c/nand.h>
 +#include <asm/plat-s3c24xx/devs.h>
 +#include <asm/plat-s3c24xx/cpu.h>
 +#include <asm/plat-s3c24xx/pm.h>
++#include <asm/plat-s3c24xx/udc.h>
 +
 +static struct map_desc gta01_iodesc[] __initdata = {
 +	{
@@ -787,10 +787,10 @@
 +MACHINE_END
 +
 +
-Index: linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/gta01.h
+Index: linux-2.6.22/include/asm-arm/arch-s3c2410/gta01.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/gta01.h
++++ linux-2.6.22/include/asm-arm/arch-s3c2410/gta01.h
 @@ -0,0 +1,70 @@
 +#ifndef _GTA01_H
 +#define _GTA01_H

Modified: branches/src/target/kernel/2.6.23.x/patches/gta01-pcf50606.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/gta01-pcf50606.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/gta01-pcf50606.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -1,9 +1,9 @@
 This is the PCF50606 power management unit driver for FIC GTA01
 
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/pcf50606.c
+Index: linux-2.6.22/drivers/i2c/chips/pcf50606.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/pcf50606.c
++++ linux-2.6.22/drivers/i2c/chips/pcf50606.c
 @@ -0,0 +1,1929 @@
 +/* Philips PCF50606 Power Management Unit (PMU) driver
 + *
@@ -1468,7 +1468,7 @@
 +
 +static int pcf50606bl_get_intensity(struct backlight_device *bd)
 +{
-+	struct pcf50606_data *pcf = class_get_devdata(&bd->class_dev);
++	struct pcf50606_data *pcf = bl_get_data(bd);
 +	int intensity = reg_read(pcf, PCF50606_REG_PWMC1);
 +	intensity = (intensity >> PCF50606_PWMC1_DC_SHIFT);
 +
@@ -1477,7 +1477,7 @@
 +
 +static int pcf50606bl_set_intensity(struct backlight_device *bd)
 +{
-+	struct pcf50606_data *pcf = class_get_devdata(&bd->class_dev);
++	struct pcf50606_data *pcf = bl_get_data(bd);
 +	int intensity = bd->props.brightness;
 +
 +	if (bd->props.power != FB_BLANK_UNBLANK)
@@ -1934,10 +1934,10 @@
 +
 +module_init(pcf50606_init);
 +module_exit(pcf50606_exit);
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/pcf50606.h
+Index: linux-2.6.22/drivers/i2c/chips/pcf50606.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/pcf50606.h
++++ linux-2.6.22/drivers/i2c/chips/pcf50606.h
 @@ -0,0 +1,302 @@
 +#ifndef _PCF50606_H
 +#define _PCF50606_H
@@ -2241,11 +2241,11 @@
 +
 +#endif /* _PCF50606_H */
 +
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/Kconfig
+Index: linux-2.6.22/drivers/i2c/chips/Kconfig
 ===================================================================
---- linux-2.6.22.5-moko.orig/drivers/i2c/chips/Kconfig
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/Kconfig
-@@ -35,6 +35,17 @@
+--- linux-2.6.22.orig/drivers/i2c/chips/Kconfig
++++ linux-2.6.22/drivers/i2c/chips/Kconfig
+@@ -51,6 +51,17 @@
  	  This driver can also be built as a module.  If so, the module
  	  will be called eeprom.
  
@@ -2263,11 +2263,11 @@
  config SENSORS_PCF8574
  	tristate "Philips PCF8574 and PCF8574A"
  	depends on EXPERIMENTAL
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/Makefile
+Index: linux-2.6.22/drivers/i2c/chips/Makefile
 ===================================================================
---- linux-2.6.22.5-moko.orig/drivers/i2c/chips/Makefile
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/Makefile
-@@ -8,6 +8,7 @@
+--- linux-2.6.22.orig/drivers/i2c/chips/Makefile
++++ linux-2.6.22/drivers/i2c/chips/Makefile
+@@ -9,6 +9,7 @@
  obj-$(CONFIG_SENSORS_MAX6875)	+= max6875.o
  obj-$(CONFIG_SENSORS_M41T00)	+= m41t00.o
  obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539.o
@@ -2275,10 +2275,10 @@
  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
  obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o
-Index: linux-2.6.22.5-moko/include/linux/i2c-id.h
+Index: linux-2.6.22/include/linux/i2c-id.h
 ===================================================================
---- linux-2.6.22.5-moko.orig/include/linux/i2c-id.h
-+++ linux-2.6.22.5-moko/include/linux/i2c-id.h
+--- linux-2.6.22.orig/include/linux/i2c-id.h
++++ linux-2.6.22/include/linux/i2c-id.h
 @@ -161,6 +161,7 @@
  #define I2C_DRIVERID_FSCHER 1046
  #define I2C_DRIVERID_W83L785TS 1047
@@ -2287,10 +2287,10 @@
  
  /*
   * ---- Adapter types ----------------------------------------------------
-Index: linux-2.6.22.5-moko/include/linux/pcf50606.h
+Index: linux-2.6.22/include/linux/pcf50606.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/include/linux/pcf50606.h
++++ linux-2.6.22/include/linux/pcf50606.h
 @@ -0,0 +1,104 @@
 +#ifndef _LINUX_PCF50606_H
 +#define _LINUX_PCF50606_H

Modified: branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -2,10 +2,10 @@
 uses the existing LED class driver framework, since there's a lot of
 similarity between the LED and the vibrator function.
 
-Index: linux-2.6.23-rc8/drivers/leds/leds-gta01.c
+Index: linux-2.6.22/drivers/leds/leds-gta01.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.23-rc8/drivers/leds/leds-gta01.c
++++ linux-2.6.22/drivers/leds/leds-gta01.c
 @@ -0,0 +1,133 @@
 +/*
 + * LED driver for the FIC GTA01 (Neo1973) GSM Phone Vibrator
@@ -43,7 +43,7 @@
 +
 +static inline struct gta01_vib_priv *to_vpriv(struct led_classdev *led_cdev)
 +{
-+	return dev_get_drvdata(led_cdev->class_dev->dev);
++	return dev_get_drvdata(led_cdev->dev);
 +}
 +
 +static void gta01vib_vib_set(struct led_classdev *led_cdev, enum led_brightness value)
@@ -140,10 +140,10 @@
 +MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
 +MODULE_DESCRIPTION("FIC GTA01 Vibrator driver");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.23-rc8/drivers/leds/Kconfig
+Index: linux-2.6.22/drivers/leds/Kconfig
 ===================================================================
---- linux-2.6.23-rc8.orig/drivers/leds/Kconfig
-+++ linux-2.6.23-rc8/drivers/leds/Kconfig
+--- linux-2.6.22.orig/drivers/leds/Kconfig
++++ linux-2.6.22/drivers/leds/Kconfig
 @@ -101,6 +101,12 @@
  	  outputs. To be useful the particular board must have LEDs
  	  and they must be connected to the GPIO lines.
@@ -157,10 +157,10 @@
  comment "LED Triggers"
  
  config LEDS_TRIGGERS
-Index: linux-2.6.23-rc8/drivers/leds/Makefile
+Index: linux-2.6.22/drivers/leds/Makefile
 ===================================================================
---- linux-2.6.23-rc8.orig/drivers/leds/Makefile
-+++ linux-2.6.23-rc8/drivers/leds/Makefile
+--- linux-2.6.22.orig/drivers/leds/Makefile
++++ linux-2.6.22/drivers/leds/Makefile
 @@ -17,6 +17,7 @@
  obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o
  obj-$(CONFIG_LEDS_COBALT)		+= leds-cobalt.o

Modified: branches/src/target/kernel/2.6.23.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/gta02-core.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/gta02-core.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -1,7 +1,7 @@
-Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2440/mach-gta02.c
+Index: linux-2.6.22/arch/arm/mach-s3c2440/mach-gta02.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2440/mach-gta02.c
++++ linux-2.6.22/arch/arm/mach-s3c2440/mach-gta02.c
 @@ -0,0 +1,668 @@
 +/*
 + * linux/arch/arm/mach-s3c2440/mach-gta02.c
@@ -59,12 +59,9 @@
 +#include <asm/irq.h>
 +#include <asm/mach-types.h>
 +
-+#include <asm/arch/regs-serial.h>
 +#include <asm/arch/regs-gpio.h>
 +#include <asm/arch/regs-gpioj.h>
 +#include <asm/arch/fb.h>
-+#include <asm/arch/udc.h>
-+#include <asm/arch/nand.h>
 +#include <asm/arch/mci.h>
 +#include <asm/arch/ts.h>
 +#include <asm/arch/spi.h>
@@ -74,9 +71,12 @@
 +#include <asm/arch/gta01.h>
 +#include <asm/arch/gta02.h>
 +
++#include <asm/plat-s3c/regs-serial.h>
++#include <asm/plat-s3c/nand.h>
 +#include <asm/plat-s3c24xx/devs.h>
 +#include <asm/plat-s3c24xx/cpu.h>
 +#include <asm/plat-s3c24xx/pm.h>
++#include <asm/plat-s3c24xx/udc.h>
 +
 +#include <linux/glamofb.h>
 +
@@ -671,10 +671,10 @@
 +	.init_machine	= gta02_machine_init,
 +	.timer		= &s3c24xx_timer,
 +MACHINE_END
-Index: linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/gta02.h
+Index: linux-2.6.22/include/asm-arm/arch-s3c2410/gta02.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/gta02.h
++++ linux-2.6.22/include/asm-arm/arch-s3c2410/gta02.h
 @@ -0,0 +1,28 @@
 +#ifndef _GTA02_H
 +#define _GTA02_H
@@ -704,11 +704,11 @@
 +#define GTA02v2_GPIO_3D_RESET	S3C2440_GPJ4
 +
 +#endif /* _GTA02_H */
-Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2440/Kconfig
+Index: linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
 ===================================================================
---- linux-2.6.22.5-moko.orig/arch/arm/mach-s3c2440/Kconfig
-+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2440/Kconfig
-@@ -73,5 +73,12 @@
+--- linux-2.6.22.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+@@ -74,5 +74,12 @@
  	help
  	   Say Y here if you are using the FIC Neo1973 GSM Phone
  
@@ -721,19 +721,19 @@
 +
  endmenu
  
-Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2440/Makefile
+Index: linux-2.6.22/arch/arm/mach-s3c2440/Makefile
 ===================================================================
---- linux-2.6.22.5-moko.orig/arch/arm/mach-s3c2440/Makefile
-+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2440/Makefile
+--- linux-2.6.22.orig/arch/arm/mach-s3c2440/Makefile
++++ linux-2.6.22/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.5-moko/arch/arm/common/gta01_pm_bt.c
+Index: linux-2.6.22/arch/arm/common/gta01_pm_bt.c
 ===================================================================
---- linux-2.6.22.5-moko.orig/arch/arm/common/gta01_pm_bt.c
-+++ linux-2.6.22.5-moko/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
 @@ -19,22 +19,40 @@
  #include <linux/pcf50606.h>
  
@@ -852,10 +852,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.5-moko/arch/arm/common/gta01_pm_gsm.c
+Index: linux-2.6.22/arch/arm/common/gta01_pm_gsm.c
 ===================================================================
---- linux-2.6.22.5-moko.orig/arch/arm/common/gta01_pm_gsm.c
-+++ linux-2.6.22.5-moko/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
 @@ -19,7 +19,9 @@
  #include <linux/errno.h>
  
@@ -926,10 +926,10 @@
  
  	return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
  }
-Index: linux-2.6.22.5-moko/drivers/leds/leds-gta01.c
+Index: linux-2.6.22/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
+--- linux-2.6.22.orig/drivers/leds/leds-gta01.c
++++ linux-2.6.22/drivers/leds/leds-gta01.c
 @@ -71,7 +71,7 @@
  	struct gta01_vib_priv *vp;
  	struct resource *r;
@@ -939,10 +939,10 @@
  		return -EIO;
  
  	r = platform_get_resource(pdev, 0, 0);
-Index: linux-2.6.22.5-moko/sound/soc/s3c24xx/neo1973_wm8753.c
+Index: linux-2.6.22/sound/soc/s3c24xx/neo1973_wm8753.c
 ===================================================================
---- linux-2.6.22.5-moko.orig/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ linux-2.6.22.5-moko/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
 @@ -638,6 +638,12 @@
  {
  	int ret;

Modified: branches/src/target/kernel/2.6.23.x/patches/hxd8-core.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/hxd8-core.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/hxd8-core.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -1,7 +1,9 @@
 This patch adds another machine, the FIC HXD8
---- linux-2.6.22.1.orig/arch/arm/mach-s3c2440/Kconfig
-+++ linux-2.6.22.1/arch/arm/mach-s3c2440/Kconfig
-@@ -66,6 +66,12 @@
+Index: linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+===================================================================
+--- linux-2.6.22.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+@@ -67,6 +67,12 @@
  	default y if ARCH_S3C2440
  	select CPU_S3C2440
  
@@ -14,15 +16,19 @@
  
  endmenu
  
---- linux-2.6.22.1.orig/arch/arm/mach-s3c2440/Makefile
-+++ linux-2.6.22.1/arch/arm/mach-s3c2440/Makefile
+Index: linux-2.6.22/arch/arm/mach-s3c2440/Makefile
+===================================================================
+--- linux-2.6.22.orig/arch/arm/mach-s3c2440/Makefile
++++ linux-2.6.22/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
+===================================================================
 --- /dev/null
-+++ linux-2.6.22.1/arch/arm/mach-s3c2440/mach-hxd8.c
++++ linux-2.6.22/arch/arm/mach-s3c2440/mach-hxd8.c
 @@ -0,0 +1,399 @@
 +/* linux/arch/arm/mach-s3c2440/mach-hxd8.c
 + *
@@ -78,13 +84,10 @@
 +#include <asm/mach-types.h>
 +
 +//#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 <asm/arch/udc.h>
-+#include <asm/arch/nand.h>
 +#include <asm/arch/mci.h>
 +#include <asm/arch/ts.h>
 +#include <asm/arch/spi.h>
@@ -97,9 +100,12 @@
 +//#include "s3c2410.h"
 +//#include "s3c2440.h"
 +//#include "clock.h"
++#include <asm/plat-s3c/regs-serial.h>
++#include <asm/plat-s3c/nand.h>
 +#include <asm/plat-s3c24xx/devs.h>
 +#include <asm/plat-s3c24xx/cpu.h>
 +#include <asm/plat-s3c24xx/pm.h>
++#include <asm/plat-s3c24xx/udc.h>
 +
 +static struct map_desc hxd8_iodesc[] __initdata = {
 +	/* ISA IO Space map (memory space selected by A24) */
@@ -423,8 +429,10 @@
 +	.init_machine	= hxd8_machine_init,
 +	.timer		= &s3c24xx_timer,
 +MACHINE_END
+Index: linux-2.6.22/include/asm-arm/arch-s3c2440/hxd8.h
+===================================================================
 --- /dev/null
-+++ linux-2.6.22.1/include/asm-arm/arch-s3c2440/hxd8.h
++++ linux-2.6.22/include/asm-arm/arch-s3c2440/hxd8.h
 @@ -0,0 +1,16 @@
 +#ifndef _HXD8_H
 +#define _HXD8_H

Added: branches/src/target/kernel/2.6.23.x/patches/neo1973-soc-include-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/neo1973-soc-include-fix.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/neo1973-soc-include-fix.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -0,0 +1,41 @@
+Index: linux-2.6.22/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
+@@ -30,13 +30,15 @@
+ 
+ #include <asm/mach-types.h>
+ #include <asm/hardware/scoop.h>
+-#include <asm/arch/regs-iis.h>
+ #include <asm/arch/regs-clock.h>
+ #include <asm/arch/regs-gpio.h>
+ #include <asm/hardware.h>
+ #include <asm/arch/audio.h>
+ #include <asm/io.h>
+ #include <asm/arch/spi-gpio.h>
++
++#include <asm/plat-s3c24xx/regs-iis.h>
++
+ #include "../codecs/wm8753.h"
+ #include "lm4857.h"
+ #include "s3c24xx-pcm.h"
+Index: linux-2.6.22/sound/soc/s3c24xx/s3c24xx-i2s.c
+===================================================================
+--- linux-2.6.22.orig/sound/soc/s3c24xx/s3c24xx-i2s.c
++++ linux-2.6.22/sound/soc/s3c24xx/s3c24xx-i2s.c
+@@ -33,13 +33,14 @@
+ 
+ #include <asm/hardware.h>
+ #include <asm/io.h>
+-#include <asm/arch/regs-iis.h>
+ #include <asm/arch/regs-gpio.h>
+ #include <asm/arch/regs-clock.h>
+ #include <asm/arch/audio.h>
+ #include <asm/dma.h>
+ #include <asm/arch/dma.h>
+ 
++#include <asm/plat-s3c24xx/regs-iis.h>
++
+ #include "s3c24xx-pcm.h"
+ #include "s3c24xx-i2s.h"
+ 

Modified: branches/src/target/kernel/2.6.23.x/patches/pcf50633.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/pcf50633.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/pcf50633.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -1,8 +1,8 @@
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/Kconfig
+Index: linux-2.6.22/drivers/i2c/chips/Kconfig
 ===================================================================
---- linux-2.6.22.5-moko.orig/drivers/i2c/chips/Kconfig
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/Kconfig
-@@ -45,6 +45,15 @@
+--- linux-2.6.22.orig/drivers/i2c/chips/Kconfig
++++ linux-2.6.22/drivers/i2c/chips/Kconfig
+@@ -61,6 +61,15 @@
  	  This driver can also be built as a module.  If so, the module
  	  will be called pcf50606.
  
@@ -18,11 +18,11 @@
  
  config SENSORS_PCF8574
  	tristate "Philips PCF8574 and PCF8574A"
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/Makefile
+Index: linux-2.6.22/drivers/i2c/chips/Makefile
 ===================================================================
---- linux-2.6.22.5-moko.orig/drivers/i2c/chips/Makefile
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/Makefile
-@@ -9,6 +9,7 @@
+--- linux-2.6.22.orig/drivers/i2c/chips/Makefile
++++ linux-2.6.22/drivers/i2c/chips/Makefile
+@@ -10,6 +10,7 @@
  obj-$(CONFIG_SENSORS_M41T00)	+= m41t00.o
  obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539.o
  obj-$(CONFIG_SENSORS_PCF50606)	+= pcf50606.o
@@ -30,10 +30,10 @@
  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
  obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/pcf50633.c
+Index: linux-2.6.22/drivers/i2c/chips/pcf50633.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/pcf50633.c
++++ linux-2.6.22/drivers/i2c/chips/pcf50633.c
 @@ -0,0 +1,1716 @@
 +/* Philips PCF50633 Power Management Unit (PMU) driver
 + *
@@ -1265,7 +1265,7 @@
 +
 +static int pcf50633bl_get_intensity(struct backlight_device *bd)
 +{
-+	struct pcf50633_data *pcf = class_get_devdata(&bd->class_dev);
++	struct pcf50633_data *pcf = bl_get_data(bd);
 +	int intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
 +
 +	return intensity & 0x3f;
@@ -1273,7 +1273,7 @@
 +
 +static int pcf50633bl_set_intensity(struct backlight_device *bd)
 +{
-+	struct pcf50633_data *pcf = class_get_devdata(&bd->class_dev);
++	struct pcf50633_data *pcf = bl_get_data(bd);
 +	int intensity = bd->props.brightness;
 +	int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
 +	u_int8_t ledena;
@@ -1751,10 +1751,10 @@
 +
 +module_init(pcf50633_init);
 +module_exit(pcf50633_exit);
-Index: linux-2.6.22.5-moko/include/linux/pcf50633.h
+Index: linux-2.6.22/include/linux/pcf50633.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/include/linux/pcf50633.h
++++ linux-2.6.22/include/linux/pcf50633.h
 @@ -0,0 +1,103 @@
 +#ifndef _LINUX_PCF50633_H
 +#define _LINUX_PCF50633_H
@@ -1859,10 +1859,10 @@
 +};
 +
 +#endif /* _PCF50633_H */
-Index: linux-2.6.22.5-moko/include/linux/i2c-id.h
+Index: linux-2.6.22/include/linux/i2c-id.h
 ===================================================================
---- linux-2.6.22.5-moko.orig/include/linux/i2c-id.h
-+++ linux-2.6.22.5-moko/include/linux/i2c-id.h
+--- linux-2.6.22.orig/include/linux/i2c-id.h
++++ linux-2.6.22/include/linux/i2c-id.h
 @@ -163,6 +163,7 @@
  #define I2C_DRIVERID_OV7670 1048	/* Omnivision 7670 camera */
  #define I2C_DRIVERID_PCF50606 1049
@@ -1871,10 +1871,10 @@
  
  /*
   * ---- Adapter types ----------------------------------------------------
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/pcf50633.h
+Index: linux-2.6.22/drivers/i2c/chips/pcf50633.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/pcf50633.h
++++ linux-2.6.22/drivers/i2c/chips/pcf50633.h
 @@ -0,0 +1,402 @@
 +#ifndef _PCF50633_H
 +#define _PCF50633_H

Added: branches/src/target/kernel/2.6.23.x/patches/s3c2410-nand-include-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/s3c2410-nand-include-fix.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/s3c2410-nand-include-fix.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -0,0 +1,15 @@
+Index: linux-2.6.22/drivers/mtd/nand/s3c2410.c
+===================================================================
+--- linux-2.6.22.orig/drivers/mtd/nand/s3c2410.c
++++ linux-2.6.22/drivers/mtd/nand/s3c2410.c
+@@ -60,8 +60,8 @@
+ 
+ #include <asm/io.h>
+ 
+-#include <asm/arch/regs-nand.h>
+-#include <asm/arch/nand.h>
++#include <asm/plat-s3c/regs-nand.h>
++#include <asm/plat-s3c/nand.h>
+ 
+ #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
+ static int hardware_ecc = 1;

Added: branches/src/target/kernel/2.6.23.x/patches/s3c2410-udc-include-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/s3c2410-udc-include-fix.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/s3c2410-udc-include-fix.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -0,0 +1,16 @@
+Index: linux-2.6.22/drivers/usb/gadget/s3c2410_udc.c
+===================================================================
+--- linux-2.6.22.orig/drivers/usb/gadget/s3c2410_udc.c
++++ linux-2.6.22/drivers/usb/gadget/s3c2410_udc.c
+@@ -54,8 +54,9 @@
+ #include <asm/arch/hardware.h>
+ #include <asm/arch/regs-clock.h>
+ #include <asm/arch/regs-gpio.h>
+-#include <asm/arch/regs-udc.h>
+-#include <asm/arch/udc.h>
++
++#include <asm/plat-s3c24xx/udc.h>
++#include <asm/plat-s3c24xx/regs-udc.h>
+ 
+ #include <asm/mach-types.h>
+ 

Modified: branches/src/target/kernel/2.6.23.x/patches/s3c2410_touchscreen.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/s3c2410_touchscreen.patch	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/s3c2410_touchscreen.patch	2007-09-26 20:00:32 UTC (rev 3048)
@@ -1,7 +1,7 @@
-Index: linux-2.6.23-rc8/arch/arm/plat-s3c24xx/devs.c
+Index: linux-2.6.22/arch/arm/plat-s3c24xx/devs.c
 ===================================================================
---- linux-2.6.23-rc8.orig/arch/arm/plat-s3c24xx/devs.c
-+++ linux-2.6.23-rc8/arch/arm/plat-s3c24xx/devs.c
+--- linux-2.6.22.orig/arch/arm/plat-s3c24xx/devs.c
++++ linux-2.6.22/arch/arm/plat-s3c24xx/devs.c
 @@ -24,6 +24,7 @@
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
@@ -34,10 +34,10 @@
  /* USB Device (Gadget)*/
  
  static struct resource s3c_usbgadget_resource[] = {
-Index: linux-2.6.23-rc8/include/asm-arm/plat-s3c24xx/devs.h
+Index: linux-2.6.22/include/asm-arm/plat-s3c24xx/devs.h
 ===================================================================
---- linux-2.6.23-rc8.orig/include/asm-arm/plat-s3c24xx/devs.h
-+++ linux-2.6.23-rc8/include/asm-arm/plat-s3c24xx/devs.h
+--- linux-2.6.22.orig/include/asm-arm/plat-s3c24xx/devs.h
++++ linux-2.6.22/include/asm-arm/plat-s3c24xx/devs.h
 @@ -42,6 +42,7 @@
  extern struct platform_device s3c_device_timer3;
  
@@ -46,10 +46,10 @@
  
  /* s3c2440 specific devices */
  
-Index: linux-2.6.23-rc8/arch/arm/mach-s3c2410/mach-h1940.c
+Index: linux-2.6.22/arch/arm/mach-s3c2410/mach-h1940.c
 ===================================================================
---- linux-2.6.23-rc8.orig/arch/arm/mach-s3c2410/mach-h1940.c
-+++ linux-2.6.23-rc8/arch/arm/mach-s3c2410/mach-h1940.c
+--- linux-2.6.22.orig/arch/arm/mach-s3c2410/mach-h1940.c
++++ linux-2.6.22/arch/arm/mach-s3c2410/mach-h1940.c
 @@ -38,6 +38,7 @@
  #include <asm/arch/h1940.h>
  #include <asm/arch/h1940-latch.h>
@@ -86,10 +86,10 @@
   	s3c24xx_udc_set_platdata(&h1940_udc_cfg);
  
  	/* Turn off suspend on both USB ports, and switch the
-Index: linux-2.6.23-rc8/drivers/input/touchscreen/Kconfig
+Index: linux-2.6.22/drivers/input/touchscreen/Kconfig
 ===================================================================
---- linux-2.6.23-rc8.orig/drivers/input/touchscreen/Kconfig
-+++ linux-2.6.23-rc8/drivers/input/touchscreen/Kconfig
+--- linux-2.6.22.orig/drivers/input/touchscreen/Kconfig
++++ linux-2.6.22/drivers/input/touchscreen/Kconfig
 @@ -67,6 +67,24 @@
  	  To compile this driver as a module, choose M here: the
  	  module will be called fujitsu-ts.
@@ -115,20 +115,20 @@
  config TOUCHSCREEN_GUNZE
  	tristate "Gunze AHL-51S touchscreen"
  	select SERIO
-Index: linux-2.6.23-rc8/drivers/input/touchscreen/Makefile
+Index: linux-2.6.22/drivers/input/touchscreen/Makefile
 ===================================================================
---- linux-2.6.23-rc8.orig/drivers/input/touchscreen/Makefile
-+++ linux-2.6.23-rc8/drivers/input/touchscreen/Makefile
+--- linux-2.6.22.orig/drivers/input/touchscreen/Makefile
++++ linux-2.6.22/drivers/input/touchscreen/Makefile
 @@ -18,3 +18,4 @@
  obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+= touchright.o
  obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o
  obj-$(CONFIG_TOUCHSCREEN_UCB1400)	+= ucb1400_ts.o
 +obj-$(CONFIG_TOUCHSCREEN_S3C2410)	+= s3c2410_ts.o
-Index: linux-2.6.23-rc8/drivers/input/touchscreen/s3c2410_ts.c
+Index: linux-2.6.22/drivers/input/touchscreen/s3c2410_ts.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.23-rc8/drivers/input/touchscreen/s3c2410_ts.c
-@@ -0,0 +1,426 @@
++++ linux-2.6.22/drivers/input/touchscreen/s3c2410_ts.c
+@@ -0,0 +1,427 @@
 +/*
 + * This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -182,10 +182,11 @@
 +#include <asm/io.h>
 +#include <asm/irq.h>
 +
-+#include <asm/arch/regs-adc.h>
 +#include <asm/arch/regs-gpio.h>
 +#include <asm/arch/ts.h>
 +
++#include <asm/plat-s3c/regs-adc.h>
++
 +/* For ts.dev.id.version */
 +#define S3C2410TSVERSION	0x0101
 +
@@ -555,10 +556,10 @@
 +        c-basic-offset: 8
 +    End:
 +*/
-Index: linux-2.6.23-rc8/include/asm-arm/arch-s3c2410/ts.h
+Index: linux-2.6.22/include/asm-arm/arch-s3c2410/ts.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.23-rc8/include/asm-arm/arch-s3c2410/ts.h
++++ linux-2.6.22/include/asm-arm/arch-s3c2410/ts.h
 @@ -0,0 +1,28 @@
 +/* linux/include/asm/arch-s3c2410/ts.h
 + *
@@ -588,10 +589,10 @@
 +
 +#endif /* __ASM_ARM_TS_H */
 +
-Index: linux-2.6.23-rc8/arch/arm/plat-s3c24xx/s3c244x.c
+Index: linux-2.6.22/arch/arm/plat-s3c24xx/s3c244x.c
 ===================================================================
---- linux-2.6.23-rc8.orig/arch/arm/plat-s3c24xx/s3c244x.c
-+++ linux-2.6.23-rc8/arch/arm/plat-s3c24xx/s3c244x.c
+--- linux-2.6.22.orig/arch/arm/plat-s3c24xx/s3c244x.c
++++ linux-2.6.22/arch/arm/plat-s3c24xx/s3c244x.c
 @@ -67,6 +67,7 @@
  
  	s3c_device_i2c.name  = "s3c2440-i2c";

Modified: branches/src/target/kernel/2.6.23.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/series	2007-09-26 16:16:04 UTC (rev 3047)
+++ branches/src/target/kernel/2.6.23.x/patches/series	2007-09-26 20:00:32 UTC (rev 3048)
@@ -41,3 +41,6 @@
 s3c24xx-nand-largepage.patch
 s3c2442b-cpuid.patch
 gta02-core.patch
+s3c2410-nand-include-fix.patch
+s3c2410-udc-include-fix.patch
+neo1973-soc-include-fix.patch





More information about the commitlog mailing list