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>
This commit is contained in:
parent
913f2f2df7
commit
cf93feb3a0
17 changed files with 102 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue