diff mbox

[U-Boot,17/17] i2c: Drop CONFIG_SOFT_I2C_MULTI_BUS

Message ID 20170328162733.20905-17-sjg@chromium.org
State Accepted
Commit eca803756ab49d393025bb299f3e0b0b8a482a35
Delegated to: Tom Rini
Headers show

Commit Message

Simon Glass March 28, 2017, 4:27 p.m. UTC 
This is not used by any board. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Clean up board_f sequence a little
This series tries to remove #ifdefs from the board_f init sequence. It
gets as far as I2C and then we need to discuss whether we can start to
remove the old I2C framework.

I think that ideally each entry in the init sequence should be enabled by
at most one CONFIG, which is in Kconfig and is not arch-specific.
END

---

 board/samsung/common/Makefile    |  1 -
 board/samsung/common/multi_i2c.c | 59 ----------------------------------------
 include/i2c.h                    |  7 -----
 scripts/config_whitelist.txt     |  1 -
 4 files changed, 68 deletions(-)
 delete mode 100644 board/samsung/common/multi_i2c.c

Comments

Lukasz Majewski March 29, 2017, 8:41 a.m. UTC | #1 
Hi Simon,

+CC board maintainer: Jaehoon.

> This is not used by any board. Drop it.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Clean up board_f sequence a little
> This series tries to remove #ifdefs from the board_f init sequence. It
> gets as far as I2C and then we need to discuss whether we can start to
> remove the old I2C framework.
> 
> I think that ideally each entry in the init sequence should be
> enabled by at most one CONFIG, which is in Kconfig and is not
> arch-specific. END
> 
> ---
> 
>  board/samsung/common/Makefile    |  1 -
>  board/samsung/common/multi_i2c.c | 59
> ----------------------------------------
> include/i2c.h                    |  7 -----
> scripts/config_whitelist.txt     |  1 - 4 files changed, 68
> deletions(-) delete mode 100644 board/samsung/common/multi_i2c.c
> 
> diff --git a/board/samsung/common/Makefile
> b/board/samsung/common/Makefile index ef1a8f318f..fa85f7dcd2 100644
> --- a/board/samsung/common/Makefile
> +++ b/board/samsung/common/Makefile
> @@ -5,7 +5,6 @@
>  # SPDX-License-Identifier:	GPL-2.0+
>  #
>  
> -obj-$(CONFIG_SOFT_I2C_MULTI_BUS) += multi_i2c.o
>  obj-$(CONFIG_USB_GADGET_DOWNLOAD) += gadget.o
>  obj-$(CONFIG_MISC_COMMON) += misc.o
>  
> diff --git a/board/samsung/common/multi_i2c.c
> b/board/samsung/common/multi_i2c.c deleted file mode 100644
> index 71c32c0b6e..0000000000
> --- a/board/samsung/common/multi_i2c.c
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -/*
> - *  Copyright (C) 2012 Samsung Electronics
> - *  Lukasz Majewski <l.majewski@samsung.com>
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
> - */
> -
> -#include <common.h>
> -#include <i2c.h>
> -
> -#ifndef CONFIG_SOFT_I2C_I2C10_SCL
> -#define CONFIG_SOFT_I2C_I2C10_SCL 0
> -#endif
> -
> -#ifndef CONFIG_SOFT_I2C_I2C10_SDA
> -#define CONFIG_SOFT_I2C_I2C10_SDA 0
> -#endif
> -
> -/* Handle multiple I2C buses instances */
> -int get_multi_scl_pin(void)
> -{
> -	unsigned int bus = i2c_get_bus_num();
> -
> -	switch (bus) {
> -	case I2C_0:
> -		return CONFIG_SOFT_I2C_I2C5_SCL;
> -	case I2C_1:
> -		return CONFIG_SOFT_I2C_I2C9_SCL;
> -	case I2C_2:
> -		return CONFIG_SOFT_I2C_I2C10_SCL;
> -	default:
> -		printf("I2C_%d not supported!\n", bus);
> -	};
> -
> -	return 0;
> -}
> -
> -int get_multi_sda_pin(void)
> -{
> -	unsigned int bus = i2c_get_bus_num();
> -
> -	switch (bus) {
> -	case I2C_0:
> -		return CONFIG_SOFT_I2C_I2C5_SDA;
> -	case I2C_1:
> -		return CONFIG_SOFT_I2C_I2C9_SDA;
> -	case I2C_2:
> -		return CONFIG_SOFT_I2C_I2C10_SDA;
> -	default:
> -		printf("I2C_%d not supported!\n", bus);
> -	};
> -
> -	return 0;
> -}
> -
> -int multi_i2c_init(void)
> -{
> -	return 0;
> -}
> diff --git a/include/i2c.h b/include/i2c.h
> index 4bbeecabf2..cd7f61e1c1 100644
> --- a/include/i2c.h
> +++ b/include/i2c.h
> @@ -930,13 +930,6 @@ enum {
>  	I2C_8, I2C_9, I2C_10,
>  };
>  
> -/* Multi I2C busses handling */
> -#ifdef CONFIG_SOFT_I2C_MULTI_BUS
> -extern int get_multi_scl_pin(void);
> -extern int get_multi_sda_pin(void);
> -extern int multi_i2c_init(void);
> -#endif
> -
>  /**
>   * Get FDT values for i2c bus.
>   *
> diff --git a/scripts/config_whitelist.txt
> b/scripts/config_whitelist.txt index 668f238459..ba90758a29 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -2838,7 +2838,6 @@ CONFIG_SOFT_I2C_I2C5_SCL
>  CONFIG_SOFT_I2C_I2C5_SDA
>  CONFIG_SOFT_I2C_I2C9_SCL
>  CONFIG_SOFT_I2C_I2C9_SDA
> -CONFIG_SOFT_I2C_MULTI_BUS
>  CONFIG_SOFT_I2C_READ_REPEATED_START
>  CONFIG_SOFT_SPI
>  CONFIG_SOFT_TWS

Acked-by: Lukasz Majewski <lukma@denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
Jaehoon Chung March 30, 2017, 4:40 a.m. UTC | #2 
On 03/29/2017 05:41 PM, Lukasz Majewski wrote:
> Hi Simon,
> 
> +CC board maintainer: Jaehoon.
> 
>> This is not used by any board. Drop it.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> Clean up board_f sequence a little
>> This series tries to remove #ifdefs from the board_f init sequence. It
>> gets as far as I2C and then we need to discuss whether we can start to
>> remove the old I2C framework.
>>
>> I think that ideally each entry in the init sequence should be
>> enabled by at most one CONFIG, which is in Kconfig and is not
>> arch-specific. END
>>
>> ---
>>
>>  board/samsung/common/Makefile    |  1 -
>>  board/samsung/common/multi_i2c.c | 59
>> ----------------------------------------
>> include/i2c.h                    |  7 -----
>> scripts/config_whitelist.txt     |  1 - 4 files changed, 68
>> deletions(-) delete mode 100644 board/samsung/common/multi_i2c.c
>>
>> diff --git a/board/samsung/common/Makefile
>> b/board/samsung/common/Makefile index ef1a8f318f..fa85f7dcd2 100644
>> --- a/board/samsung/common/Makefile
>> +++ b/board/samsung/common/Makefile
>> @@ -5,7 +5,6 @@
>>  # SPDX-License-Identifier:	GPL-2.0+
>>  #
>>  
>> -obj-$(CONFIG_SOFT_I2C_MULTI_BUS) += multi_i2c.o
>>  obj-$(CONFIG_USB_GADGET_DOWNLOAD) += gadget.o
>>  obj-$(CONFIG_MISC_COMMON) += misc.o
>>  
>> diff --git a/board/samsung/common/multi_i2c.c
>> b/board/samsung/common/multi_i2c.c deleted file mode 100644
>> index 71c32c0b6e..0000000000
>> --- a/board/samsung/common/multi_i2c.c
>> +++ /dev/null
>> @@ -1,59 +0,0 @@
>> -/*
>> - *  Copyright (C) 2012 Samsung Electronics
>> - *  Lukasz Majewski <l.majewski@samsung.com>
>> - *
>> - * SPDX-License-Identifier:	GPL-2.0+
>> - */
>> -
>> -#include <common.h>
>> -#include <i2c.h>
>> -
>> -#ifndef CONFIG_SOFT_I2C_I2C10_SCL
>> -#define CONFIG_SOFT_I2C_I2C10_SCL 0
>> -#endif
>> -
>> -#ifndef CONFIG_SOFT_I2C_I2C10_SDA
>> -#define CONFIG_SOFT_I2C_I2C10_SDA 0
>> -#endif
>> -
>> -/* Handle multiple I2C buses instances */
>> -int get_multi_scl_pin(void)
>> -{
>> -	unsigned int bus = i2c_get_bus_num();
>> -
>> -	switch (bus) {
>> -	case I2C_0:
>> -		return CONFIG_SOFT_I2C_I2C5_SCL;
>> -	case I2C_1:
>> -		return CONFIG_SOFT_I2C_I2C9_SCL;
>> -	case I2C_2:
>> -		return CONFIG_SOFT_I2C_I2C10_SCL;
>> -	default:
>> -		printf("I2C_%d not supported!\n", bus);
>> -	};
>> -
>> -	return 0;
>> -}
>> -
>> -int get_multi_sda_pin(void)
>> -{
>> -	unsigned int bus = i2c_get_bus_num();
>> -
>> -	switch (bus) {
>> -	case I2C_0:
>> -		return CONFIG_SOFT_I2C_I2C5_SDA;
>> -	case I2C_1:
>> -		return CONFIG_SOFT_I2C_I2C9_SDA;
>> -	case I2C_2:
>> -		return CONFIG_SOFT_I2C_I2C10_SDA;
>> -	default:
>> -		printf("I2C_%d not supported!\n", bus);
>> -	};
>> -
>> -	return 0;
>> -}
>> -
>> -int multi_i2c_init(void)
>> -{
>> -	return 0;
>> -}
>> diff --git a/include/i2c.h b/include/i2c.h
>> index 4bbeecabf2..cd7f61e1c1 100644
>> --- a/include/i2c.h
>> +++ b/include/i2c.h
>> @@ -930,13 +930,6 @@ enum {
>>  	I2C_8, I2C_9, I2C_10,
>>  };
>>  
>> -/* Multi I2C busses handling */
>> -#ifdef CONFIG_SOFT_I2C_MULTI_BUS
>> -extern int get_multi_scl_pin(void);
>> -extern int get_multi_sda_pin(void);
>> -extern int multi_i2c_init(void);
>> -#endif
>> -
>>  /**
>>   * Get FDT values for i2c bus.
>>   *
>> diff --git a/scripts/config_whitelist.txt
>> b/scripts/config_whitelist.txt index 668f238459..ba90758a29 100644
>> --- a/scripts/config_whitelist.txt
>> +++ b/scripts/config_whitelist.txt
>> @@ -2838,7 +2838,6 @@ CONFIG_SOFT_I2C_I2C5_SCL
>>  CONFIG_SOFT_I2C_I2C5_SDA
>>  CONFIG_SOFT_I2C_I2C9_SCL
>>  CONFIG_SOFT_I2C_I2C9_SDA
>> -CONFIG_SOFT_I2C_MULTI_BUS
>>  CONFIG_SOFT_I2C_READ_REPEATED_START
>>  CONFIG_SOFT_SPI
>>  CONFIG_SOFT_TWS
> 
> Acked-by: Lukasz Majewski <lukma@denx.de>

Acked-by: Jaehoon Chung <jh80.chung@samsung.com>

Best Regards,
Jaehoon Chung

> 
> 
> Best regards,
> 
> Lukasz Majewski
> 
> --
> 
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
> 
> 
>
Tom Rini April 6, 2017, 4:25 p.m. UTC | #3 
On Tue, Mar 28, 2017 at 10:27:32AM -0600, Simon Glass wrote:

> This is not used by any board. Drop it.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Clean up board_f sequence a little
> This series tries to remove #ifdefs from the board_f init sequence. It
> gets as far as I2C and then we need to discuss whether we can start to
> remove the old I2C framework.
> 
> I think that ideally each entry in the init sequence should be enabled by
> at most one CONFIG, which is in Kconfig and is not arch-specific.
> END
> Acked-by: Lukasz Majewski <lukma@denx.de>
> Acked-by: Jaehoon Chung <jh80.chung@samsung.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/board/samsung/common/Makefile b/board/samsung/common/Makefile
index ef1a8f318f..fa85f7dcd2 100644
--- a/board/samsung/common/Makefile
+++ b/board/samsung/common/Makefile
@@ -5,7 +5,6 @@ 
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_SOFT_I2C_MULTI_BUS) += multi_i2c.o
 obj-$(CONFIG_USB_GADGET_DOWNLOAD) += gadget.o
 obj-$(CONFIG_MISC_COMMON) += misc.o
 
diff --git a/board/samsung/common/multi_i2c.c b/board/samsung/common/multi_i2c.c
deleted file mode 100644
index 71c32c0b6e..0000000000
--- a/board/samsung/common/multi_i2c.c
+++ /dev/null
@@ -1,59 +0,0 @@ 
-/*
- *  Copyright (C) 2012 Samsung Electronics
- *  Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <i2c.h>
-
-#ifndef CONFIG_SOFT_I2C_I2C10_SCL
-#define CONFIG_SOFT_I2C_I2C10_SCL 0
-#endif
-
-#ifndef CONFIG_SOFT_I2C_I2C10_SDA
-#define CONFIG_SOFT_I2C_I2C10_SDA 0
-#endif
-
-/* Handle multiple I2C buses instances */
-int get_multi_scl_pin(void)
-{
-	unsigned int bus = i2c_get_bus_num();
-
-	switch (bus) {
-	case I2C_0:
-		return CONFIG_SOFT_I2C_I2C5_SCL;
-	case I2C_1:
-		return CONFIG_SOFT_I2C_I2C9_SCL;
-	case I2C_2:
-		return CONFIG_SOFT_I2C_I2C10_SCL;
-	default:
-		printf("I2C_%d not supported!\n", bus);
-	};
-
-	return 0;
-}
-
-int get_multi_sda_pin(void)
-{
-	unsigned int bus = i2c_get_bus_num();
-
-	switch (bus) {
-	case I2C_0:
-		return CONFIG_SOFT_I2C_I2C5_SDA;
-	case I2C_1:
-		return CONFIG_SOFT_I2C_I2C9_SDA;
-	case I2C_2:
-		return CONFIG_SOFT_I2C_I2C10_SDA;
-	default:
-		printf("I2C_%d not supported!\n", bus);
-	};
-
-	return 0;
-}
-
-int multi_i2c_init(void)
-{
-	return 0;
-}
diff --git a/include/i2c.h b/include/i2c.h
index 4bbeecabf2..cd7f61e1c1 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -930,13 +930,6 @@  enum {
 	I2C_8, I2C_9, I2C_10,
 };
 
-/* Multi I2C busses handling */
-#ifdef CONFIG_SOFT_I2C_MULTI_BUS
-extern int get_multi_scl_pin(void);
-extern int get_multi_sda_pin(void);
-extern int multi_i2c_init(void);
-#endif
-
 /**
  * Get FDT values for i2c bus.
  *
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 668f238459..ba90758a29 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2838,7 +2838,6 @@  CONFIG_SOFT_I2C_I2C5_SCL
 CONFIG_SOFT_I2C_I2C5_SDA
 CONFIG_SOFT_I2C_I2C9_SCL
 CONFIG_SOFT_I2C_I2C9_SDA
-CONFIG_SOFT_I2C_MULTI_BUS
 CONFIG_SOFT_I2C_READ_REPEATED_START
 CONFIG_SOFT_SPI
 CONFIG_SOFT_TWS