Re: [PATCH] mtd: remove drivers/mtd/mw_eeprom.c

2021-01-19 Thread Tom Rini
On Sun, Dec 27, 2020 at 11:54:23AM +0100, Heinrich Schuchardt wrote:

> drivers/mtd/mw_eeprom.c contains code that never worked. mw_eeprom_write()
> and mw_eeprom_read() have incorrect loop conditions:
> 
>   while (len <= 2) {
> 
> CONFIG_MW_EEPROM is not set anywhere. So let's simply drop the module.
> 
> Signed-off-by: Heinrich Schuchardt 

Applied to u-boot/master, thanks!

-- 
Tom


signature.asc
Description: PGP signature


[PATCH] mtd: remove drivers/mtd/mw_eeprom.c

2020-12-27 Thread Heinrich Schuchardt
drivers/mtd/mw_eeprom.c contains code that never worked. mw_eeprom_write()
and mw_eeprom_read() have incorrect loop conditions:

while (len <= 2) {

CONFIG_MW_EEPROM is not set anywhere. So let's simply drop the module.

Signed-off-by: Heinrich Schuchardt 
---
 drivers/mtd/Makefile|   1 -
 drivers/mtd/mw_eeprom.c | 238 
 2 files changed, 239 deletions(-)
 delete mode 100644 drivers/mtd/mw_eeprom.c

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 318788c5e2..6d77ebfaa5 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -11,7 +11,6 @@ mtd-$(CONFIG_ALTERA_QSPI) += altera_qspi.o
 mtd-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o
 mtd-$(CONFIG_FLASH_CFI_MTD) += cfi_mtd.o
 mtd-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o
-mtd-$(CONFIG_MW_EEPROM) += mw_eeprom.o
 mtd-$(CONFIG_FLASH_PIC32) += pic32_flash.o
 mtd-$(CONFIG_ST_SMI) += st_smi.o
 mtd-$(CONFIG_STM32_FLASH) += stm32_flash.o
diff --git a/drivers/mtd/mw_eeprom.c b/drivers/mtd/mw_eeprom.c
deleted file mode 100644
index 9837733bee..00
--- a/drivers/mtd/mw_eeprom.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/* Three-wire (MicroWire) serial eeprom driver (for 93C46 and compatibles) */
-
-#include 
-#include 
-#include 
-#include 
-
-/*
- * Serial EEPROM opcodes, including start bit
- */
-#define EEP_OPC_ERASE  0x7  /* 3-bit opcode */
-#define EEP_OPC_WRITE  0x5  /* 3-bit opcode */
-#define EEP_OPC_READ   0x6  /* 3-bit opcode */
-
-#define EEP_OPC_ERASE_ALL  0x12 /* 5-bit opcode */
-#define EEP_OPC_ERASE_EN   0x13 /* 5-bit opcode */
-#define EEP_OPC_WRITE_ALL  0x11 /* 5-bit opcode */
-#define EEP_OPC_ERASE_DIS  0x10 /* 5-bit opcode */
-
-static int addrlen;
-
-static void mw_eeprom_select(int dev)
-{
-   ssi_set_interface(2048, 0, 0, 0);
-   ssi_chip_select(0);
-   udelay(1);
-   ssi_chip_select(dev);
-   udelay(1);
-}
-
-static int mw_eeprom_size(int dev)
-{
-   int x;
-   u16 res;
-
-   mw_eeprom_select(dev);
-   ssi_tx_byte(EEP_OPC_READ);
-
-   res = ssi_txrx_byte(0) << 8;
-   res |= ssi_rx_byte();
-   for (x = 0; x < 16; x++) {
-   if (! (res & 0x8000)) {
-   break;
-   }
-   res <<= 1;
-   }
-   ssi_chip_select(0);
-
-   return x;
-}
-
-int mw_eeprom_erase_enable(int dev)
-{
-   mw_eeprom_select(dev);
-   ssi_tx_byte(EEP_OPC_ERASE_EN);
-   ssi_tx_byte(0);
-   udelay(1);
-   ssi_chip_select(0);
-
-   return 0;
-}
-
-int mw_eeprom_erase_disable(int dev)
-{
-   mw_eeprom_select(dev);
-   ssi_tx_byte(EEP_OPC_ERASE_DIS);
-   ssi_tx_byte(0);
-   udelay(1);
-   ssi_chip_select(0);
-
-   return 0;
-}
-
-
-u32 mw_eeprom_read_word(int dev, int addr)
-{
-   u16 rcv;
-   u16 res;
-   int bits;
-
-   mw_eeprom_select(dev);
-   ssi_tx_byte((EEP_OPC_READ << 5) | ((addr >> (addrlen - 5)) & 0x1f));
-   rcv = ssi_txrx_byte(addr << (13 - addrlen));
-   res = rcv << (16 - addrlen);
-   bits = 4 + addrlen;
-
-   while (bits>0) {
-   rcv = ssi_rx_byte();
-   if (bits > 7) {
-   res |= rcv << (bits - 8);
-   } else {
-   res |= rcv >> (8 - bits);
-   }
-   bits -= 8;
-   }
-
-   ssi_chip_select(0);
-
-   return res;
-}
-
-int mw_eeprom_write_word(int dev, int addr, u16 data)
-{
-   u8 byte1=0;
-   u8 byte2=0;
-
-   mw_eeprom_erase_enable(dev);
-   mw_eeprom_select(dev);
-
-   switch (addrlen) {
-case 6:
-   byte1 = EEP_OPC_WRITE >> 2;
-   byte2 = (EEP_OPC_WRITE << 6)&0xc0;
-   byte2 |= addr;
-   break;
-case 7:
-   byte1 = EEP_OPC_WRITE >> 1;
-   byte2 = (EEP_OPC_WRITE << 7)&0x80;
-   byte2 |= addr;
-   break;
-case 8:
-   byte1 = EEP_OPC_WRITE;
-   byte2 = addr;
-   break;
-case 9:
-   byte1 = EEP_OPC_WRITE << 1;
-   byte1 |= addr >> 8;
-   byte2 = addr & 0xff;
-   break;
-case 10:
-   byte1 = EEP_OPC_WRITE << 2;
-   byte1 |= addr >> 8;
-   byte2 = addr & 0xff;
-   break;
-default:
-   printf("Unsupported number of address bits: %d\n", addrlen);
-   return -1;
-
-   }
-
-   ssi_tx_byte(byte1);
-   ssi_tx_byte(byte2);
-   ssi_tx_byte(data >> 8);
-   ssi_tx_byte(data & 0xff);
-   ssi_chip_select(0);
-   udelay(1); /* Worst case */
-   mw_eeprom_erase_disable(dev);
-
-   return 0;
-}
-
-
-int mw_eeprom_write(int dev, int addr, u8 *buffer, int len)
-{
-   int done;
-
-   done = 0;
-   if (addr & 1) {
-   u16 temp = mw_eeprom_read_word(dev, addr >> 1);
-   temp &= 0xff00;
-   temp