Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'i2c-for-6.3-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull more i2c updates from Wolfram Sang:
"Some improvements/fixes for the newly added GXP driver and a Kconfig
dependency fix"
* tag 'i2c-for-6.3-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: gxp: fix an error code in probe
i2c: gxp: return proper error on address NACK
i2c: gxp: remove "empty" switch statement
i2c: Disable I2C_APPLE when I2C_PASEMI is a builtin
+7
-15
+1
drivers/i2c/busses/Kconfig
+1
drivers/i2c/busses/Kconfig
+6
-15
drivers/i2c/busses/i2c-gxp.c
+6
-15
drivers/i2c/busses/i2c-gxp.c
···
126
126
time_left = wait_for_completion_timeout(&drvdata->completion,
127
127
adapter->timeout);
128
128
ret = num - drvdata->msgs_remaining;
129
-
if (time_left == 0) {
130
-
switch (drvdata->state) {
131
-
case GXP_I2C_WDATA_PHASE:
132
-
break;
133
-
case GXP_I2C_RDATA_PHASE:
134
-
break;
135
-
case GXP_I2C_ADDR_PHASE:
136
-
break;
137
-
default:
138
-
break;
139
-
}
129
+
if (time_left == 0)
140
130
return -ETIMEDOUT;
141
-
}
142
131
143
-
if (drvdata->state == GXP_I2C_ADDR_NACK ||
144
-
drvdata->state == GXP_I2C_DATA_NACK)
132
+
if (drvdata->state == GXP_I2C_ADDR_NACK)
133
+
return -ENXIO;
134
+
135
+
if (drvdata->state == GXP_I2C_DATA_NACK)
145
136
return -EIO;
146
137
147
138
return ret;
···
516
525
i2cg_map = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
517
526
"hpe,sysreg");
518
527
if (IS_ERR(i2cg_map)) {
519
-
return dev_err_probe(&pdev->dev, IS_ERR(i2cg_map),
528
+
return dev_err_probe(&pdev->dev, PTR_ERR(i2cg_map),
520
529
"failed to map i2cg_handle\n");
521
530
}
522
531