phh

diff --git a/arch/arm/mach-msm/board-htcdiamond-panel.c b/arch/arm/mach-msm/board-htcdiamond-panel.cindex c28a2cf..f8640f2 100644--- a/arch/arm/mach-msm/board-htcdiamond-panel.c+++ b/arch/arm/mach-msm/board-htcdiamond-panel.c@@ -500,7 +500,7 @@ static struct msm_mddi_platform_data mddi_pdata = { 	.client_platform_data = { 		{ 			.product_id = (0xd263 << 16 | 0),-			.name = "mddi_c_d263_0000",+			.name = "TC358720XBG", 			.id = 0, 			.client_data = &toshiba_client_data, 			.clk_rate = 0,diff --git a/arch/arm/mach-msm/board-htcdiamond.c b/arch/arm/mach-msm/board-htcdiamond.cindex ce29a37..80e20ba 100644--- a/arch/arm/mach-msm/board-htcdiamond.c+++ b/arch/arm/mach-msm/board-htcdiamond.c@@ -158,12 +158,10 @@ static struct i2c_board_info i2c_devices[] = { 		// Raphael NaviPad (cy8c20434) 		I2C_BOARD_INFO("raph_navi_pad", 0x62), 	},-/* 	{ 		// Accelerometer 		I2C_BOARD_INFO("kionix-kxsd9", 0x18), 	},-*/ };  static struct android_pmem_platform_data android_pmem_pdata = {diff --git a/arch/arm/mach-msm/devices.c b/arch/arm/mach-msm/devices.cindex b0b0e74..40fabf8 100644--- a/arch/arm/mach-msm/devices.c+++ b/arch/arm/mach-msm/devices.c@@ -283,8 +283,8 @@ static struct resource resources_sdc1[] = { 		.flags	= IORESOURCE_IRQ, 	}, 	{-		.start	= 8,-		.end	= 8,+		.start	= DMOV_SDC1_CHAN,+		.end	= DMOV_SDC1_CHAN, 		.flags	= IORESOURCE_DMA, 	}, };@@ -301,8 +301,8 @@ static struct resource resources_sdc2[] = { 		.flags	= IORESOURCE_IRQ, 	}, 	{-		.start	= 8,-		.end	= 8,+		.start	= DMOV_SDC2_CHAN,+		.end	= DMOV_SDC2_CHAN, 		.flags	= IORESOURCE_DMA, 	}, };@@ -319,8 +319,8 @@ static struct resource resources_sdc3[] = { 		.flags	= IORESOURCE_IRQ, 	}, 	{-		.start	= 8,-		.end	= 8,+		.start	= DMOV_SDC3_CHAN,+		.end	= DMOV_SDC3_CHAN, 		.flags	= IORESOURCE_DMA, 	}, };@@ -337,8 +337,8 @@ static struct resource resources_sdc4[] = { 		.flags	= IORESOURCE_IRQ, 	}, 	{-		.start	= 8,-		.end	= 8,+		.start	= DMOV_SDC4_CHAN,+		.end	= DMOV_SDC4_CHAN, 		.flags	= IORESOURCE_DMA, 	}, };diff --git a/arch/arm/mach-msm/include/mach/dma.h b/arch/arm/mach-msm/include/mach/dma.hindex b5c5013..5e3889f 100644--- a/arch/arm/mach-msm/include/mach/dma.h+++ b/arch/arm/mach-msm/include/mach/dma.h@@ -89,12 +89,19 @@ int msm_dmov_exec_cmd(unsigned id, unsigned int cmdptr); #define DMOV_NAND_CRCI_CMD    5 #define DMOV_NAND_CRCI_DATA   4 -#define DMOV_SDC1_CHAN        8+#define DMOV_SDC1_CHAN        5 #define DMOV_SDC1_CRCI        6  #define DMOV_SDC2_CHAN        8 #define DMOV_SDC2_CRCI        7 +++#define DMOV_SDC3_CHAN        -1+#define DMOV_SDC3_CRCI        -1+#define DMOV_SDC4_CHAN        -1+#define DMOV_SDC4_CRCI        -1+ #define DMOV_TSIF_CHAN        10 #define DMOV_TSIF_CRCI        10