Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'i2c-for-6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang:
"Two reverts merged into one commit to handle a regression caused by a
wrong cleanup because the underlying implications were unclear"
* tag 'i2c-for-6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: muxes: pca954x: Fix broken reset-gpio usage
+23
-27
+23
-27
drivers/i2c/muxes/i2c-mux-pca954x.c
+23
-27
drivers/i2c/muxes/i2c-mux-pca954x.c
···
118
118
raw_spinlock_t lock;
119
119
struct regulator *supply;
120
120
121
+
struct gpio_desc *reset_gpio;
121
122
struct reset_control *reset_cont;
122
123
};
123
124
···
316
315
return 1 << chan;
317
316
}
318
317
319
-
static void pca954x_reset_assert(struct pca954x *data)
320
-
{
321
-
if (data->reset_cont)
322
-
reset_control_assert(data->reset_cont);
323
-
}
324
-
325
-
static void pca954x_reset_deassert(struct pca954x *data)
326
-
{
327
-
if (data->reset_cont)
328
-
reset_control_deassert(data->reset_cont);
329
-
}
330
-
331
-
static void pca954x_reset_mux(struct pca954x *data)
332
-
{
333
-
pca954x_reset_assert(data);
334
-
udelay(1);
335
-
pca954x_reset_deassert(data);
336
-
}
337
-
338
318
static int pca954x_select_chan(struct i2c_mux_core *muxc, u32 chan)
339
319
{
340
320
struct pca954x *data = i2c_mux_priv(muxc);
···
329
347
ret = pca954x_reg_write(muxc->parent, client, regval);
330
348
data->last_chan = ret < 0 ? 0 : regval;
331
349
}
332
-
if (ret == -ETIMEDOUT && data->reset_cont)
333
-
pca954x_reset_mux(data);
334
350
335
351
return ret;
336
352
}
···
338
358
struct pca954x *data = i2c_mux_priv(muxc);
339
359
struct i2c_client *client = data->client;
340
360
s32 idle_state;
341
-
int ret = 0;
342
361
343
362
idle_state = READ_ONCE(data->idle_state);
344
363
if (idle_state >= 0)
···
347
368
if (idle_state == MUX_IDLE_DISCONNECT) {
348
369
/* Deselect active channel */
349
370
data->last_chan = 0;
350
-
ret = pca954x_reg_write(muxc->parent, client,
351
-
data->last_chan);
352
-
if (ret == -ETIMEDOUT && data->reset_cont)
353
-
pca954x_reset_mux(data);
371
+
return pca954x_reg_write(muxc->parent, client,
372
+
data->last_chan);
354
373
}
355
374
356
375
/* otherwise leave as-is */
···
527
550
if (IS_ERR(data->reset_cont))
528
551
return dev_err_probe(dev, PTR_ERR(data->reset_cont),
529
552
"Failed to get reset\n");
553
+
else if (data->reset_cont)
554
+
return 0;
555
+
556
+
/*
557
+
* fallback to legacy reset-gpios
558
+
*/
559
+
data->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
560
+
if (IS_ERR(data->reset_gpio)) {
561
+
return dev_err_probe(dev, PTR_ERR(data->reset_gpio),
562
+
"Failed to get reset gpio");
563
+
}
530
564
531
565
return 0;
566
+
}
567
+
568
+
static void pca954x_reset_deassert(struct pca954x *data)
569
+
{
570
+
if (data->reset_cont)
571
+
reset_control_deassert(data->reset_cont);
572
+
else
573
+
gpiod_set_value_cansleep(data->reset_gpio, 0);
532
574
}
533
575
534
576
/*
···
589
593
if (ret)
590
594
goto fail_cleanup;
591
595
592
-
if (data->reset_cont) {
596
+
if (data->reset_cont || data->reset_gpio) {
593
597
udelay(1);
594
598
pca954x_reset_deassert(data);
595
599
/* Give the chip some time to recover. */