Browse Source

ARM: S5P: Reorder DMA platform device id

This patch is matched-up DMA platform device id to its clock id.

Signed-off-by: Seungwhan Youn <sw.youn@samsung.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Seungwhan Youn 14 years ago
parent
commit
9d59c17ab5

+ 1 - 1
arch/arm/mach-s5p6442/dma.c

@@ -82,7 +82,7 @@ static struct s3c_pl330_platdata s5p6442_pdma_pdata = {
 
 
 static struct platform_device s5p6442_device_pdma = {
 static struct platform_device s5p6442_device_pdma = {
 	.name		= "s3c-pl330",
 	.name		= "s3c-pl330",
-	.id		= 1,
+	.id		= -1,
 	.num_resources	= ARRAY_SIZE(s5p6442_pdma_resource),
 	.num_resources	= ARRAY_SIZE(s5p6442_pdma_resource),
 	.resource	= s5p6442_pdma_resource,
 	.resource	= s5p6442_pdma_resource,
 	.dev		= {
 	.dev		= {

+ 1 - 1
arch/arm/mach-s5p64x0/dma.c

@@ -122,7 +122,7 @@ static struct s3c_pl330_platdata s5p6450_pdma_pdata = {
 
 
 static struct platform_device s5p64x0_device_pdma = {
 static struct platform_device s5p64x0_device_pdma = {
 	.name		= "s3c-pl330",
 	.name		= "s3c-pl330",
-	.id		= 0,
+	.id		= -1,
 	.num_resources	= ARRAY_SIZE(s5p64x0_pdma_resource),
 	.num_resources	= ARRAY_SIZE(s5p64x0_pdma_resource),
 	.resource	= s5p64x0_pdma_resource,
 	.resource	= s5p64x0_pdma_resource,
 	.dev		= {
 	.dev		= {

+ 2 - 2
arch/arm/mach-s5pc100/dma.c

@@ -81,7 +81,7 @@ static struct s3c_pl330_platdata s5pc100_pdma0_pdata = {
 
 
 static struct platform_device s5pc100_device_pdma0 = {
 static struct platform_device s5pc100_device_pdma0 = {
 	.name		= "s3c-pl330",
 	.name		= "s3c-pl330",
-	.id		= 1,
+	.id		= 0,
 	.num_resources	= ARRAY_SIZE(s5pc100_pdma0_resource),
 	.num_resources	= ARRAY_SIZE(s5pc100_pdma0_resource),
 	.resource	= s5pc100_pdma0_resource,
 	.resource	= s5pc100_pdma0_resource,
 	.dev		= {
 	.dev		= {
@@ -143,7 +143,7 @@ static struct s3c_pl330_platdata s5pc100_pdma1_pdata = {
 
 
 static struct platform_device s5pc100_device_pdma1 = {
 static struct platform_device s5pc100_device_pdma1 = {
 	.name		= "s3c-pl330",
 	.name		= "s3c-pl330",
-	.id		= 2,
+	.id		= 1,
 	.num_resources	= ARRAY_SIZE(s5pc100_pdma1_resource),
 	.num_resources	= ARRAY_SIZE(s5pc100_pdma1_resource),
 	.resource	= s5pc100_pdma1_resource,
 	.resource	= s5pc100_pdma1_resource,
 	.dev		= {
 	.dev		= {

+ 2 - 2
arch/arm/mach-s5pv210/dma.c

@@ -82,7 +82,7 @@ static struct s3c_pl330_platdata s5pv210_pdma0_pdata = {
 
 
 static struct platform_device s5pv210_device_pdma0 = {
 static struct platform_device s5pv210_device_pdma0 = {
 	.name		= "s3c-pl330",
 	.name		= "s3c-pl330",
-	.id		= 1,
+	.id		= 0,
 	.num_resources	= ARRAY_SIZE(s5pv210_pdma0_resource),
 	.num_resources	= ARRAY_SIZE(s5pv210_pdma0_resource),
 	.resource	= s5pv210_pdma0_resource,
 	.resource	= s5pv210_pdma0_resource,
 	.dev		= {
 	.dev		= {
@@ -144,7 +144,7 @@ static struct s3c_pl330_platdata s5pv210_pdma1_pdata = {
 
 
 static struct platform_device s5pv210_device_pdma1 = {
 static struct platform_device s5pv210_device_pdma1 = {
 	.name		= "s3c-pl330",
 	.name		= "s3c-pl330",
-	.id		= 2,
+	.id		= 1,
 	.num_resources	= ARRAY_SIZE(s5pv210_pdma1_resource),
 	.num_resources	= ARRAY_SIZE(s5pv210_pdma1_resource),
 	.resource	= s5pv210_pdma1_resource,
 	.resource	= s5pv210_pdma1_resource,
 	.dev		= {
 	.dev		= {