blackfin: twi: Move TWI peripheral pin request array to platform data

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>

diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c
index a17395727efa29966feb636c88b8e86df0e54883..f8047ca3b3394bd54c32f578d87d8bee32518375 100644 (file)
--- a/arch/blackfin/mach-bf518/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf518/boards/ezbrd.c
@@ -529,6 +529,8 @@ static struct platform_device bfin_i2s = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -547,6 +549,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
index 6eebee4e421765f4bc962ab2c8eae24cc613481a..0bedc737566bdbcc0f5d77a4800f1b16af8395c4 100644 (file)
--- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c
+++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
@@ -455,6 +455,8 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -473,6 +475,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c
index 423381da08b2538ce79cef6b33ae7004d721fe08..d58f50e5aa4b856e51664d5495c873e04d04cb82 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/ad7160eval.c
+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c
@@ -569,6 +569,8 @@ static const struct ad7160_platform_data bfin_ad7160_ts_info = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -587,6 +589,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 65b7fbd30e161de00be6b61369885f4d4a81fbf3..413d0132b66f4b38fb6f04e8a77da29f9b81af42 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -698,6 +698,8 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -716,6 +718,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
index 17c6a24cc0764a51d87ac41c6aa9ae660aaf839c..50bda79194e5f8de2721078b3ca089b120947251 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -576,6 +576,8 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -594,6 +596,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 3196683e0f2c960f16514919a2f7ccf799c3337b..af732eb3a687426b22dfa828f0f6d393975cdf0d 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -869,6 +869,8 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -887,6 +889,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c b/arch/blackfin/mach-bf527/boards/tll6527m.c
index d192c0ac941c40390e6c3f06421365f2517e6496..1509c5a8a3ff74bb09b5fe768c80ef22867d80ef 100644 (file)
--- a/arch/blackfin/mach-bf527/boards/tll6527m.c
+++ b/arch/blackfin/mach-bf527/boards/tll6527m.c
@@ -656,6 +656,8 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -674,6 +676,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
index 27fd2c32ae9ae8d83fc3658716778a86268d0af0..9408ab56d87fb7d6c624be01b20e23705561e8df 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
@@ -486,6 +486,8 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -504,6 +506,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
index 3f3abad86ec322e95d9a3a313af5577ec9f53012..0143d8bef909483be39128812faa86f926ddfdfd 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
@@ -451,6 +451,8 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -469,6 +471,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
index 6f77bf708ec0bf4e2da745ce73f1c2b64260c88b..8bbf0a23fd49a16333f5153c6c78146d17d1a9b0 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/dnp5370.c
+++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
@@ -329,6 +329,8 @@ static struct platform_device bfin_uart1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -347,6 +349,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id            = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource      = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c
index d2d71282618fb9b512371c0626d7ae5937eaf28f..a10f90e444bcedf735c373425074f074e36422b6 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/minotaur.c
+++ b/arch/blackfin/mach-bf537/boards/minotaur.c
@@ -386,6 +386,8 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -404,6 +406,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index ec3e5c131216a1a3a6a5b9db6039a743b6d99fa7..c9d9473a5ab2ab2d6025b35b93209dde68949f2d 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -1790,6 +1790,8 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -1808,6 +1810,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index 3fb421823857e0ab3a76fbb743c2862834d801f3..e285c3675286c7e184e820f5ea21a8cb0e92d68c 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -453,6 +453,8 @@ static struct platform_device bfin_sir1_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -471,6 +473,9 @@ static struct platform_device i2c_bfin_twi_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 #endif
 

diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c b/arch/blackfin/mach-bf538/boards/ezkit.c
index 85038f54354dc78ac514655972d021e4a0cb63e6..a4fce0370c1db2455dfeb16f3526b993333bab38 100644 (file)
--- a/arch/blackfin/mach-bf538/boards/ezkit.c
+++ b/arch/blackfin/mach-bf538/boards/ezkit.c
@@ -718,6 +718,8 @@ static struct platform_device bf538_spi_master2 = {
 };
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -736,9 +738,13 @@ static struct platform_device i2c_bfin_twi0_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 
-#if !defined(CONFIG_BF542)     /* The BF542 only has 1 TWI */
+static const u16 bfin_twi1_pins[] = {P_TWI1_SCL, P_TWI1_SDA, 0};
+
 static struct resource bfin_twi1_resource[] = {
        [0] = {
                .start = TWI1_REGBASE,

diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c
index 68af594db48e638c8ad29bc1a504aaa560382d5b..e92543362f35186b9c6def0f5123e8697c7e0b78 100644 (file)
--- a/arch/blackfin/mach-bf548/boards/cm_bf548.c
+++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c
@@ -1007,6 +1007,8 @@ static struct platform_device bf54x_spi_master1 = {
 #endif  /* spi master and devices */
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -1025,9 +1027,14 @@ static struct platform_device i2c_bfin_twi0_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 
 #if !defined(CONFIG_BF542)     /* The BF542 only has 1 TWI */
+static const u16 bfin_twi1_pins[] = {P_TWI1_SCL, P_TWI1_SDA, 0};
+
 static struct resource bfin_twi1_resource[] = {
        [0] = {
                .start = TWI1_REGBASE,
@@ -1046,6 +1053,9 @@ static struct platform_device i2c_bfin_twi1_device = {
        .id = 1,
        .num_resources = ARRAY_SIZE(bfin_twi1_resource),
        .resource = bfin_twi1_resource,
+       .dev = {
+               .platform_data = &bfin_twi1_pins,
+       },
 };
 #endif
 #endif

diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 4f4bd918566c92fef9681fe92cb402f2ef8344a5..3bd75bae750dd004f45d4ff3c8e6ede35b78a0b0 100644 (file)
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -1252,6 +1252,8 @@ static struct platform_device bfin_capture_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_REGBASE,
@@ -1270,9 +1272,14 @@ static struct platform_device i2c_bfin_twi0_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 
 #if !defined(CONFIG_BF542)     /* The BF542 only has 1 TWI */
+static const u16 bfin_twi1_pins[] = {P_TWI1_SCL, P_TWI1_SDA, 0};
+
 static struct resource bfin_twi1_resource[] = {
        [0] = {
                .start = TWI1_REGBASE,
@@ -1291,6 +1298,9 @@ static struct platform_device i2c_bfin_twi1_device = {
        .id = 1,
        .num_resources = ARRAY_SIZE(bfin_twi1_resource),
        .resource = bfin_twi1_resource,
+       .dev = {
+               .platform_data = &bfin_twi1_pins,
+       },
 };
 #endif
 #endif

diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index cf0175a1dec947a58993932f7a5f21a5fa5e8ef6..ac64f47217c156d58be5eac34d4cd054ba5acdf8 100644 (file)
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -1081,6 +1081,8 @@ static struct platform_device bf60x_spi_master1 = {
 #endif  /* spi master and devices */
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
+
 static struct resource bfin_twi0_resource[] = {
        [0] = {
                .start = TWI0_CLKDIV,
@@ -1099,8 +1101,13 @@ static struct platform_device i2c_bfin_twi0_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
        .resource = bfin_twi0_resource,
+       .dev = {
+               .platform_data = &bfin_twi0_pins,
+       },
 };
 
+static const u16 bfin_twi1_pins[] = {P_TWI1_SCL, P_TWI1_SDA, 0};
+
 static struct resource bfin_twi1_resource[] = {
        [0] = {
                .start = TWI1_CLKDIV,
@@ -1119,6 +1126,9 @@ static struct platform_device i2c_bfin_twi1_device = {
        .id = 1,
        .num_resources = ARRAY_SIZE(bfin_twi1_resource),
        .resource = bfin_twi1_resource,
+       .dev = {
+               .platform_data = &bfin_twi1_pins,
+       },
 };
 #endif