From: cmc-ubuntu <cmc@ubuntu.(none)>
Date: Thu, 11 Nov 2010 14:09:34 +0000 (+0800)
Subject: fix conflict for commit spi & touch screen driver
X-Git-Tag: firefly_0821_release~11031
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4a6b5340a6406a25872531ab28ce75cdaddcfa8b;p=firefly-linux-kernel-4.4.55.git

fix conflict for commit spi & touch screen driver
---

4a6b5340a6406a25872531ab28ce75cdaddcfa8b
diff --cc arch/arm/mach-rk29/board-rk29sdk.c
index 5dd72399ac5f,8ba184163f5b..9bf9d51fc587
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@@ -459,11 -541,21 +543,25 @@@ static void __init rk29_board_iomux_ini
  static struct platform_device *devices[] __initdata = {
  #ifdef CONFIG_UART1_RK29
  	&rk29_device_uart1,
 +#endif	
 +#ifdef CONFIG_SPIM_RK29XX
 +    &rk29xx_device_spi0m,
 +    &rk29xx_device_spi1m,
  #endif
+ 
+ #ifdef CONFIG_I2C0_RK29
+ 	&rk29_device_i2c0,
+ #endif
+ #ifdef CONFIG_I2C1_RK29
+ 	&rk29_device_i2c1,
+ #endif
+ #ifdef CONFIG_I2C2_RK29
+ 	&rk29_device_i2c2,
+ #endif
+ #ifdef CONFIG_I2C3_RK29
+ 	&rk29_device_i2c3,
+ #endif
+ 
  #ifdef CONFIG_SDMMC0_RK29	
  	&rk29_device_sdmmc0,
  #endif
@@@ -684,10 -590,25 +782,27 @@@ static void __init machine_rk29_init_ir
  }
  
  static void __init machine_rk29_board_init(void)
 -{
 +{ 
 +        rk29_board_iomux_init();
- 	platform_add_devices(devices, ARRAY_SIZE(devices));	
++		platform_add_devices(devices, ARRAY_SIZE(devices));	
+ #ifdef CONFIG_I2C0_RK29
+ 	i2c_register_board_info(default_i2c0_data.bus_num, board_i2c0_devices,
+ 			ARRAY_SIZE(board_i2c0_devices));
+ #endif
+ #ifdef CONFIG_I2C1_RK29
+ 	i2c_register_board_info(default_i2c1_data.bus_num, board_i2c1_devices,
+ 			ARRAY_SIZE(board_i2c1_devices));
+ #endif
+ #ifdef CONFIG_I2C2_RK29
+ 	i2c_register_board_info(default_i2c2_data.bus_num, board_i2c2_devices,
+ 			ARRAY_SIZE(board_i2c2_devices));
+ #endif
+ #ifdef CONFIG_I2C3_RK29
+ 	i2c_register_board_info(default_i2c3_data.bus_num, board_i2c3_devices,
+ 			ARRAY_SIZE(board_i2c3_devices));
+ #endif
 -	platform_add_devices(devices, ARRAY_SIZE(devices));	
 -	rk29_board_iomux_init();
++
 +	spi_register_board_info(board_spi_devices, ARRAY_SIZE(board_spi_devices));
  }
  
  static void __init machine_rk29_fixup(struct machine_desc *desc, struct tag *tags,
diff --cc arch/arm/mach-rk29/devices.c
index 6f9b03927938,521f7c4f176f..ee664a305f84
--- a/arch/arm/mach-rk29/devices.c
+++ b/arch/arm/mach-rk29/devices.c
@@@ -19,10 -19,95 +19,97 @@@
  #include <linux/delay.h>
  #include <mach/irqs.h>
  #include <mach/rk29_iomap.h>
 +#include <mach/rk29-dma-pl330.h> 
  #include "devices.h"
+ #ifdef CONFIG_I2C_RK29
+ static struct resource resources_i2c0[] = {
+ 	{
+ 		.start	= IRQ_I2C0,
+ 		.end	= IRQ_I2C0,
+ 		.flags	= IORESOURCE_IRQ,
+ 	},
+ 	{
+ 		.start	= RK29_I2C0_PHYS,
+ 		.end	= RK29_I2C0_PHYS + SZ_4K - 1,
+ 		.flags	= IORESOURCE_MEM,
+ 	},
+ };
+ static struct resource resources_i2c1[] = {
+ 	{
+ 		.start	= IRQ_I2C1,
+ 		.end	= IRQ_I2C1,
+ 		.flags	= IORESOURCE_IRQ,
+ 	},
+ 	{
+ 		.start	= RK29_I2C1_PHYS,
+ 		.end	= RK29_I2C1_PHYS + SZ_4K - 1,
+ 		.flags	= IORESOURCE_MEM,
+ 	},
+ };
+ static struct resource resources_i2c2[] = {
+ 	{
+ 		.start	= IRQ_I2C2,
+ 		.end	= IRQ_I2C2,
+ 		.flags	= IORESOURCE_IRQ,
+ 	},
+ 	{
+ 		.start	= RK29_I2C2_PHYS,
+ 		.end	= RK29_I2C2_PHYS + SZ_4K - 1,
+ 		.flags	= IORESOURCE_MEM,
+ 	},
+ };
+ static struct resource resources_i2c3[] = {
+ 	{
+ 		.start	= IRQ_I2C3,
+ 		.end	= IRQ_I2C3,
+ 		.flags	= IORESOURCE_IRQ,
+ 	},
+ 	{
+ 		.start	= RK29_I2C3_PHYS,
+ 		.end	= RK29_I2C3_PHYS + SZ_4K - 1,
+ 		.flags	= IORESOURCE_MEM,
+ 	},
+ };
+ 
+ struct platform_device rk29_device_i2c0 = {
+ 	.name	= "rk29_i2c",
+ 	.id	= 0,
+ 	.num_resources	= ARRAY_SIZE(resources_i2c0),
+ 	.resource	= resources_i2c0,
+ 	.dev 			= {
+ 		.platform_data = &default_i2c0_data,
+ 	},
+ };
+ struct platform_device rk29_device_i2c1 = {
+ 	.name	= "rk29_i2c",
+ 	.id	= 1,
+ 	.num_resources	= ARRAY_SIZE(resources_i2c1),
+ 	.resource	= resources_i2c1,
+ 	.dev 			= {
+ 		.platform_data = &default_i2c1_data,
+ 	},
+ };
+ struct platform_device rk29_device_i2c2 = {
+ 	.name	= "rk29_i2c",
+ 	.id	= 2,
+ 	.num_resources	= ARRAY_SIZE(resources_i2c2),
+ 	.resource	= resources_i2c2,
+ 	.dev 			= {
+ 		.platform_data = &default_i2c2_data,
+ 	},
+ };
+ struct platform_device rk29_device_i2c3 = {
+ 	.name	= "rk29_i2c",
+ 	.id	= 3,
+ 	.num_resources	= ARRAY_SIZE(resources_i2c3),
+ 	.resource	= resources_i2c3,
+ 	.dev 			= {
+ 		.platform_data = &default_i2c3_data,
+ 	},
+ };
+ #endif
  
 +
  #ifdef CONFIG_SDMMC0_RK29 
  static struct resource resources_sdmmc0[] = {
  	{