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 tag 'i2c-for-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
"RPM fix for qcom-cci, platform module alias for xiic, build warning
fix for mlxbf, typo fixes in comments"

* tag 'i2c-for-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: mlxbf: depend on ACPI; clean away ifdeffage
i2c: fix spelling typos in comments
i2c: qcom-cci: Fix ordering of pm_runtime_xx and i2c_add_adapter
i2c: xiic: Add platform module alias

Linus Torvalds cda5d920 fd79882f

+12 -16
+1
drivers/i2c/busses/Kconfig
··· 764 764 config I2C_MLXBF 765 765 tristate "Mellanox BlueField I2C controller" 766 766 depends on MELLANOX_PLATFORM && ARM64 767 + depends on ACPI 767 768 select I2C_SLAVE 768 769 help 769 770 Enabling this option will add I2C SMBus support for Mellanox BlueField
-9
drivers/i2c/busses/i2c-mlxbf.c
··· 2247 2247 .max_write_len = MLXBF_I2C_MASTER_DATA_W_LENGTH, 2248 2248 }; 2249 2249 2250 - #ifdef CONFIG_ACPI 2251 2250 static const struct acpi_device_id mlxbf_i2c_acpi_ids[] = { 2252 2251 { "MLNXBF03", (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_1] }, 2253 2252 { "MLNXBF23", (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_2] }, ··· 2281 2282 2282 2283 return 0; 2283 2284 } 2284 - #else 2285 - static int mlxbf_i2c_acpi_probe(struct device *dev, struct mlxbf_i2c_priv *priv) 2286 - { 2287 - return -ENOENT; 2288 - } 2289 - #endif /* CONFIG_ACPI */ 2290 2285 2291 2286 static int mlxbf_i2c_probe(struct platform_device *pdev) 2292 2287 { ··· 2483 2490 .remove = mlxbf_i2c_remove, 2484 2491 .driver = { 2485 2492 .name = "i2c-mlxbf", 2486 - #ifdef CONFIG_ACPI 2487 2493 .acpi_match_table = ACPI_PTR(mlxbf_i2c_acpi_ids), 2488 - #endif /* CONFIG_ACPI */ 2489 2494 }, 2490 2495 }; 2491 2496
+1 -1
drivers/i2c/busses/i2c-mlxcpld.c
··· 40 40 #define MLXCPLD_LPCI2C_STATUS_REG 0x9 41 41 #define MLXCPLD_LPCI2C_DATA_REG 0xa 42 42 43 - /* LPC I2C masks and parametres */ 43 + /* LPC I2C masks and parameters */ 44 44 #define MLXCPLD_LPCI2C_RST_SEL_MASK 0x1 45 45 #define MLXCPLD_LPCI2C_TRANS_END 0x1 46 46 #define MLXCPLD_LPCI2C_STATUS_NACK 0x10
+8 -5
drivers/i2c/busses/i2c-qcom-cci.c
··· 639 639 if (ret < 0) 640 640 goto error; 641 641 642 + pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); 643 + pm_runtime_use_autosuspend(dev); 644 + pm_runtime_set_active(dev); 645 + pm_runtime_enable(dev); 646 + 642 647 for (i = 0; i < cci->data->num_masters; i++) { 643 648 if (!cci->master[i].cci) 644 649 continue; ··· 655 650 } 656 651 } 657 652 658 - pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); 659 - pm_runtime_use_autosuspend(dev); 660 - pm_runtime_set_active(dev); 661 - pm_runtime_enable(dev); 662 - 663 653 return 0; 664 654 665 655 error_i2c: 656 + pm_runtime_disable(dev); 657 + pm_runtime_dont_use_autosuspend(dev); 658 + 666 659 for (--i ; i >= 0; i--) { 667 660 if (cci->master[i].cci) { 668 661 i2c_del_adapter(&cci->master[i].adap);
+1 -1
drivers/i2c/busses/i2c-sis630.c
··· 97 97 module_param(force, bool, 0); 98 98 MODULE_PARM_DESC(force, "Forcibly enable the SIS630. DANGEROUS!"); 99 99 100 - /* SMBus base adress */ 100 + /* SMBus base address */ 101 101 static unsigned short smbus_base; 102 102 103 103 /* supported chips */
+1
drivers/i2c/busses/i2c-xiic.c
··· 920 920 921 921 module_platform_driver(xiic_i2c_driver); 922 922 923 + MODULE_ALIAS("platform:" DRIVER_NAME); 923 924 MODULE_AUTHOR("info@mocean-labs.com"); 924 925 MODULE_DESCRIPTION("Xilinx I2C bus driver"); 925 926 MODULE_LICENSE("GPL v2");