From: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
rename i2c bus driver name i2c-bfin-twi to i2c-adi-twi
rename I2C_BLACKFIN_TWI with I2C_ADI_TWI in framebuffer driver config options
Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
---
drivers/video/Kconfig | 2 +-
drivers/video/bf537-lq035.c | 2 +-
drivers/video/bfin_adv7393fb.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 22262a3..18d44b5 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -614,7 +614,7 @@ config FB_BFIN_LQ035Q1
config FB_BF537_LQ035
tristate "SHARP LQ035 TFT LCD (BF537 STAMP)"
- depends on FB && (BF534 || BF536 || BF537) && I2C_BLACKFIN_TWI
+ depends on FB && (BF534 || BF536 || BF537) && I2C_ADI_TWI
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
diff --git a/drivers/video/bf537-lq035.c b/drivers/video/bf537-lq035.c
index a82d257..e934491 100644
--- a/drivers/video/bf537-lq035.c
+++ b/drivers/video/bf537-lq035.c
@@ -900,7 +900,7 @@ static struct platform_driver bfin_lq035_driver = {
static int __init bfin_lq035_driver_init(void)
{
- request_module("i2c-bfin-twi");
+ request_module("i2c-adi-twi");
return platform_driver_register(&bfin_lq035_driver);
}
module_init(bfin_lq035_driver_init);
diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c
index a54f7f7..4664343 100644
--- a/drivers/video/bfin_adv7393fb.c
+++ b/drivers/video/bfin_adv7393fb.c
@@ -795,8 +795,8 @@ static struct i2c_driver bfin_adv7393_fb_driver = {
static int __init bfin_adv7393_fb_driver_init(void)
{
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
- request_module("i2c-bfin-twi");
+#if IS_ENABLED(CONFIG_I2C_ADI_TWI)
+ request_module("i2c-adi-twi");
#else
request_module("i2c-gpio");
#endif
--
1.8.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
