projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
global: Migrate CONFIG_STACKBASE to CFG
[platform/kernel/u-boot.git]
/
include
/
i2c.h
diff --git
a/include/i2c.h
b/include/i2c.h
index
a35e99b
..
3811b26
100644
(file)
--- a/
include/i2c.h
+++ b/
include/i2c.h
@@
-184,7
+184,7
@@
struct i2c_msg_list {
* @buffer: Place to put data
* @len: Number of bytes to read
*
* @buffer: Place to put data
* @len: Number of bytes to read
*
- *
@return
0 on success, -ve on failure
+ *
Return:
0 on success, -ve on failure
*/
int dm_i2c_read(struct udevice *dev, uint offset, uint8_t *buffer, int len);
*/
int dm_i2c_read(struct udevice *dev, uint offset, uint8_t *buffer, int len);
@@
-198,7
+198,7
@@
int dm_i2c_read(struct udevice *dev, uint offset, uint8_t *buffer, int len);
* @buffer: Buffer containing data to write
* @len: Number of bytes to write
*
* @buffer: Buffer containing data to write
* @len: Number of bytes to write
*
- *
@return
0 on success, -ve on failure
+ *
Return:
0 on success, -ve on failure
*/
int dm_i2c_write(struct udevice *dev, uint offset, const uint8_t *buffer,
int len);
*/
int dm_i2c_write(struct udevice *dev, uint offset, const uint8_t *buffer,
int len);
@@
-214,7
+214,7
@@
int dm_i2c_write(struct udevice *dev, uint offset, const uint8_t *buffer,
* @chip_addr: 7-bit address to probe (10-bit and others are not supported)
* @chip_flags: Flags for the probe (see enum dm_i2c_chip_flags)
* @devp: Returns the device found, or NULL if none
* @chip_addr: 7-bit address to probe (10-bit and others are not supported)
* @chip_flags: Flags for the probe (see enum dm_i2c_chip_flags)
* @devp: Returns the device found, or NULL if none
- *
@return
0 if a chip was found at that address, -ve if not
+ *
Return:
0 if a chip was found at that address, -ve if not
*/
int dm_i2c_probe(struct udevice *bus, uint chip_addr, uint chip_flags,
struct udevice **devp);
*/
int dm_i2c_probe(struct udevice *bus, uint chip_addr, uint chip_flags,
struct udevice **devp);
@@
-226,7
+226,7
@@
int dm_i2c_probe(struct udevice *bus, uint chip_addr, uint chip_flags,
*
* @dev: Device to use for transfer
* @addr: Address to read from
*
* @dev: Device to use for transfer
* @addr: Address to read from
- *
@return
value read, or -ve on error
+ *
Return:
value read, or -ve on error
*/
int dm_i2c_reg_read(struct udevice *dev, uint offset);
*/
int dm_i2c_reg_read(struct udevice *dev, uint offset);
@@
-238,7
+238,7
@@
int dm_i2c_reg_read(struct udevice *dev, uint offset);
* @dev: Device to use for transfer
* @addr: Address to write to
* @val: Value to write (normally a byte)
* @dev: Device to use for transfer
* @addr: Address to write to
* @val: Value to write (normally a byte)
- *
@return
0 on success, -ve on error
+ *
Return:
0 on success, -ve on error
*/
int dm_i2c_reg_write(struct udevice *dev, uint offset, unsigned int val);
*/
int dm_i2c_reg_write(struct udevice *dev, uint offset, unsigned int val);
@@
-252,7
+252,7
@@
int dm_i2c_reg_write(struct udevice *dev, uint offset, unsigned int val);
* @offset: Address for the R/W operation
* @clr: Bitmask of bits that should be cleared
* @set: Bitmask of bits that should be set
* @offset: Address for the R/W operation
* @clr: Bitmask of bits that should be cleared
* @set: Bitmask of bits that should be set
- *
@return
0 on success, -ve on error
+ *
Return:
0 on success, -ve on error
*/
int dm_i2c_reg_clrset(struct udevice *dev, uint offset, u32 clr, u32 set);
*/
int dm_i2c_reg_clrset(struct udevice *dev, uint offset, u32 clr, u32 set);
@@
-265,7
+265,7
@@
int dm_i2c_reg_clrset(struct udevice *dev, uint offset, u32 clr, u32 set);
* @dev: Device to use for transfer
* @msg: List of messages to transfer
* @nmsgs: Number of messages to transfer
* @dev: Device to use for transfer
* @msg: List of messages to transfer
* @nmsgs: Number of messages to transfer
- *
@return
0 on success, -ve on error
+ *
Return:
0 on success, -ve on error
*/
int dm_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs);
*/
int dm_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs);
@@
-274,7
+274,7
@@
int dm_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs);
*
* @bus: Bus to adjust
* @speed: Requested speed in Hz
*
* @bus: Bus to adjust
* @speed: Requested speed in Hz
- *
@return
0 if OK, -EINVAL for invalid values
+ *
Return:
0 if OK, -EINVAL for invalid values
*/
int dm_i2c_set_bus_speed(struct udevice *bus, unsigned int speed);
*/
int dm_i2c_set_bus_speed(struct udevice *bus, unsigned int speed);
@@
-282,7
+282,7
@@
int dm_i2c_set_bus_speed(struct udevice *bus, unsigned int speed);
* dm_i2c_get_bus_speed() - get the speed of a bus
*
* @bus: Bus to check
* dm_i2c_get_bus_speed() - get the speed of a bus
*
* @bus: Bus to check
- *
@return
speed of selected I2C bus in Hz, -ve on error
+ *
Return:
speed of selected I2C bus in Hz, -ve on error
*/
int dm_i2c_get_bus_speed(struct udevice *bus);
*/
int dm_i2c_get_bus_speed(struct udevice *bus);
@@
-294,7
+294,7
@@
int dm_i2c_get_bus_speed(struct udevice *bus);
*
* @dev: Chip to adjust
* @flags: New flags
*
* @dev: Chip to adjust
* @flags: New flags
- *
@return
0 if OK, -EINVAL if value is unsupported, other -ve value on error
+ *
Return:
0 if OK, -EINVAL if value is unsupported, other -ve value on error
*/
int i2c_set_chip_flags(struct udevice *dev, uint flags);
*/
int i2c_set_chip_flags(struct udevice *dev, uint flags);
@@
-303,7
+303,7
@@
int i2c_set_chip_flags(struct udevice *dev, uint flags);
*
* @dev: Chip to check
* @flagsp: Place to put flags
*
* @dev: Chip to check
* @flagsp: Place to put flags
- *
@return
0 if OK, other -ve value on error
+ *
Return:
0 if OK, other -ve value on error
*/
int i2c_get_chip_flags(struct udevice *dev, uint *flagsp);
*/
int i2c_get_chip_flags(struct udevice *dev, uint *flagsp);
@@
-334,14
+334,14
@@
int i2c_get_chip_offset_len(struct udevice *dev);
* function to set the bits that are valid to be used for offset overflow.
*
* @mask: The mask to be used for high offset bits within address
* function to set the bits that are valid to be used for offset overflow.
*
* @mask: The mask to be used for high offset bits within address
- *
@return
0 if OK, other -ve value on error
+ *
Return:
0 if OK, other -ve value on error
*/
int i2c_set_chip_addr_offset_mask(struct udevice *dev, uint mask);
/*
* i2c_get_chip_addr_offset_mask() - get mask of address bits usable by offset
*
*/
int i2c_set_chip_addr_offset_mask(struct udevice *dev, uint mask);
/*
* i2c_get_chip_addr_offset_mask() - get mask of address bits usable by offset
*
- *
@return
current chip addr offset mask
+ *
Return:
current chip addr offset mask
*/
uint i2c_get_chip_addr_offset_mask(struct udevice *dev);
*/
uint i2c_get_chip_addr_offset_mask(struct udevice *dev);
@@
-351,7
+351,7
@@
uint i2c_get_chip_addr_offset_mask(struct udevice *dev);
* See the deblock() method in 'struct dm_i2c_ops' for full information
*
* @bus: Bus to recover
* See the deblock() method in 'struct dm_i2c_ops' for full information
*
* @bus: Bus to recover
- *
@return
0 if OK, -ve on error
+ *
Return:
0 if OK, -ve on error
*/
int i2c_deblock(struct udevice *bus);
*/
int i2c_deblock(struct udevice *bus);
@@
-366,7
+366,7
@@
int i2c_deblock(struct udevice *bus);
* @scl_count: Number of SCL clock cycles generated to deblock SDA
* @start_count:Number of I2C start conditions sent after deblocking SDA
* @delay: Delay between SCL clock line changes
* @scl_count: Number of SCL clock cycles generated to deblock SDA
* @start_count:Number of I2C start conditions sent after deblocking SDA
* @delay: Delay between SCL clock line changes
- *
@return
0 if OK, -ve on error
+ *
Return:
0 if OK, -ve on error
*/
struct gpio_desc;
int i2c_deblock_gpio_loop(struct gpio_desc *sda_pin, struct gpio_desc *scl_pin,
*/
struct gpio_desc;
int i2c_deblock_gpio_loop(struct gpio_desc *sda_pin, struct gpio_desc *scl_pin,
@@
-567,7
+567,7
@@
void i2c_dump_msgs(struct i2c_msg *msg, int nmsgs);
*
* @dev: Device to find an emulator for
* @emulp: Returns the associated emulator, if found *
*
* @dev: Device to find an emulator for
* @emulp: Returns the associated emulator, if found *
- *
@return
0 if OK, -ENOENT or -ENODEV if not found
+ *
Return:
0 if OK, -ENOENT or -ENODEV if not found
*/
int i2c_emul_find(struct udevice *dev, struct udevice **emulp);
*/
int i2c_emul_find(struct udevice *dev, struct udevice **emulp);
@@
-589,7
+589,7
@@
void i2c_emul_set_idx(struct udevice *dev, int emul_idx);
* Given an emulator this returns the associated device
*
* @emul: Emulator for the device
* Given an emulator this returns the associated device
*
* @emul: Emulator for the device
- *
@return
device that @emul is emulating
+ *
Return:
device that @emul is emulating
*/
struct udevice *i2c_emul_get_device(struct udevice *emul);
*/
struct udevice *i2c_emul_get_device(struct udevice *emul);
@@
-606,7
+606,7
@@
extern struct acpi_ops i2c_acpi_ops;
* properties.
*
* @dev: I2C device to process
* properties.
*
* @dev: I2C device to process
- *
@return
0 if OK, -EINVAL if acpi,hid is not present
+ *
Return:
0 if OK, -EINVAL if acpi,hid is not present
*/
int acpi_i2c_of_to_plat(struct udevice *dev);
*/
int acpi_i2c_of_to_plat(struct udevice *dev);
@@
-633,22
+633,19
@@
void i2c_early_init_f(void);
*/
#define I2C_RXTX_LEN 128 /* maximum tx/rx buffer length */
*/
#define I2C_RXTX_LEN 128 /* maximum tx/rx buffer length */
-#if !defined(C
ONFI
G_SYS_I2C_MAX_HOPS)
+#if !defined(C
F
G_SYS_I2C_MAX_HOPS)
/* no muxes used bus = i2c adapters */
#define CONFIG_SYS_I2C_DIRECT_BUS 1
/* no muxes used bus = i2c adapters */
#define CONFIG_SYS_I2C_DIRECT_BUS 1
-#define C
ONFIG_SYS_I2C_MAX_HOPS
0
-#define C
ONFIG_SYS_NUM_I2C_BUSES
ll_entry_count(struct i2c_adapter, i2c)
+#define C
FG_SYS_I2C_MAX_HOPS
0
+#define C
FG_SYS_NUM_I2C_BUSES
ll_entry_count(struct i2c_adapter, i2c)
#else
/* we use i2c muxes */
#undef CONFIG_SYS_I2C_DIRECT_BUS
#endif
/* define the I2C bus number for RTC and DTT if not already done */
#else
/* we use i2c muxes */
#undef CONFIG_SYS_I2C_DIRECT_BUS
#endif
/* define the I2C bus number for RTC and DTT if not already done */
-#if !defined(CONFIG_SYS_RTC_BUS_NUM)
-#define CONFIG_SYS_RTC_BUS_NUM 0
-#endif
-#if !defined(CONFIG_SYS_SPD_BUS_NUM)
-#define CONFIG_SYS_SPD_BUS_NUM 0
+#if !defined(CFG_SYS_RTC_BUS_NUM)
+#define CFG_SYS_RTC_BUS_NUM 0
#endif
struct i2c_adapter {
#endif
struct i2c_adapter {
@@
-708,7
+705,7
@@
struct i2c_next_hop {
struct i2c_bus_hose {
int adapter;
struct i2c_bus_hose {
int adapter;
- struct i2c_next_hop next_hop[C
ONFI
G_SYS_I2C_MAX_HOPS];
+ struct i2c_next_hop next_hop[C
F
G_SYS_I2C_MAX_HOPS];
};
#define I2C_NULL_HOP {{-1, ""}, 0, 0}
extern struct i2c_bus_hose i2c_bus[];
};
#define I2C_NULL_HOP {{-1, ""}, 0, 0}
extern struct i2c_bus_hose i2c_bus[];
@@
-933,13
+930,13
@@
unsigned int i2c_get_bus_speed(void);
* only for backwardcompatibility, should go away if we switched
* completely to new multibus support.
*/
* only for backwardcompatibility, should go away if we switched
* completely to new multibus support.
*/
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(C
ONFI
G_I2C_MULTI_BUS)
-# if !defined(C
ONFI
G_SYS_MAX_I2C_BUS)
-# define C
ONFIG_SYS_MAX_I2C_BUS
2
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(C
F
G_I2C_MULTI_BUS)
+# if !defined(C
F
G_SYS_MAX_I2C_BUS)
+# define C
FG_SYS_MAX_I2C_BUS
2
# endif
# define I2C_MULTI_BUS 1
#else
# endif
# define I2C_MULTI_BUS 1
#else
-# define C
ONFIG_SYS_MAX_I2C_BUS
1
+# define C
FG_SYS_MAX_I2C_BUS
1
# define I2C_MULTI_BUS 0
#endif
# define I2C_MULTI_BUS 0
#endif
@@
-967,7
+964,7
@@
enum {
* Get FDT values for i2c bus.
*
* @param blob Device tree blbo
* Get FDT values for i2c bus.
*
* @param blob Device tree blbo
- *
@return
the number of I2C bus
+ *
Return:
the number of I2C bus
*/
void board_i2c_init(const void *blob);
*/
void board_i2c_init(const void *blob);
@@
-976,7
+973,7
@@
void board_i2c_init(const void *blob);
*
* @param blob Device tree blbo
* @param node FDT I2C node to find
*
* @param blob Device tree blbo
* @param node FDT I2C node to find
- *
@return
the number of I2C bus (zero based), or -1 on error
+ *
Return:
the number of I2C bus (zero based), or -1 on error
*/
int i2c_get_bus_num_fdt(int node);
*/
int i2c_get_bus_num_fdt(int node);
@@
-985,7
+982,7
@@
int i2c_get_bus_num_fdt(int node);
*
* @param blob Device tree blbo
* @param node FDT I2C node to find
*
* @param blob Device tree blbo
* @param node FDT I2C node to find
- *
@return
0 if port was reset, -1 if not found
+ *
Return:
0 if port was reset, -1 if not found
*/
int i2c_reset_port_fdt(const void *blob, int node);
*/
int i2c_reset_port_fdt(const void *blob, int node);