From fea9b69acdeb8af4d37cf58ea805eecfbb03d44c Mon Sep 17 00:00:00 2001 From: Scott Jiang Date: Thu, 13 Nov 2014 15:30:53 +0800 Subject: blackfin: rename bfin-twi_i2c driver to adi_i2c Signed-off-by: Scott Jiang --- include/configs/bct-brettl2.h | 2 +- include/configs/bf518f-ezbrd.h | 2 +- include/configs/bf526-ezbrd.h | 2 +- include/configs/bf527-ad7160-eval.h | 2 +- include/configs/bf527-ezkit.h | 2 +- include/configs/bf527-sdp.h | 2 +- include/configs/bf537-minotaur.h | 2 +- include/configs/bf537-pnav.h | 2 +- include/configs/bf537-srv1.h | 2 +- include/configs/bf537-stamp.h | 2 +- include/configs/bf538f-ezkit.h | 2 +- include/configs/bf548-ezkit.h | 2 +- include/configs/bf609-ezkit.h | 2 +- include/configs/br4.h | 2 +- include/configs/cm-bf527.h | 2 +- include/configs/cm-bf537e.h | 2 +- include/configs/cm-bf537u.h | 2 +- include/configs/cm-bf548.h | 2 +- include/configs/pr1.h | 2 +- include/configs/tcm-bf518.h | 2 +- include/configs/tcm-bf537.h | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) (limited to 'include') diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h index d0828d5..f0b74d8 100644 --- a/include/configs/bct-brettl2.h +++ b/include/configs/bct-brettl2.h @@ -122,7 +122,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index 20f6ed1..4df51b9 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -134,7 +134,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index c33d035..55bfbbe 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -131,7 +131,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h index b497f26..589c7a5 100644 --- a/include/configs/bf527-ad7160-eval.h +++ b/include/configs/bf527-ad7160-eval.h @@ -119,7 +119,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 0bca53f..0e68952 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -134,7 +134,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h index 9d43b81..a3ad7ae 100644 --- a/include/configs/bf527-sdp.h +++ b/include/configs/bf527-sdp.h @@ -103,7 +103,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index 3bc364c..d94c2df 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -121,7 +121,7 @@ /* * I2C settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 #define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SLAVE 0 diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index ba74a69..6c9a907 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -142,7 +142,7 @@ /* * I2C settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 0b723cf..a6ceffa 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -120,7 +120,7 @@ /* * I2C settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 #define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SLAVE 0 diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 29f9316..7ab644f 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -128,7 +128,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index a655282..743e193 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -126,7 +126,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index da5f029..6b29d08 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -134,7 +134,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h index 12192ff..f02e155 100644 --- a/include/configs/bf609-ezkit.h +++ b/include/configs/bf609-ezkit.h @@ -81,7 +81,7 @@ #define CONFIG_PHYLIB /* i2c Settings */ -#define CONFIG_BFIN_TWI_I2C +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C /* diff --git a/include/configs/br4.h b/include/configs/br4.h index 3f24008..13e939f 100644 --- a/include/configs/br4.h +++ b/include/configs/br4.h @@ -102,7 +102,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h index f5351ad..3668903 100644 --- a/include/configs/cm-bf527.h +++ b/include/configs/cm-bf527.h @@ -113,7 +113,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 1729b44..85f5341 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -122,7 +122,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index 272aa74..5dffd1b 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -120,7 +120,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h index 7f27eda..13ea067 100644 --- a/include/configs/cm-bf548.h +++ b/include/configs/cm-bf548.h @@ -104,7 +104,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/pr1.h b/include/configs/pr1.h index 0f57e86..eb18d6d 100644 --- a/include/configs/pr1.h +++ b/include/configs/pr1.h @@ -102,7 +102,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h index 6673026..e9bff83 100644 --- a/include/configs/tcm-bf518.h +++ b/include/configs/tcm-bf518.h @@ -103,7 +103,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index 9998343..caf8847 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -122,7 +122,7 @@ /* * I2C Settings */ -#define CONFIG_BFIN_TWI_I2C 1 +#define CONFIG_SYS_I2C_ADI #define CONFIG_HARD_I2C 1 -- cgit v1.1 From c469703ba0e4adcd210e342fa6a19fcd83fe7207 Mon Sep 17 00:00:00 2001 From: Scott Jiang Date: Thu, 13 Nov 2014 15:30:55 +0800 Subject: blackfin: convert to use CONFIG_SYS_I2C framework Signed-off-by: Scott Jiang --- include/configs/bct-brettl2.h | 2 +- include/configs/bf518f-ezbrd.h | 2 +- include/configs/bf526-ezbrd.h | 2 +- include/configs/bf527-ad7160-eval.h | 2 +- include/configs/bf527-ezkit.h | 2 +- include/configs/bf527-sdp.h | 2 +- include/configs/bf537-minotaur.h | 2 +- include/configs/bf537-pnav.h | 2 +- include/configs/bf537-srv1.h | 2 +- include/configs/bf537-stamp.h | 2 +- include/configs/bf538f-ezkit.h | 2 +- include/configs/bf548-ezkit.h | 2 +- include/configs/bf609-ezkit.h | 2 +- include/configs/bfin_adi_common.h | 4 ++-- include/configs/br4.h | 2 +- include/configs/cm-bf527.h | 2 +- include/configs/cm-bf537e.h | 2 +- include/configs/cm-bf537u.h | 2 +- include/configs/cm-bf548.h | 2 +- include/configs/pr1.h | 2 +- include/configs/tcm-bf518.h | 2 +- include/configs/tcm-bf537.h | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) (limited to 'include') diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h index f0b74d8..39982ef 100644 --- a/include/configs/bct-brettl2.h +++ b/include/configs/bct-brettl2.h @@ -122,8 +122,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index 4df51b9..50e85ca 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -134,8 +134,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index 55bfbbe..7fc882a 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -131,8 +131,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h index 589c7a5..c2958e8 100644 --- a/include/configs/bf527-ad7160-eval.h +++ b/include/configs/bf527-ad7160-eval.h @@ -119,8 +119,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 0e68952..79e440a 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -134,8 +134,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h index a3ad7ae..b374ab5 100644 --- a/include/configs/bf527-sdp.h +++ b/include/configs/bf527-sdp.h @@ -103,8 +103,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index d94c2df..6df89af 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -121,8 +121,8 @@ /* * I2C settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 #define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SLAVE 0 diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index 6c9a907..4f2b2cb 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -142,8 +142,8 @@ /* * I2C settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index a6ceffa..d01d88f 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -120,8 +120,8 @@ /* * I2C settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 #define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SLAVE 0 diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 7ab644f..7b5a5a7 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -128,8 +128,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index 743e193..e60558e 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -126,8 +126,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 6b29d08..e71e6d3 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -134,8 +134,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h index f02e155..878009f 100644 --- a/include/configs/bf609-ezkit.h +++ b/include/configs/bf609-ezkit.h @@ -81,8 +81,8 @@ #define CONFIG_PHYLIB /* i2c Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C /* * Flash Settings diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 07ec5f2..143d3dd 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -73,7 +73,7 @@ # ifdef CONFIG_SPI_FLASH # define CONFIG_CMD_SF # endif -# if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) +# if defined(CONFIG_SYS_I2C) || defined(CONFIG_SYS_I2C_SOFT) # define CONFIG_CMD_I2C # define CONFIG_SOFT_I2C_READ_REPEATED_START # endif @@ -301,7 +301,7 @@ /* * I2C Settings */ -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) +#if defined(CONFIG_SYS_I2C) || defined(CONFIG_SYS_I2C_SOFT) # ifndef CONFIG_SYS_I2C_SPEED # define CONFIG_SYS_I2C_SPEED 50000 # endif diff --git a/include/configs/br4.h b/include/configs/br4.h index 13e939f..48cf184 100644 --- a/include/configs/br4.h +++ b/include/configs/br4.h @@ -102,8 +102,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C /* diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h index 3668903..643c837 100644 --- a/include/configs/cm-bf527.h +++ b/include/configs/cm-bf527.h @@ -113,8 +113,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 85f5341..e059568 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -122,8 +122,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index 5dffd1b..1f26457 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -120,8 +120,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h index 13ea067..72eafc5 100644 --- a/include/configs/cm-bf548.h +++ b/include/configs/cm-bf548.h @@ -104,8 +104,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/pr1.h b/include/configs/pr1.h index eb18d6d..13fb675 100644 --- a/include/configs/pr1.h +++ b/include/configs/pr1.h @@ -102,8 +102,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C /* diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h index e9bff83..e96a742 100644 --- a/include/configs/tcm-bf518.h +++ b/include/configs/tcm-bf518.h @@ -103,8 +103,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index caf8847..42129fb 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -122,8 +122,8 @@ /* * I2C Settings */ +#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI -#define CONFIG_HARD_I2C 1 /* -- cgit v1.1