Hello Simon,
Am 15.05.2017 um 12:57 schrieb Simon Glass:
This option enables a command in the driver. But the functions defined by the driver are not called anywhere else in U-Boot. So it does not seem useful to have this driver without its commands.
Drop this option, move the header file out of the common include/ directory and make all the function static.
Signed-off-by: Simon Glass sjg@chromium.org
drivers/misc/ds4510.c | 22 ++++++++++------------ {include => drivers/misc}/ds4510.h | 10 ---------- include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 10 insertions(+), 25 deletions(-) rename {include => drivers/misc}/ds4510.h (75%)
Reviewed-by: Heiko Schocher hs@denx.de
bye, Heiko
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index c08a0bee63..9ffdafc992 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -12,7 +12,7 @@ #include <common.h> #include <i2c.h> #include <command.h> -#include <ds4510.h> +#include "ds4510.h"
/* Default to an address that hopefully won't corrupt other i2c devices */ #ifndef CONFIG_SYS_I2C_DS4510_ADDR @@ -35,7 +35,7 @@ enum { /*
- Write to DS4510, taking page boundaries into account
*/ -int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count) +static int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count) { int wrlen; int i = 0; @@ -64,7 +64,7 @@ int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count) /*
- General read from DS4510
*/ -int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count) +static int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count) { return i2c_read(chip, offset, 1, buf, count); } @@ -74,7 +74,7 @@ int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count)
- nv = 0 - Writes to SEEPROM registers behave like EEPROM
- nv = 1 - Writes to SEEPROM registers behave like SRAM
*/ -int ds4510_see_write(uint8_t chip, uint8_t nv) +static int ds4510_see_write(uint8_t chip, uint8_t nv) { uint8_t data;
@@ -92,7 +92,7 @@ int ds4510_see_write(uint8_t chip, uint8_t nv) /*
- Write de-assertion of reset signal delay
*/ -int ds4510_rstdelay_write(uint8_t chip, uint8_t delay) +static int ds4510_rstdelay_write(uint8_t chip, uint8_t delay) { uint8_t data;
@@ -108,7 +108,7 @@ int ds4510_rstdelay_write(uint8_t chip, uint8_t delay) /*
- Write pullup characteristics of IO pins
*/ -int ds4510_pullup_write(uint8_t chip, uint8_t val) +static int ds4510_pullup_write(uint8_t chip, uint8_t val) { val &= DS4510_IO_MASK;
@@ -118,7 +118,7 @@ int ds4510_pullup_write(uint8_t chip, uint8_t val) /*
- Read pullup characteristics of IO pins
*/ -int ds4510_pullup_read(uint8_t chip) +static int ds4510_pullup_read(uint8_t chip) { uint8_t val;
@@ -131,7 +131,7 @@ int ds4510_pullup_read(uint8_t chip) /*
- Write drive level of IO pins
*/ -int ds4510_gpio_write(uint8_t chip, uint8_t val) +static int ds4510_gpio_write(uint8_t chip, uint8_t val) { uint8_t data; int i; @@ -155,7 +155,7 @@ int ds4510_gpio_write(uint8_t chip, uint8_t val) /*
- Read drive level of IO pins
*/ -int ds4510_gpio_read(uint8_t chip) +static int ds4510_gpio_read(uint8_t chip) { uint8_t data; int val = 0; @@ -175,7 +175,7 @@ int ds4510_gpio_read(uint8_t chip) /*
- Read physical level of IO pins
*/ -int ds4510_gpio_read_val(uint8_t chip) +static int ds4510_gpio_read_val(uint8_t chip) { uint8_t val;
@@ -185,7 +185,6 @@ int ds4510_gpio_read_val(uint8_t chip) return val & DS4510_IO_MASK; }
-#ifdef CONFIG_CMD_DS4510 /*
- Display DS4510 information
*/ @@ -384,4 +383,3 @@ U_BOOT_CMD( "ds4510 sram write addr off cnt\n" " - read/write 'cnt' bytes at SRAM offset 'off'" ); -#endif /* CONFIG_CMD_DS4510 */ diff --git a/include/ds4510.h b/drivers/misc/ds4510.h similarity index 75% rename from include/ds4510.h rename to drivers/misc/ds4510.h index e54db35265..a6c6c58cc4 100644 --- a/include/ds4510.h +++ b/drivers/misc/ds4510.h @@ -50,14 +50,4 @@ #define DS4510_SRAM 0xfa #define DS4510_SRAM_SIZE 0x06
-int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count); -int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count); -int ds4510_see_write(uint8_t chip, uint8_t nv); -int ds4510_rstdelay_write(uint8_t chip, uint8_t delay); -int ds4510_pullup_write(uint8_t chip, uint8_t val); -int ds4510_pullup_read(uint8_t chip); -int ds4510_gpio_write(uint8_t chip, uint8_t val); -int ds4510_gpio_read(uint8_t chip); -int ds4510_gpio_read_val(uint8_t chip);
- #endif /* __DS4510_H_ */
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index dae61b11e4..822f70e7ac 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -502,7 +502,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /*
- Command configuration.
*/ -#define CONFIG_CMD_DS4510 #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index ce1ff86135..a12a3f8347 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -354,7 +354,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /*
- Command configuration.
*/ -#define CONFIG_CMD_DS4510 #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 17f241720a..3332fe3cac 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_DS4510 CONFIG_CMD_DTT CONFIG_CMD_ECCTEST CONFIG_CMD_EECONFIG