[Armadeus-commitlog] SF.net SVN: armadeus:[1327] trunk/buildroot/target/device/armadeus/linux/ kern
Brought to you by:
sszy
|
From: <ar...@us...> - 2009-06-04 09:51:41
|
Revision: 1327
http://armadeus.svn.sourceforge.net/armadeus/?rev=1327&view=rev
Author: artemys
Date: 2009-06-04 09:51:39 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[LINUX] Updates some 2.6.29 patches to prevent warnings when applying them (2nd pass)
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/096-armadeus-clock-add_ssi_clk.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/296-apf27-armadeus-imx27-usb-host1.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/320-apf27-armadeus-increase_max_dma_zone_size.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/321-apf27-armadeus-mx2_adds_pwm_ressources.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -1,8 +1,8 @@
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
+Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/imxfb.h
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-03-30 11:09:44.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-03-30 11:13:05.000000000 +0200
-@@ -82,3 +82,13 @@
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-06-04 11:30:48.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/imxfb.h 2009-06-04 11:30:49.000000000 +0200
+@@ -84,3 +84,13 @@
};
void set_imx_fb_info(struct imx_fb_platform_data *);
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/096-armadeus-clock-add_ssi_clk.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/096-armadeus-clock-add_ssi_clk.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/096-armadeus-clock-add_ssi_clk.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -1,5 +1,7 @@
---- linux-2.6.27.2.original/arch/arm/mach-imx/clock.c 2009-01-14 10:20:49.000000000 +0100
-+++ linux-2.6.27.2/arch/arm/mach-imx/clock.c 2009-01-14 09:55:02.000000000 +0100
+Index: linux-2.6.29.4/arch/arm/mach-imx/clock.c
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/clock.c 2009-06-04 11:30:48.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/clock.c 2009-06-04 11:38:52.000000000 +0200
@@ -151,6 +151,11 @@
.get_rate = imx_get_perclk3,
};
@@ -10,7 +12,7 @@
+};
+
static struct clk clk_usb_clk = {
- .name = "usb_clk",
+ .name = "usbd_clk",
.get_rate = imx_get_usb_clk,
@@ -165,6 +170,7 @@
&clk_mcu_clk,
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/296-apf27-armadeus-imx27-usb-host1.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/296-apf27-armadeus-imx27-usb-host1.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/296-apf27-armadeus-imx27-usb-host1.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -1,8 +1,8 @@
-Index: linux-2.6.29/arch/arm/mach-mx2/devices.c
+Index: linux-2.6.29.4/arch/arm/mach-mx2/devices.c
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-mx2/devices.c 2009-03-31 11:26:28.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-mx2/devices.c 2009-03-31 11:26:30.000000000 +0200
-@@ -605,6 +605,30 @@
+--- linux-2.6.29.4.orig/arch/arm/mach-mx2/devices.c 2009-06-04 11:30:50.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/devices.c 2009-06-04 11:30:50.000000000 +0200
+@@ -609,6 +609,30 @@
.num_resources = ARRAY_SIZE(mxc_otg_resources),
};
@@ -33,7 +33,7 @@
static struct resource mxc_ehci2_resources[] = {
{
.start = OTG_BASE_ADDR + 0x400,
-@@ -620,7 +644,7 @@
+@@ -624,7 +648,7 @@
struct platform_device mxc_ehci2 = {
.name = "mxc-ehci",
@@ -42,10 +42,10 @@
.dev = {
.coherent_dma_mask = 0xffffffff,
.dma_mask = &ehci2_dmamask,
-Index: linux-2.6.29/arch/arm/mach-mx2/devices.h
+Index: linux-2.6.29.4/arch/arm/mach-mx2/devices.h
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-mx2/devices.h 2009-03-31 10:36:30.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-mx2/devices.h 2009-03-31 11:26:30.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/mach-mx2/devices.h 2009-06-04 11:30:50.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/devices.h 2009-06-04 11:30:50.000000000 +0200
@@ -28,4 +28,5 @@
extern struct platform_device imx_ssi_device1;
extern struct platform_device mxc_dam_device;
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -1,6 +1,8 @@
---- linux-2.6.27.2.original/arch/arm/plat-mxc/include/mach/imxfb.h 2008-12-19 16:20:18.000000000 +0100
-+++ linux-2.6.27.2.mod/arch/arm/plat-mxc/include/mach/imxfb.h 2008-12-19 16:18:44.000000000 +0100
-@@ -83,3 +83,13 @@
+Index: linux-2.6.29.4/arch/arm/plat-mxc/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-06-04 11:30:50.000000000 +0200
++++ linux-2.6.29.4/arch/arm/plat-mxc/include/mach/imxfb.h 2009-06-04 11:30:50.000000000 +0200
+@@ -81,3 +81,13 @@
};
void set_imx_fb_info(struct imx_fb_platform_data *);
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -1,5 +1,7 @@
---- linux-2.6.27.13.orig/drivers/media/video/ad9889.c 2008-10-10 00:13:53.000000000 +0200
-+++ linux-2.6.27.13/drivers/media/video/ad9889.c 2009-03-01 08:29:01.000000000 +0100
+Index: linux-2.6.29.4/drivers/media/video/ad9889.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.4/drivers/media/video/ad9889.c 2009-06-04 11:36:41.000000000 +0200
@@ -0,0 +1,509 @@
+/*
+ * ad9889 - Analog Devices AD9889 video encoder driver
@@ -99,7 +101,7 @@
+}
+
+static void ad9889_av_mute_on(struct i2c_client *client)
-+{
++{
+ /* set chxPwrDwnI2C */
+ ad9889_write(client, 0xa1, 0x38);
+ /* set avmute*/
@@ -114,7 +116,6 @@
+ ad9889_write(client, 0x45, 0x80);
+}
+
-+
+static void ad9889_init(struct i2c_client *client)
+{
+ ad9889_av_mute_on(client);
@@ -142,14 +143,15 @@
+
+static void setup_audio_video(struct i2c_client *client)
+{
-+ unsigned char rgb_rgb[24] = {0x07, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0x07,
-+ 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0x07, 0xff, 0, 0};
++ unsigned char rgb_rgb[24] = { 0x07, 0xff, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0x07, 0xff, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0x07, 0xff, 0, 0 };
+ /* dvi */
+ ad9889_write(client, 0xaf, 0x04);
+ /* write color map */
+ i2c_smbus_write_block_data(client, 0x17,24,rgb_rgb);
+ /* set CSC mode */
-+ ad9889_write(client, 0x17, 0x08);
++ ad9889_write(client, 0x17, 0x08);
+ /* disable CSC */
+ ad9889_write(client, 0x3b, 0x01);
+ /* check input mode */
@@ -164,7 +166,7 @@
+{
+ union i2c_smbus_data data;
+ struct ad9889_config* config = client->dev.platform_data;
-+ struct ad9889_dev *ad9889 = i2c_get_clientdata(client);
++ struct ad9889_dev *ad9889 = i2c_get_clientdata(client);
+ int status, i;
+
+ /* EDID ram base address */
@@ -186,7 +188,7 @@
+int handle_edid_interrupt(struct i2c_client *client)
+{
+ unsigned char edid_dat[256];
-+
++
+ if( EDID_ram_read_data(client, edid_dat) < 0 )
+ printk(KERN_ERR "error when reading EDID\n");
+ else{
@@ -211,9 +213,10 @@
+static void handle_hpd_interrupt(struct i2c_client *client)
+{
+ struct ad9889_config *pdata = client->dev.platform_data;
-+ if(ad9889_read(client, 0x42)&0x40) {
++
++ if (ad9889_read(client, 0x42)&0x40) {
+ /* wait until the cable is really inserted */
-+ mdelay(500);
++ mdelay(500);
+ /* set chxPwrDwnI2C down */
+ ad9889_write(client, 0xa1, 0x38);
+ /* power up chip */
@@ -222,9 +225,8 @@
+ ad9889_write(client, 0x95, 0xC3);
+ if(pdata->display_connected)
+ pdata->display_connected();
-+ }
-+ else{
-+ if(pdata->display_disconnected)
++ } else {
++ if (pdata->display_disconnected)
+ pdata->display_disconnected();
+ }
+}
@@ -291,7 +293,7 @@
+ /*Check if additional interrupts occured during processing*/
+ interrupt_remain1 = ad9889_read(client, 0x96);
+ interrupt_remain2 = ad9889_read(client, 0x97);
-+ }
++ }
+ mutex_unlock(&ad9889->lock_sync);
+}
+
@@ -332,7 +334,7 @@
+
+ return len;
+}
-+
++
+static int ad9889_proc_write_register( __attribute__ ((unused)) struct file *file, const char *buf, unsigned long count, void *data)
+{
+ int len, ret;
@@ -426,15 +428,15 @@
+ goto err_irq;
+ }
+
-+ /* check whether the AD9889 is present */
-+ if( ad9889_read(client, 0xA5) != 0x04 ){
++ /* check whether the AD9889 is present */
++ if (ad9889_read(client, 0xA5) != 0x04) {
+ printk("ad9889 not found\n");
+ err = -ENODEV;
+ goto err_presence;
-+ }
++ }
+
+ ad9889->edid_ram = i2c_new_dummy(client->adapter, pdata->EDID_I2C_addr);
-+ if( !ad9889->edid_ram ){
++ if (!ad9889->edid_ram) {
+ printk("error: can't add i2c device at 0x%x\n", pdata->EDID_I2C_addr);
+ goto err_presence;
+ }
@@ -443,12 +445,12 @@
+ /* reset */
+ ad9889_write(client, 0x41, 0X60);
+ mdelay(10);
-+
++
+ mutex_unlock(&ad9889->lock_sync);
-+
++
+ /* if a monitor is already connected, then simulate interrupt */
+ err = ad9889_read(client, 0x42);
-+ if( err & 0x40){
++ if (err & 0x40) {
+ /* power up */
+ ad9889->force_hpd = 1;
+ schedule_work(&ad9889->work);
@@ -505,13 +507,15 @@
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+ .name = "ad9889",
-+ //.command = ad9889_command,
++ /*.command = ad9889_command,*/
+ .probe = ad9889_probe,
+ .remove = ad9889_remove,
+ .id_table = ad9889_id,
+};
---- linux-2.6.27.13.orig/include/media/ad9889.h 2008-10-10 00:13:53.000000000 +0200
-+++ linux-2.6.27.13/include/media/ad9889.h 2009-03-01 08:29:01.000000000 +0100
+Index: linux-2.6.29.4/include/media/ad9889.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.4/include/media/ad9889.h 2009-06-04 11:30:50.000000000 +0200
@@ -0,0 +1,34 @@
+/*
+ * AD9889 driver
@@ -547,9 +551,11 @@
+
+
+#endif /* __LINUX_VIDE0_AD9889_H */
---- linux-2.6.27.13.orig/drivers/media/video/Makefile 2009-03-08 15:26:08.000000000 +0100
-+++ linux-2.6.27.13/drivers/media/video/Makefile 2009-03-07 19:02:17.000000000 +0100
-@@ -46,6 +46,7 @@ obj-$(CONFIG_VIDEO_SAA717X) += saa717x.o
+Index: linux-2.6.29.4/drivers/media/video/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/drivers/media/video/Makefile 2009-06-04 11:30:49.000000000 +0200
++++ linux-2.6.29.4/drivers/media/video/Makefile 2009-06-04 11:30:50.000000000 +0200
+@@ -50,6 +50,7 @@
obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
@@ -557,9 +563,11 @@
obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
---- linux-2.6.27.13.orig/drivers/media/video/Kconfig 2009-03-08 15:26:08.000000000 +0100
-+++ linux-2.6.27.13.orig/drivers/media/video/Kconfig 2009-03-07 19:02:02.000000000 +0100
-@@ -407,6 +407,16 @@ config VIDEO_SAA7185
+Index: linux-2.6.29.4/drivers/media/video/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/media/video/Kconfig 2009-06-04 11:30:49.000000000 +0200
++++ linux-2.6.29.4/drivers/media/video/Kconfig 2009-06-04 11:30:50.000000000 +0200
+@@ -428,6 +428,16 @@
To compile this driver as a module, choose M here: the
module will be called saa7185.
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/320-apf27-armadeus-increase_max_dma_zone_size.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/320-apf27-armadeus-increase_max_dma_zone_size.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/320-apf27-armadeus-increase_max_dma_zone_size.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -3,13 +3,13 @@
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.27.13/arch/arm/plat-mxc/include/mach/memory.h
+Index: linux-2.6.29.4/arch/arm/plat-mxc/include/mach/memory.h
===================================================================
---- linux-2.6.27.13.orig/arch/arm/plat-mxc/include/mach/memory.h 2009-03-27 17:52:54.000000000 +0100
-+++ linux-2.6.27.13/arch/arm/plat-mxc/include/mach/memory.h 2009-03-27 17:58:35.000000000 +0100
-@@ -26,4 +26,7 @@
- */
- #define __bus_to_virt(a) __phys_to_virt(a)
+--- linux-2.6.29.4.orig/arch/arm/plat-mxc/include/mach/memory.h 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/plat-mxc/include/mach/memory.h 2009-06-04 11:24:55.000000000 +0200
+@@ -19,4 +19,7 @@
+ #define PHYS_OFFSET UL(0x80000000)
+ #endif
+/* Override the ARM default */
+#define CONSISTENT_DMA_SIZE SZ_4M
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/321-apf27-armadeus-mx2_adds_pwm_ressources.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/321-apf27-armadeus-mx2_adds_pwm_ressources.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/321-apf27-armadeus-mx2_adds_pwm_ressources.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -3,11 +3,11 @@
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/arch/arm/mach-mx2/devices.c
+Index: linux-2.6.29.4/arch/arm/mach-mx2/devices.c
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-mx2/devices.c 2009-04-14 19:03:43.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-mx2/devices.c 2009-04-14 19:04:01.000000000 +0200
-@@ -653,6 +653,25 @@
+--- linux-2.6.29.4.orig/arch/arm/mach-mx2/devices.c 2009-06-04 11:24:54.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/devices.c 2009-06-04 11:29:59.000000000 +0200
+@@ -657,6 +657,25 @@
.resource = mxc_ehci2_resources,
};
@@ -20,7 +20,7 @@
+ [1] = {
+ .start = (MXC_INT_PWM),
+ .end = (MXC_INT_PWM),
-+ .flags = IORESOURCE_IRQ,
++ .flags = IORESOURCE_IRQ,
+ },
+};
+
@@ -33,10 +33,10 @@
/* GPIO port description */
static struct mxc_gpio_port imx_gpio_ports[] = {
-Index: linux-2.6.29/arch/arm/mach-mx2/devices.h
+Index: linux-2.6.29.4/arch/arm/mach-mx2/devices.h
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-mx2/devices.h 2009-04-14 19:03:43.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-mx2/devices.h 2009-04-14 19:04:01.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/mach-mx2/devices.h 2009-06-04 11:24:54.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/devices.h 2009-06-04 11:24:55.000000000 +0200
@@ -30,3 +30,4 @@
extern struct platform_device mxc_otg;
extern struct platform_device mxc_ehci1;
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -5,13 +5,13 @@
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/drivers/video/imxfb.c
+Index: linux-2.6.29.4/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:35:11.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 19:37:34.000000000 +0200
-@@ -392,10 +392,10 @@
+--- linux-2.6.29.4.orig/drivers/video/imxfb.c 2009-06-04 11:24:55.000000000 +0200
++++ linux-2.6.29.4/drivers/video/imxfb.c 2009-06-04 11:28:59.000000000 +0200
+@@ -397,10 +397,10 @@
- writel(RMCR_LCDC_EN, fbi->regs + LCDC_RMCR);
+ clk_enable(fbi->clk);
- if (fbi->backlight_power)
- fbi->backlight_power(1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|