From eca803756ab49d393025bb299f3e0b0b8a482a35 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 28 Mar 2017 10:27:32 -0600 Subject: [PATCH] i2c: Drop CONFIG_SOFT_I2C_MULTI_BUS This is not used by any board. Drop it. Signed-off-by: Simon Glass 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 Acked-by: Jaehoon Chung --- 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 - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include - -#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 3bc3ae07ba..7fdab589e3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2697,7 +2697,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 -- 2.39.5