projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: emaclite: Use indirect register access for TX reset
[oweals/u-boot.git]
/
drivers
/
power
/
power_i2c.c
diff --git
a/drivers/power/power_i2c.c
b/drivers/power/power_i2c.c
index ac768708eadf22aacc4f2e6e15c66d07a5c248f5..0dcf9fe9187307c4240153c6bada20a808ebdf6c 100644
(file)
--- a/
drivers/power/power_i2c.c
+++ b/
drivers/power/power_i2c.c
@@
-14,7
+14,7
@@
#include <linux/types.h>
#include <power/pmic.h>
#include <i2c.h>
#include <linux/types.h>
#include <power/pmic.h>
#include <i2c.h>
-#include <compiler.h>
+#include <
linux/
compiler.h>
int pmic_reg_write(struct pmic *p, u32 reg, u32 val)
{
int pmic_reg_write(struct pmic *p, u32 reg, u32 val)
{
@@
-23,6
+23,8
@@
int pmic_reg_write(struct pmic *p, u32 reg, u32 val)
if (check_reg(p, reg))
return -1;
if (check_reg(p, reg))
return -1;
+ I2C_SET_BUS(p->bus);
+
switch (pmic_i2c_tx_num) {
case 3:
if (p->sensor_byte_order == PMIC_SENSOR_BYTE_ORDER_BIG) {
switch (pmic_i2c_tx_num) {
case 3:
if (p->sensor_byte_order == PMIC_SENSOR_BYTE_ORDER_BIG) {
@@
-66,6
+68,8
@@
int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)
if (check_reg(p, reg))
return -1;
if (check_reg(p, reg))
return -1;
+ I2C_SET_BUS(p->bus);
+
if (i2c_read(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num))
return -1;
if (i2c_read(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num))
return -1;