i2c: remove i2c driver-model compatibility layer

There are no more users of the compatibility layer for i2c. Remove the
driver and all references to it.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: Heiko Schocher <hs@denx.de>

3 files changed, 1 insertions, 141 deletions

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 4772db3837..03d2fed341 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -12,18 +12,7 @@ config DM_I2C
 	  write and speed, is implemented with the bus drivers operations,
 	  which provide methods for bus setting and data transfer. Each chip
 	  device (bus child) info is kept as parent platdata. The interface
-	  is defined in include/i2c.h. When i2c bus driver supports the i2c
-	  uclass, but the device drivers not, then DM_I2C_COMPAT config can
-	  be used as compatibility layer.
-
-config DM_I2C_COMPAT
-	bool "Enable I2C compatibility layer"
-	depends on DM
-	help
-	  Enable old-style I2C functions for compatibility with existing code.
-	  This option can be enabled as a temporary measure to avoid needing
-	  to convert all code for a board in a single commit. It should not
-	  be enabled for any board in an official release.
+	  is defined in include/i2c.h.
 
 config I2C_CROS_EC_TUNNEL
 	tristate "Chrome OS EC tunnel I2C bus"
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index dc40055efb..c2f75d8755 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -3,7 +3,6 @@
 # (C) Copyright 2000-2007
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 obj-$(CONFIG_DM_I2C) += i2c-uclass.o
-obj-$(CONFIG_DM_I2C_COMPAT) += i2c-uclass-compat.o
 obj-$(CONFIG_DM_I2C_GPIO) += i2c-gpio.o
 obj-$(CONFIG_$(SPL_)I2C_CROS_EC_TUNNEL) += cros_ec_tunnel.o
 obj-$(CONFIG_$(SPL_)I2C_CROS_EC_LDO) += cros_ec_ldo.o
diff --git a/drivers/i2c/i2c-uclass-compat.c b/drivers/i2c/i2c-uclass-compat.c
deleted file mode 100644
index b3ade88113..0000000000
--- a/drivers/i2c/i2c-uclass-compat.c
+++ /dev/null
@@ -1,128 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2014 Google, Inc
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <i2c.h>
-
-static int cur_busnum __attribute__((section(".data")));
-
-static int i2c_compat_get_device(uint chip_addr, int alen,
-				 struct udevice **devp)
-{
-	struct dm_i2c_chip *chip;
-	int ret;
-
-	ret = i2c_get_chip_for_busnum(cur_busnum, chip_addr, alen, devp);
-	if (ret)
-		return ret;
-	chip = dev_get_parent_platdata(*devp);
-	if (chip->offset_len != alen) {
-		printf("I2C chip %x: requested alen %d does not match chip offset_len %d\n",
-		       chip_addr, alen, chip->offset_len);
-		return -EADDRNOTAVAIL;
-	}
-
-	return 0;
-}
-
-int i2c_probe(uint8_t chip_addr)
-{
-	struct udevice *bus, *dev;
-	int ret;
-
-	ret = uclass_get_device_by_seq(UCLASS_I2C, cur_busnum, &bus);
-	if (ret) {
-		debug("Cannot find I2C bus %d: err=%d\n", cur_busnum, ret);
-		return ret;
-	}
-
-	if (!bus)
-		return -ENOENT;
-
-	return dm_i2c_probe(bus, chip_addr, 0, &dev);
-}
-
-int i2c_read(uint8_t chip_addr, unsigned int addr, int alen, uint8_t *buffer,
-	     int len)
-{
-	struct udevice *dev;
-	int ret;
-
-	ret = i2c_compat_get_device(chip_addr, alen, &dev);
-	if (ret)
-		return ret;
-
-	return dm_i2c_read(dev, addr, buffer, len);
-}
-
-int i2c_write(uint8_t chip_addr, unsigned int addr, int alen, uint8_t *buffer,
-	      int len)
-{
-	struct udevice *dev;
-	int ret;
-
-	ret = i2c_compat_get_device(chip_addr, alen, &dev);
-	if (ret)
-		return ret;
-
-	return dm_i2c_write(dev, addr, buffer, len);
-}
-
-int i2c_get_bus_num_fdt(int node)
-{
-	struct udevice *bus;
-	int ret;
-
-	ret = uclass_get_device_by_of_offset(UCLASS_I2C, node, &bus);
-	if (ret)
-		return ret;
-
-	return bus->seq;
-}
-
-unsigned int i2c_get_bus_num(void)
-{
-	return cur_busnum;
-}
-
-int i2c_set_bus_num(unsigned int bus)
-{
-	cur_busnum = bus;
-
-	return 0;
-}
-
-void i2c_init(int speed, int slaveaddr)
-{
-	/* Nothing to do here - the init happens through driver model */
-}
-
-void board_i2c_init(const void *blob)
-{
-	/* Nothing to do here - the init happens through driver model */
-}
-
-uint8_t i2c_reg_read(uint8_t chip_addr, uint8_t offset)
-{
-	struct udevice *dev;
-	int ret;
-
-	ret = i2c_compat_get_device(chip_addr, 1, &dev);
-	if (ret)
-		return 0xff;
-	return dm_i2c_reg_read(dev, offset);
-}
-
-void i2c_reg_write(uint8_t chip_addr, uint8_t offset, uint8_t val)
-{
-	struct udevice *dev;
-	int ret;
-
-	ret = i2c_compat_get_device(chip_addr, 1, &dev);
-	if (!ret)
-		dm_i2c_reg_write(dev, offset, val);
-}