Skip to content

L
linux
Commit cf93feb3 authored by Sonic Zhang's avatar Sonic Zhang Committed by Bob Liu
Browse files
Options

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

Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
parent 913f2f2d
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 1 deletion
arch/blackfin/mach-bf518/boards/ezbrd.c
View file @ cf93feb3
...@@ -529,6 +529,8 @@ static struct platform_device bfin_i2s = { ...@@ -529,6 +529,8 @@ static struct platform_device bfin_i2s = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -547,6 +549,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -547,6 +549,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf518/boards/tcm-bf518.c
View file @ cf93feb3
...@@ -455,6 +455,8 @@ static struct platform_device bfin_sir1_device = { ...@@ -455,6 +455,8 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -473,6 +475,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -473,6 +475,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf527/boards/ad7160eval.c
View file @ cf93feb3
...@@ -569,6 +569,8 @@ static const struct ad7160_platform_data bfin_ad7160_ts_info = { ...@@ -569,6 +569,8 @@ static const struct ad7160_platform_data bfin_ad7160_ts_info = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -587,6 +589,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -587,6 +589,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf527/boards/cm_bf527.c
View file @ cf93feb3
...@@ -698,6 +698,8 @@ static struct platform_device bfin_sir1_device = { ...@@ -698,6 +698,8 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -716,6 +718,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -716,6 +718,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf527/boards/ezbrd.c
View file @ cf93feb3
...@@ -576,6 +576,8 @@ static struct platform_device bfin_sir1_device = { ...@@ -576,6 +576,8 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -594,6 +596,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -594,6 +596,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf527/boards/ezkit.c
View file @ cf93feb3
...@@ -869,6 +869,8 @@ static struct platform_device bfin_sir1_device = { ...@@ -869,6 +869,8 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -887,6 +889,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -887,6 +889,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf527/boards/tll6527m.c
View file @ cf93feb3
...@@ -656,6 +656,8 @@ static struct platform_device bfin_sir1_device = { ...@@ -656,6 +656,8 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -674,6 +676,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -674,6 +676,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf537/boards/cm_bf537e.c
View file @ cf93feb3
...@@ -486,6 +486,8 @@ static struct platform_device bfin_sir1_device = { ...@@ -486,6 +486,8 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -504,6 +506,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -504,6 +506,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf537/boards/cm_bf537u.c
View file @ cf93feb3
...@@ -451,6 +451,8 @@ static struct platform_device bfin_sir1_device = { ...@@ -451,6 +451,8 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -469,6 +471,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -469,6 +471,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf537/boards/dnp5370.c
View file @ cf93feb3
...@@ -329,6 +329,8 @@ static struct platform_device bfin_uart1_device = { ...@@ -329,6 +329,8 @@ static struct platform_device bfin_uart1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -347,6 +349,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -347,6 +349,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf537/boards/minotaur.c
View file @ cf93feb3
...@@ -386,6 +386,8 @@ static struct platform_device bfin_sir1_device = { ...@@ -386,6 +386,8 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -404,6 +406,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -404,6 +406,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf537/boards/stamp.c
View file @ cf93feb3
...@@ -1790,6 +1790,8 @@ static struct platform_device bfin_sir1_device = { ...@@ -1790,6 +1790,8 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -1808,6 +1810,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -1808,6 +1810,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf537/boards/tcm_bf537.c
View file @ cf93feb3
...@@ -453,6 +453,8 @@ static struct platform_device bfin_sir1_device = { ...@@ -453,6 +453,8 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -471,6 +473,9 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -471,6 +473,9 @@ static struct platform_device i2c_bfin_twi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#endif #endif
......
arch/blackfin/mach-bf538/boards/ezkit.c
View file @ cf93feb3
...@@ -718,6 +718,8 @@ static struct platform_device bf538_spi_master2 = { ...@@ -718,6 +718,8 @@ static struct platform_device bf538_spi_master2 = {
}; };
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -736,9 +738,13 @@ static struct platform_device i2c_bfin_twi0_device = { ...@@ -736,9 +738,13 @@ static struct platform_device i2c_bfin_twi0_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = 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[] = { static struct resource bfin_twi1_resource[] = {
[0] = { [0] = {
.start = TWI1_REGBASE, .start = TWI1_REGBASE,
......
arch/blackfin/mach-bf548/boards/cm_bf548.c
View file @ cf93feb3
...@@ -1007,6 +1007,8 @@ static struct platform_device bf54x_spi_master1 = { ...@@ -1007,6 +1007,8 @@ static struct platform_device bf54x_spi_master1 = {
#endif /* spi master and devices */ #endif /* spi master and devices */
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -1025,9 +1027,14 @@ static struct platform_device i2c_bfin_twi0_device = { ...@@ -1025,9 +1027,14 @@ static struct platform_device i2c_bfin_twi0_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */ #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[] = { static struct resource bfin_twi1_resource[] = {
[0] = { [0] = {
.start = TWI1_REGBASE, .start = TWI1_REGBASE,
...@@ -1046,6 +1053,9 @@ static struct platform_device i2c_bfin_twi1_device = { ...@@ -1046,6 +1053,9 @@ static struct platform_device i2c_bfin_twi1_device = {
.id = 1, .id = 1,
.num_resources = ARRAY_SIZE(bfin_twi1_resource), .num_resources = ARRAY_SIZE(bfin_twi1_resource),
.resource = bfin_twi1_resource, .resource = bfin_twi1_resource,
.dev = {
.platform_data = &bfin_twi1_pins,
},
}; };
#endif #endif
#endif #endif
......
arch/blackfin/mach-bf548/boards/ezkit.c
View file @ cf93feb3
...@@ -1252,6 +1252,8 @@ static struct platform_device bfin_capture_device = { ...@@ -1252,6 +1252,8 @@ static struct platform_device bfin_capture_device = {
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_REGBASE, .start = TWI0_REGBASE,
...@@ -1270,9 +1272,14 @@ static struct platform_device i2c_bfin_twi0_device = { ...@@ -1270,9 +1272,14 @@ static struct platform_device i2c_bfin_twi0_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
.dev = {
.platform_data = &bfin_twi0_pins,
},
}; };
#if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */ #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[] = { static struct resource bfin_twi1_resource[] = {
[0] = { [0] = {
.start = TWI1_REGBASE, .start = TWI1_REGBASE,
...@@ -1291,6 +1298,9 @@ static struct platform_device i2c_bfin_twi1_device = { ...@@ -1291,6 +1298,9 @@ static struct platform_device i2c_bfin_twi1_device = {
.id = 1, .id = 1,
.num_resources = ARRAY_SIZE(bfin_twi1_resource), .num_resources = ARRAY_SIZE(bfin_twi1_resource),
.resource = bfin_twi1_resource, .resource = bfin_twi1_resource,
.dev = {
.platform_data = &bfin_twi1_pins,
},
}; };
#endif #endif
#endif #endif
......
arch/blackfin/mach-bf609/boards/ezkit.c
View file @ cf93feb3
...@@ -1081,6 +1081,8 @@ static struct platform_device bf60x_spi_master1 = { ...@@ -1081,6 +1081,8 @@ static struct platform_device bf60x_spi_master1 = {
#endif /* spi master and devices */ #endif /* spi master and devices */
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #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[] = { static struct resource bfin_twi0_resource[] = {
[0] = { [0] = {
.start = TWI0_CLKDIV, .start = TWI0_CLKDIV,
...@@ -1099,8 +1101,13 @@ static struct platform_device i2c_bfin_twi0_device = { ...@@ -1099,8 +1101,13 @@ static struct platform_device i2c_bfin_twi0_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_twi0_resource), .num_resources = ARRAY_SIZE(bfin_twi0_resource),
.resource = 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[] = { static struct resource bfin_twi1_resource[] = {
[0] = { [0] = {
.start = TWI1_CLKDIV, .start = TWI1_CLKDIV,
...@@ -1119,6 +1126,9 @@ static struct platform_device i2c_bfin_twi1_device = { ...@@ -1119,6 +1126,9 @@ static struct platform_device i2c_bfin_twi1_device = {
.id = 1, .id = 1,
.num_resources = ARRAY_SIZE(bfin_twi1_resource), .num_resources = ARRAY_SIZE(bfin_twi1_resource),
.resource = bfin_twi1_resource, .resource = bfin_twi1_resource,
.dev = {
.platform_data = &bfin_twi1_pins,
},
}; };
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7