UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Nothing fancy. Two driver and one DT binding fix. 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEOZGx6rniZ1Gk92RdFA3kzBSgKbYFAmSYIzsACgkQFA3kzBSg
 KbZ2lQ//Ykax76d0gwjKBTTQ07apWwWmnhie8cSn5Wfp+MtzUPgIrNKZ6oorqrE7
 bMHdXVKJdX5uvXxl6nD6gpzJwvg5GsRefe7yKWNBW9V7ORW0lFOTQuKLTOEejA+4
 bEb2581FzDl+utRhWS7OCISc7pz/vkv4XqI7ZaSOQhFmFdTEK5aEI4K4iKfXx75I
 YFKonKWcEFhoypZTa5pvhQ+Zxrf/xZPe8uJbp++hf63cKBjPEc56fyYFu+yjsw72
 mk8RfiiII0XlF88NECQh1myYMf2AINw4YQRjZxC/SSQPXRNzJuDIx/3cJeq2Mp7o
 bsBB7bfc9Nzo3WA4MycFG41WTuFM1aOQxKbj6k0h/jCIwF9Jo6frfKe848SWvDYH
 PfRIETpxI8VhpqPjggyBSaHVDg3upgonEFYy3NIKCpW2JMFBOr+6+RWKHjrf8m07
 Z9TYTBg2IxWPpJXrampVmhhYHHBxfAPi82yG7h1YlPwHbREUXyIiiqOsOEnHy/Nt
 OaZbdbSOU8HP/wXEk71KYV2veJaSGFdEya8HVG/eFYhbMvmtrqyTMYgOjs4IuT+r
 ImFOlo4FthsqXa7AiuDZAyxFJCuSrWwzh1a8n3ZKl0rAl74QddlNRDJX6QhDd+ny
 gUZ6sycvMWYsL+t4vCa0K4IMGYXuAB0uQHBIv0AL9JUVjBXA/Xk=
 =2Tzf
 -----END PGP SIGNATURE-----

Merge tag 'i2c-for-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Nothing fancy. Two driver and one DT binding fix"

* tag 'i2c-for-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: imx-lpi2c: fix type char overflow issue when calculating the clock cycle
  i2c: qup: Add missing unwind goto in qup_i2c_probe()
  dt-bindings: i2c: opencores: Add missing type for "regstep"
This commit is contained in:
Linus Torvalds 2023-06-25 15:36:01 -07:00
parent 547cc9be86 e69b9bc170
commit e3b2e2c14b
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml
View File

@ -60,6 +60,7 @@ properties:
default: 0
regstep:
$ref: /schemas/types.yaml#/definitions/uint32
description: |
deprecated, use reg-shift above
deprecated: true

4
drivers/i2c/busses/i2c-imx-lpi2c.c
View File

@ -201,8 +201,8 @@ static void lpi2c_imx_stop(struct lpi2c_imx_struct *lpi2c_imx)
/* CLKLO = I2C_CLK_RATIO * CLKHI, SETHOLD = CLKHI, DATAVD = CLKHI/2 */
static int lpi2c_imx_config(struct lpi2c_imx_struct *lpi2c_imx)
{
u8 prescale, filt, sethold, clkhi, clklo, datavd;
unsigned int clk_rate, clk_cycle;
u8 prescale, filt, sethold, datavd;
unsigned int clk_rate, clk_cycle, clkhi, clklo;
enum lpi2c_imx_pincfg pincfg;
unsigned int temp;

21
drivers/i2c/busses/i2c-qup.c
View File

@ -1752,16 +1752,21 @@ nodma:
if (!clk_freq || clk_freq > I2C_MAX_FAST_MODE_PLUS_FREQ) {
dev_err(qup->dev, "clock frequency not supported %d\n",
clk_freq);
return -EINVAL;
ret = -EINVAL;
goto fail_dma;
}
qup->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(qup->base))
return PTR_ERR(qup->base);
if (IS_ERR(qup->base)) {
ret = PTR_ERR(qup->base);
goto fail_dma;
}
qup->irq = platform_get_irq(pdev, 0);
if (qup->irq < 0)
return qup->irq;
if (qup->irq < 0) {
ret = qup->irq;
goto fail_dma;
}
if (has_acpi_companion(qup->dev)) {
ret = device_property_read_u32(qup->dev,
@ -1775,13 +1780,15 @@ nodma:
qup->clk = devm_clk_get(qup->dev, "core");
if (IS_ERR(qup->clk)) {
dev_err(qup->dev, "Could not get core clock\n");
return PTR_ERR(qup->clk);
ret = PTR_ERR(qup->clk);
goto fail_dma;
}
qup->pclk = devm_clk_get(qup->dev, "iface");
if (IS_ERR(qup->pclk)) {
dev_err(qup->dev, "Could not get iface clock\n");
return PTR_ERR(qup->pclk);
ret = PTR_ERR(qup->pclk);
goto fail_dma;
}
qup_i2c_enable_clocks(qup);
src_clk_freq = clk_get_rate(qup->clk);