tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
"A mixture of driver and documentation bugfixes for I2C"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: imx: mention Oleksij as maintainer of the binding docs
i2c: exynos5: correct top kerneldoc
i2c: designware: Adjust bus_freq_hz when refuse high speed mode set
i2c: hix5hd2: use the correct HiSilicon copyright
i2c: gpio: update email address in binding docs
i2c: imx: drop me as maintainer of binding docs
i2c: stm32f4: Mundane typo fix
I2C: JZ4780: Fix bug for Ingenic X1000.
i2c: turn recovery error on init to debug

Linus Torvalds 12a0cf72 d4961772

+12 -10
+1 -1
Documentation/devicetree/bindings/i2c/i2c-gpio.yaml
··· 7 7 title: Bindings for GPIO bitbanged I2C 8 8 9 9 maintainers: 10 - - Wolfram Sang <wolfram@the-dreams.de> 10 + - Wolfram Sang <wsa@kernel.org> 11 11 12 12 allOf: 13 13 - $ref: /schemas/i2c/i2c-controller.yaml#
+1 -1
Documentation/devicetree/bindings/i2c/i2c-imx.yaml
··· 7 7 title: Freescale Inter IC (I2C) and High Speed Inter IC (HS-I2C) for i.MX 8 8 9 9 maintainers: 10 - - Wolfram Sang <wolfram@the-dreams.de> 10 + - Oleksij Rempel <o.rempel@pengutronix.de> 11 11 12 12 allOf: 13 13 - $ref: /schemas/i2c/i2c-controller.yaml#
+1
drivers/i2c/busses/i2c-designware-master.c
··· 129 129 if ((comp_param1 & DW_IC_COMP_PARAM_1_SPEED_MODE_MASK) 130 130 != DW_IC_COMP_PARAM_1_SPEED_MODE_HIGH) { 131 131 dev_err(dev->dev, "High Speed not supported!\n"); 132 + t->bus_freq_hz = I2C_MAX_FAST_MODE_FREQ; 132 133 dev->master_cfg &= ~DW_IC_CON_SPEED_MASK; 133 134 dev->master_cfg |= DW_IC_CON_SPEED_FAST; 134 135 dev->hs_hcnt = 0;
+1 -1
drivers/i2c/busses/i2c-exynos5.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0-only 2 - /** 2 + /* 3 3 * i2c-exynos5.c - Samsung Exynos5 I2C Controller Driver 4 4 * 5 5 * Copyright (C) 2013 Samsung Electronics Co., Ltd.
+1 -1
drivers/i2c/busses/i2c-hix5hd2.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0-or-later 2 2 /* 3 3 * Copyright (c) 2014 Linaro Ltd. 4 - * Copyright (c) 2014 Hisilicon Limited. 4 + * Copyright (c) 2014 HiSilicon Limited. 5 5 * 6 6 * Now only support 7 bit address. 7 7 */
+2 -2
drivers/i2c/busses/i2c-jz4780.c
··· 525 525 i2c_sta = jz4780_i2c_readw(i2c, JZ4780_I2C_STA); 526 526 data = *i2c->wbuf; 527 527 data &= ~JZ4780_I2C_DC_READ; 528 - if ((!i2c->stop_hold) && (i2c->cdata->version >= 529 - ID_X1000)) 528 + if ((i2c->wt_len == 1) && (!i2c->stop_hold) && 529 + (i2c->cdata->version >= ID_X1000)) 530 530 data |= X1000_I2C_DC_STOP; 531 531 jz4780_i2c_writew(i2c, JZ4780_I2C_DC, data); 532 532 i2c->wbuf++;
+1 -1
drivers/i2c/busses/i2c-stm32f4.c
··· 534 534 default: 535 535 /* 536 536 * N-byte reception: 537 - * Enable ACK, reset POS (ACK postion) and clear ADDR flag. 537 + * Enable ACK, reset POS (ACK position) and clear ADDR flag. 538 538 * In that way, ACK will be sent as soon as the current byte 539 539 * will be received in the shift register 540 540 */
+4 -3
drivers/i2c/i2c-core-base.c
··· 378 378 static int i2c_init_recovery(struct i2c_adapter *adap) 379 379 { 380 380 struct i2c_bus_recovery_info *bri = adap->bus_recovery_info; 381 - char *err_str; 381 + char *err_str, *err_level = KERN_ERR; 382 382 383 383 if (!bri) 384 384 return 0; ··· 387 387 return -EPROBE_DEFER; 388 388 389 389 if (!bri->recover_bus) { 390 - err_str = "no recover_bus() found"; 390 + err_str = "no suitable method provided"; 391 + err_level = KERN_DEBUG; 391 392 goto err; 392 393 } 393 394 ··· 415 414 416 415 return 0; 417 416 err: 418 - dev_err(&adap->dev, "Not using recovery: %s\n", err_str); 417 + dev_printk(err_level, &adap->dev, "Not using recovery: %s\n", err_str); 419 418 adap->bus_recovery_info = NULL; 420 419 421 420 return -EINVAL;