3 files changed, 3 insertions, 24 deletions
diff --git a/src/drivers/i2c/rx6110sa/Kconfig b/src/drivers/i2c/rx6110sa/Kconfig
index 48654c6083..a5608f82f7 100644
--- a/src/drivers/i2c/rx6110sa/Kconfig
+++ b/src/drivers/i2c/rx6110sa/Kconfig
@@ -3,10 +3,3 @@ config DRIVERS_I2C_RX6110SA
 	default n
 	help
 	  Enable support for external RTC chip RX6110 SA.
-
-config RX6110SA_USE_SMBUS
-	bool
-	default n
-	help
-	  Select this option if the RTC RX6110SA is connected to a SMBus controller.
-	  If not selected I2C controller is used instead.
diff --git a/src/drivers/i2c/rx6110sa/rx6110sa.c b/src/drivers/i2c/rx6110sa/rx6110sa.c
index 2402d59ebf..aad109781d 100644
--- a/src/drivers/i2c/rx6110sa/rx6110sa.c
+++ b/src/drivers/i2c/rx6110sa/rx6110sa.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <device/i2c_simple.h>
-#include <device/smbus.h>
+#include <device/i2c_bus.h>
 #include <device/device.h>
 #include <version.h>
 #include <console/console.h>
@@ -23,28 +22,16 @@
 #include "chip.h"
 #include "rx6110sa.h"
 
-#define I2C_BUS_NUM	(dev->bus->secondary - 1)
-#define I2C_DEV_NUM	(dev->path.i2c.device)
-
 /* Function to write a register in the RTC with the given value. */
 static void rx6110sa_write(struct device *dev, uint8_t reg, uint8_t val)
 {
-	if (IS_ENABLED(CONFIG_RX6110SA_USE_SMBUS))
-		smbus_write_byte(dev, reg, val);
-	else
-		i2c_writeb(I2C_BUS_NUM, I2C_DEV_NUM, reg, val);
+	i2c_writeb_at(dev, reg, val);
 }
 
 /* Function to read a register in the RTC. */
 static uint8_t rx6110sa_read(struct device *dev, uint8_t reg)
 {
-	uint8_t val = 0;
-
-	if (IS_ENABLED(CONFIG_RX6110SA_USE_SMBUS))
-		val = smbus_read_byte(dev, reg);
-	else
-		i2c_readb(I2C_BUS_NUM, I2C_DEV_NUM, reg, &val);
-	return val;
+	return (uint8_t)i2c_readb_at(dev, reg);
 }
 
 /* Set RTC date from coreboot build date. */
diff --git a/src/mainboard/siemens/mc_bdx1/Kconfig b/src/mainboard/siemens/mc_bdx1/Kconfig
index 0200d926d5..dc2093d58a 100644
--- a/src/mainboard/siemens/mc_bdx1/Kconfig
+++ b/src/mainboard/siemens/mc_bdx1/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVER_INTEL_I210
 	select DRIVER_SIEMENS_NC_FPGA
 	select DRIVERS_I2C_RX6110SA
-	select RX6110SA_USE_SMBUS
 
 config MAINBOARD_DIR
 	string