]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
i2c: Remove legacy CONFIG_SYS_I2C_SOFT
authorTom Rini <trini@konsulko.com>
Fri, 20 Mar 2026 20:53:21 +0000 (14:53 -0600)
committerHeiko Schocher <hs@nabladev.com>
Thu, 14 May 2026 09:17:20 +0000 (11:17 +0200)
The last users of this legacy i2c stack have been removed or converted
to a modern part of the stack instead. Remove this code and references
to it.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Heiko Schocher <hs@nabladev.com>
README
board/nxp/m53017evb/README
board/nxp/m5373evb/README
drivers/i2c/Kconfig
drivers/i2c/Makefile
drivers/i2c/soft_i2c.c

diff --git a/README b/README
index 6836a917c790effb3280cc22a5a97e000ab08d8f..f0bad144360a5167af141e934c6670ae07079bd1 100644 (file)
--- a/README
+++ b/README
@@ -628,98 +628,6 @@ The following options need to be configured:
 
                If you do not have i2c muxes on your board, omit this define.
 
-- Legacy I2C Support:
-               If you use the software i2c interface (CONFIG_SYS_I2C_SOFT)
-               then the following macros need to be defined (examples are
-               from include/configs/lwmon.h):
-
-               I2C_INIT
-
-               (Optional). Any commands necessary to enable the I2C
-               controller or configure ports.
-
-               eg: #define I2C_INIT (immr->im_cpm.cp_pbdir |=  PB_SCL)
-
-               I2C_ACTIVE
-
-               The code necessary to make the I2C data line active
-               (driven).  If the data line is open collector, this
-               define can be null.
-
-               eg: #define I2C_ACTIVE (immr->im_cpm.cp_pbdir |=  PB_SDA)
-
-               I2C_TRISTATE
-
-               The code necessary to make the I2C data line tri-stated
-               (inactive).  If the data line is open collector, this
-               define can be null.
-
-               eg: #define I2C_TRISTATE (immr->im_cpm.cp_pbdir &= ~PB_SDA)
-
-               I2C_READ
-
-               Code that returns true if the I2C data line is high,
-               false if it is low.
-
-               eg: #define I2C_READ ((immr->im_cpm.cp_pbdat & PB_SDA) != 0)
-
-               I2C_SDA(bit)
-
-               If <bit> is true, sets the I2C data line high. If it
-               is false, it clears it (low).
-
-               eg: #define I2C_SDA(bit) \
-                       if(bit) immr->im_cpm.cp_pbdat |=  PB_SDA; \
-                       else    immr->im_cpm.cp_pbdat &= ~PB_SDA
-
-               I2C_SCL(bit)
-
-               If <bit> is true, sets the I2C clock line high. If it
-               is false, it clears it (low).
-
-               eg: #define I2C_SCL(bit) \
-                       if(bit) immr->im_cpm.cp_pbdat |=  PB_SCL; \
-                       else    immr->im_cpm.cp_pbdat &= ~PB_SCL
-
-               I2C_DELAY
-
-               This delay is invoked four times per clock cycle so this
-               controls the rate of data transfer.  The data rate thus
-               is 1 / (I2C_DELAY * 4). Often defined to be something
-               like:
-
-               #define I2C_DELAY  udelay(2)
-
-               CONFIG_SOFT_I2C_GPIO_SCL / CONFIG_SOFT_I2C_GPIO_SDA
-
-               If your arch supports the generic GPIO framework (asm/gpio.h),
-               then you may alternatively define the two GPIOs that are to be
-               used as SCL / SDA.  Any of the previous I2C_xxx macros will
-               have GPIO-based defaults assigned to them as appropriate.
-
-               You should define these to the GPIO value as given directly to
-               the generic GPIO functions.
-
-               CFG_SYS_I2C_NOPROBES
-
-               This option specifies a list of I2C devices that will be skipped
-               when the 'i2c probe' command is issued.
-
-               e.g.
-                       #define CFG_SYS_I2C_NOPROBES {0x50,0x68}
-
-               will skip addresses 0x50 and 0x68 on a board with one I2C bus
-
-               CONFIG_SOFT_I2C_READ_REPEATED_START
-
-               defining this will force the i2c_read() function in
-               the soft_i2c driver to perform an I2C repeated start
-               between writing the address pointer and reading the
-               data.  If this define is omitted the default behaviour
-               of doing a stop-start sequence will be used.  Most I2C
-               devices can use either method, but some require one or
-               the other.
-
 - SPI Support: CONFIG_SPI
 
                Enables SPI driver (so far only tested with
index 25831629266930c29c15e5904486324a91c4b796..c6dc020af371c37ed0f9ed9c2e94c26fbde7129c 100644 (file)
@@ -90,10 +90,6 @@ MCFFEC_TOUT_LOOP             -- set FEC timeout loop
 CONFIG_MCFTMR                  -- define to use DMA timer
 
 CONFIG_SYS_I2C_FSL             -- define to use FSL common I2C driver
-CONFIG_SYS_I2C_SOFT            -- define for I2C bit-banged
-CONFIG_SYS_I2C_SPEED           -- define for I2C speed
-CONFIG_SYS_I2C_SLAVE           -- define for I2C slave address
-CONFIG_SYS_I2C_OFFSET          -- define for I2C base address offset
 CONFIG_SYS_IMMR                        -- define for MBAR offset
 
 CFG_SYS_MBAR                   -- define MBAR offset
index c7130b3225141adb82ed92e448eccabec772923f..7217886fdfaae38393efff31488b3b5e2b6a0305 100644 (file)
@@ -89,10 +89,6 @@ MCFFEC_TOUT_LOOP     -- set FEC timeout loop
 CONFIG_MCFTMR          -- define to use DMA timer
 
 CONFIG_SYS_I2C_FSL     -- define to use FSL common I2C driver
-CONFIG_SYS_I2C_SOFT    -- define for I2C bit-banged
-CONFIG_SYS_I2C_SPEED           -- define for I2C speed
-CONFIG_SYS_I2C_SLAVE           -- define for I2C slave address
-CONFIG_SYS_I2C_OFFSET          -- define for I2C base address offset
 CONFIG_SYS_IMMR                -- define for MBAR offset
 
 CFG_SYS_MBAR           -- define MBAR offset
index 55465dc1d4634841abab937a096373f594a8d938..37288a47eb757165773d4e8c8bf31b335a3bbf6c 100644 (file)
@@ -624,26 +624,6 @@ config SH_I2C_CLOCK
        default 104000000
 endif
 
-config SYS_I2C_SOFT
-       bool "Legacy software I2C interface"
-       depends on !COMPILE_TEST
-       help
-         Enable the legacy software defined I2C interface
-
-config SYS_I2C_SOFT_SPEED
-       int "Software I2C bus speed"
-       depends on SYS_I2C_SOFT
-       default 100000
-       help
-         Speed of the software I2C bus
-
-config SYS_I2C_SOFT_SLAVE
-       hex "Software I2C slave address"
-       depends on SYS_I2C_SOFT
-       default 0xfe
-       help
-         Slave address of the software I2C bus
-
 config SYS_I2C_OCTEON
        bool "Octeon II/III/TX/TX2 I2C driver"
        depends on (ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2) && DM_I2C
index 5fe30d0df4fcfa7bb5046c82f1485ec864152f56..2da649e97d3bd1f201344e9e01394a9e14913af4 100644 (file)
@@ -47,7 +47,6 @@ obj-$(CONFIG_SYS_I2C_RZ_RIIC) += rz_riic.o
 obj-$(CONFIG_SYS_I2C_S3C24X0) += s3c24x0_i2c.o exynos_hs_i2c.o
 obj-$(CONFIG_SYS_I2C_SANDBOX) += sandbox_i2c.o i2c-emul-uclass.o
 obj-$(CONFIG_SYS_I2C_SH) += sh_i2c.o
-obj-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o
 obj-$(CONFIG_SYS_I2C_STM32F7) += stm32f7_i2c.o
 obj-$(CONFIG_SYS_I2C_SUN6I_P2WI) += sun6i_p2wi.o
 obj-$(CONFIG_SYS_I2C_SUN8I_RSB) += sun8i_rsb.o
index 4102375e5b7390b5cfc96d46d3920880f6c0f797..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,418 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2009
- * Heiko Schocher, DENX Software Engineering, hs@denx.de.
- * Changes for multibus/multiadapter I2C support.
- *
- * (C) Copyright 2001, 2002
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * This has been changed substantially by Gerald Van Baren, Custom IDEAS,
- * vanbaren@cideas.com.  It was heavily influenced by LiMon, written by
- * Neil Russell.
- *
- * NOTE: This driver should be converted to driver model before June 2017.
- * Please see doc/driver-model/i2c-howto.rst for instructions.
- */
-
-#include <config.h>
-#if defined(CONFIG_AT91FAMILY)
-#include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pio.h>
-#ifdef CONFIG_ATMEL_LEGACY
-#include <asm/arch/gpio.h>
-#endif
-#endif
-#include <i2c.h>
-#include <linux/delay.h>
-
-#if defined(CONFIG_SOFT_I2C_GPIO_SCL)
-# include <asm/gpio.h>
-
-# ifndef I2C_GPIO_SYNC
-#  define I2C_GPIO_SYNC
-# endif
-
-# ifndef I2C_INIT
-#  define I2C_INIT \
-       do { \
-               gpio_request(CONFIG_SOFT_I2C_GPIO_SCL, "soft_i2c"); \
-               gpio_request(CONFIG_SOFT_I2C_GPIO_SDA, "soft_i2c"); \
-       } while (0)
-# endif
-
-# ifndef I2C_ACTIVE
-#  define I2C_ACTIVE do { } while (0)
-# endif
-
-# ifndef I2C_TRISTATE
-#  define I2C_TRISTATE do { } while (0)
-# endif
-
-# ifndef I2C_READ
-#  define I2C_READ gpio_get_value(CONFIG_SOFT_I2C_GPIO_SDA)
-# endif
-
-# ifndef I2C_SDA
-#  define I2C_SDA(bit) \
-       do { \
-               if (bit) \
-                       gpio_direction_input(CONFIG_SOFT_I2C_GPIO_SDA); \
-               else \
-                       gpio_direction_output(CONFIG_SOFT_I2C_GPIO_SDA, 0); \
-               I2C_GPIO_SYNC; \
-       } while (0)
-# endif
-
-# ifndef I2C_SCL
-#  define I2C_SCL(bit) \
-       do { \
-               gpio_direction_output(CONFIG_SOFT_I2C_GPIO_SCL, bit); \
-               I2C_GPIO_SYNC; \
-       } while (0)
-# endif
-
-# ifndef I2C_DELAY
-#  define I2C_DELAY udelay(5)  /* 1/4 I2C clock duration */
-# endif
-
-#endif
-
-/* #define     DEBUG_I2C       */
-
-#ifndef        I2C_SOFT_DECLARATIONS
-#  define I2C_SOFT_DECLARATIONS
-#endif
-
-/*-----------------------------------------------------------------------
- * Definitions
- */
-#define RETRIES                0
-
-#define I2C_ACK                0               /* PD_SDA level to ack a byte */
-#define I2C_NOACK      1               /* PD_SDA level to noack a byte */
-
-#ifdef DEBUG_I2C
-#define PRINTD(fmt,args...)    do {    \
-               printf (fmt ,##args);   \
-       } while (0)
-#else
-#define PRINTD(fmt,args...)
-#endif
-
-/*-----------------------------------------------------------------------
- * Local functions
- */
-static void  send_reset        (void);
-static void  send_start        (void);
-static void  send_stop (void);
-static void  send_ack  (int);
-static int   write_byte        (uchar byte);
-static uchar read_byte (int);
-
-/*-----------------------------------------------------------------------
- * Send a reset sequence consisting of 9 clocks with the data signal high
- * to clock any confused device back into an idle state.  Also send a
- * <stop> at the end of the sequence for belts & suspenders.
- */
-static void send_reset(void)
-{
-       I2C_SOFT_DECLARATIONS   /* intentional without ';' */
-       int j;
-
-       I2C_SCL(1);
-       I2C_SDA(1);
-#ifdef I2C_INIT
-       I2C_INIT;
-#endif
-       I2C_TRISTATE;
-       for(j = 0; j < 9; j++) {
-               I2C_SCL(0);
-               I2C_DELAY;
-               I2C_DELAY;
-               I2C_SCL(1);
-               I2C_DELAY;
-               I2C_DELAY;
-       }
-       send_stop();
-       I2C_TRISTATE;
-}
-
-/*-----------------------------------------------------------------------
- * START: High -> Low on SDA while SCL is High
- */
-static void send_start(void)
-{
-       I2C_SOFT_DECLARATIONS   /* intentional without ';' */
-
-       I2C_DELAY;
-       I2C_SDA(1);
-       I2C_ACTIVE;
-       I2C_DELAY;
-       I2C_SCL(1);
-       I2C_DELAY;
-       I2C_SDA(0);
-       I2C_DELAY;
-}
-
-/*-----------------------------------------------------------------------
- * STOP: Low -> High on SDA while SCL is High
- */
-static void send_stop(void)
-{
-       I2C_SOFT_DECLARATIONS   /* intentional without ';' */
-
-       I2C_SCL(0);
-       I2C_DELAY;
-       I2C_SDA(0);
-       I2C_ACTIVE;
-       I2C_DELAY;
-       I2C_SCL(1);
-       I2C_DELAY;
-       I2C_SDA(1);
-       I2C_DELAY;
-       I2C_TRISTATE;
-}
-
-/*-----------------------------------------------------------------------
- * ack should be I2C_ACK or I2C_NOACK
- */
-static void send_ack(int ack)
-{
-       I2C_SOFT_DECLARATIONS   /* intentional without ';' */
-
-       I2C_SCL(0);
-       I2C_DELAY;
-       I2C_ACTIVE;
-       I2C_SDA(ack);
-       I2C_DELAY;
-       I2C_SCL(1);
-       I2C_DELAY;
-       I2C_DELAY;
-       I2C_SCL(0);
-       I2C_DELAY;
-}
-
-/*-----------------------------------------------------------------------
- * Send 8 bits and look for an acknowledgement.
- */
-static int write_byte(uchar data)
-{
-       I2C_SOFT_DECLARATIONS   /* intentional without ';' */
-       int j;
-       int nack;
-
-       I2C_ACTIVE;
-       for(j = 0; j < 8; j++) {
-               I2C_SCL(0);
-               I2C_DELAY;
-               I2C_SDA(data & 0x80);
-               I2C_DELAY;
-               I2C_SCL(1);
-               I2C_DELAY;
-               I2C_DELAY;
-
-               data <<= 1;
-       }
-
-       /*
-        * Look for an <ACK>(negative logic) and return it.
-        */
-       I2C_SCL(0);
-       I2C_DELAY;
-       I2C_SDA(1);
-       I2C_TRISTATE;
-       I2C_DELAY;
-       I2C_SCL(1);
-       I2C_DELAY;
-       I2C_DELAY;
-       nack = I2C_READ;
-       I2C_SCL(0);
-       I2C_DELAY;
-       I2C_ACTIVE;
-
-       return(nack);   /* not a nack is an ack */
-}
-
-/*-----------------------------------------------------------------------
- * if ack == I2C_ACK, ACK the byte so can continue reading, else
- * send I2C_NOACK to end the read.
- */
-static uchar read_byte(int ack)
-{
-       I2C_SOFT_DECLARATIONS   /* intentional without ';' */
-       int  data;
-       int  j;
-
-       /*
-        * Read 8 bits, MSB first.
-        */
-       I2C_TRISTATE;
-       I2C_SDA(1);
-       data = 0;
-       for(j = 0; j < 8; j++) {
-               I2C_SCL(0);
-               I2C_DELAY;
-               I2C_SCL(1);
-               I2C_DELAY;
-               data <<= 1;
-               data |= I2C_READ;
-               I2C_DELAY;
-       }
-       send_ack(ack);
-
-       return(data);
-}
-
-/*-----------------------------------------------------------------------
- * Initialization
- */
-static void soft_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr)
-{
-       /*
-        * WARNING: Do NOT save speed in a static variable: if the
-        * I2C routines are called before RAM is initialized (to read
-        * the DIMM SPD, for instance), RAM won't be usable and your
-        * system will crash.
-        */
-       send_reset ();
-}
-
-/*-----------------------------------------------------------------------
- * Probe to see if a chip is present.  Also good for checking for the
- * completion of EEPROM writes since the chip stops responding until
- * the write completes (typically 10mSec).
- */
-static int soft_i2c_probe(struct i2c_adapter *adap, uint8_t addr)
-{
-       int rc;
-
-       /*
-        * perform 1 byte write transaction with just address byte
-        * (fake write)
-        */
-       send_start();
-       rc = write_byte ((addr << 1) | 0);
-       send_stop();
-
-       return (rc ? 1 : 0);
-}
-
-/*-----------------------------------------------------------------------
- * Read bytes
- */
-static int  soft_i2c_read(struct i2c_adapter *adap, uchar chip, uint addr,
-                       int alen, uchar *buffer, int len)
-{
-       int shift;
-       PRINTD("i2c_read: chip %02X addr %02X alen %d buffer %p len %d\n",
-               chip, addr, alen, buffer, len);
-
-#ifdef CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
-       /*
-        * EEPROM chips that implement "address overflow" are ones
-        * like Catalyst 24WC04/08/16 which has 9/10/11 bits of
-        * address and the extra bits end up in the "chip address"
-        * bit slots. This makes a 24WC08 (1Kbyte) chip look like
-        * four 256 byte chips.
-        *
-        * Note that we consider the length of the address field to
-        * still be one byte because the extra address bits are
-        * hidden in the chip address.
-        */
-       chip |= ((addr >> (alen * 8)) & CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW);
-
-       PRINTD("i2c_read: fix addr_overflow: chip %02X addr %02X\n",
-               chip, addr);
-#endif
-
-       /*
-        * Do the addressing portion of a write cycle to set the
-        * chip's address pointer.  If the address length is zero,
-        * don't do the normal write cycle to set the address pointer,
-        * there is no address pointer in this chip.
-        */
-       send_start();
-       if(alen > 0) {
-               if(write_byte(chip << 1)) {     /* write cycle */
-                       send_stop();
-                       PRINTD("i2c_read, no chip responded %02X\n", chip);
-                       return(1);
-               }
-               shift = (alen-1) * 8;
-               while(alen-- > 0) {
-                       if(write_byte(addr >> shift)) {
-                               PRINTD("i2c_read, address not <ACK>ed\n");
-                               return(1);
-                       }
-                       shift -= 8;
-               }
-
-               /* Some I2C chips need a stop/start sequence here,
-                * other chips don't work with a full stop and need
-                * only a start.  Default behaviour is to send the
-                * stop/start sequence.
-                */
-#ifdef CONFIG_SOFT_I2C_READ_REPEATED_START
-               send_start();
-#else
-               send_stop();
-               send_start();
-#endif
-       }
-       /*
-        * Send the chip address again, this time for a read cycle.
-        * Then read the data.  On the last byte, we do a NACK instead
-        * of an ACK(len == 0) to terminate the read.
-        */
-       write_byte((chip << 1) | 1);    /* read cycle */
-       while(len-- > 0) {
-               *buffer++ = read_byte(len == 0);
-       }
-       send_stop();
-       return(0);
-}
-
-/*-----------------------------------------------------------------------
- * Write bytes
- */
-static int  soft_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr,
-                       int alen, uchar *buffer, int len)
-{
-       int shift, failures = 0;
-
-       PRINTD("i2c_write: chip %02X addr %02X alen %d buffer %p len %d\n",
-               chip, addr, alen, buffer, len);
-
-       send_start();
-       if(write_byte(chip << 1)) {     /* write cycle */
-               send_stop();
-               PRINTD("i2c_write, no chip responded %02X\n", chip);
-               return(1);
-       }
-       shift = (alen-1) * 8;
-       while(alen-- > 0) {
-               if(write_byte(addr >> shift)) {
-                       PRINTD("i2c_write, address not <ACK>ed\n");
-                       return(1);
-               }
-               shift -= 8;
-       }
-
-       while(len-- > 0) {
-               if(write_byte(*buffer++)) {
-                       failures++;
-               }
-       }
-       send_stop();
-       return(failures);
-}
-
-/*
- * Register soft i2c adapters
- */
-U_BOOT_I2C_ADAP_COMPLETE(soft00, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED, CONFIG_SYS_I2C_SOFT_SLAVE,
-                        0)