Commit ec69c9e8 authored by Mikko Perttunen's avatar Mikko Perttunen Committed by Linus Torvalds
Browse files

i2c: tegra: Don't mark devices with pins as IRQ safe 



I2C devices with associated pinctrl states (DPAUX I2C controllers)
will change pinctrl state during runtime PM. This requires taking
a mutex, so these devices cannot be marked as IRQ safe.

Add PINCTRL as dependency to avoid build errors.

Signed-off-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
Reported-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/all/E1vsNBv-00000009nfA-27ZK@rmk-PC.armlinux.org.uk/


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d5273fd3

drivers/i2c/busses/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1213,6 +1213,8 @@ config I2C_TEGRA 
	tristate "NVIDIA Tegra internal I2C controller"

	depends on ARCH_TEGRA || (COMPILE_TEST && (ARC || ARM || ARM64 || M68K || RISCV || SUPERH || SPARC))

	# COMPILE_TEST needs architectures with readsX()/writesX() primitives

	depends on PINCTRL

	# ARCH_TEGRA implies PINCTRL, but the COMPILE_TEST side doesn't.

	help

	  If you say yes to this option, support will be included for the

	  I2C controller embedded in NVIDIA Tegra SOCs

drivers/i2c/busses/i2c-tegra.c

+4 −1
Original line number Diff line number Diff line
@@ -2047,8 +2047,11 @@ static int tegra_i2c_probe(struct platform_device *pdev) 
	 *

	 * VI I2C device shouldn't be marked as IRQ-safe because VI I2C won't

	 * be used for atomic transfers. ACPI device is not IRQ safe also.

	 *

	 * Devices with pinctrl states cannot be marked IRQ-safe as the pinctrl

	 * state transitions during runtime PM require mutexes.

	 */

	if (!IS_VI(i2c_dev) && !has_acpi_companion(i2c_dev->dev))

	if (!IS_VI(i2c_dev) && !has_acpi_companion(i2c_dev->dev) && !i2c_dev->dev->pins)

		pm_runtime_irq_safe(i2c_dev->dev);



	pm_runtime_enable(i2c_dev->dev);