FAILED: patch "[PATCH] i2c: omap: Handle omap_i2c_init() errors in omap_i2c_probe()" failed to apply to 6.12-stable tree
Subsystems (5)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x a9503a2ecd95e23d7243bcde7138192de8c1c281
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025072119-tragedy-multitude-6649@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a9503a2ecd95e23d7243bcde7138192de8c1c281 Mon Sep 17 00:00:00 2001
From: Christophe JAILLET <[email protected]>
Date: Sat, 5 Jul 2025 09:57:37 +0200
Subject: [PATCH] i2c: omap: Handle omap_i2c_init() errors in omap_i2c_probe()
omap_i2c_init() can fail. Handle this error in omap_i2c_probe().
drivers/i2c/busses/i2c-omap.c +4 -1
@@ -1472,7 +1472,9 @@ omap_i2c_probe(struct platform_device *pdev) }/* reset ASAP, clearing any IRQs */ -omap_i2c_init (omap); + r =omap_i2c_init (omap); +if (r) + goto err_mux_state_deselect;if (omap->rev <OMAP_I2C_OMAP1_REV_2 ) r = devm_request_irq(&pdev->dev, omap->irq, omap_i2c_omap1_isr,
@@ -1515,6 +1517,7 @@ omap_i2c_probe(struct platform_device *pdev) err_unuse_clocks:omap_i2c_write_reg (omap,OMAP_I2C_CON_REG ,0 ); +err_mux_state_deselect:if (omap->mux_state)mux_state_deselect (omap->mux_state); err_put_pm:
Sasha Levin
maintainerPATCH 1/3 i2c: omap: Add support for setting mux
From: Jayesh Choudhary <[email protected]>
[ Upstream commit b6ef830c60b6f4adfb72d0780b4363df3a1feb9c ]
Some SoCs require muxes in the routing for SDA and SCL lines. Therefore, add support for setting the mux by reading the mux-states property from the dt-node.
Stable-dep-of: a9503a2ecd95 ("i2c: omap: Handle omap_i2c_init() errors in omap_i2c_probe()")
--- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-omap.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)
drivers/i2c/busses/Kconfig +1 -0
@@ -937,6 +937,7 @@ config I2C_OMAP tristate "OMAP I2C adapter" depends on ARCH_OMAP || ARCH_K3 || COMPILE_TEST default MACH_OMAP_OSK + select MULTIPLEXER help If you say yes to this option, support will be included for the I2C interface on the Texas Instruments OMAP1/2 family of processors.
drivers/i2c/busses/i2c-omap.c +22 -0
@@ -24,6 +24,7 @@#include <linux/platform_device.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/mux/consumer.h> #include <linux/of.h> #include <linux/slab.h> #include <linux/platform_data/i2c-omap.h>
@@ -211,6 +212,7 @@ struct omap_i2c_dev {u16 syscstate;u16 westate;u16 errata; +struct mux_state *mux_state; };static const u8 reg_map_ip_v1[] = {
@@ -1452,6 +1454,23 @@ omap_i2c_probe(struct platform_device *pdev) (1000 * omap->speed /8 ); } +if (of_property_read_bool (node,"mux-states" )) { +struct mux_state *mux_state; + + mux_state =devm_mux_state_get (&pdev->dev,NULL ); +if (IS_ERR (mux_state)) { + r =PTR_ERR (mux_state); +dev_dbg (&pdev->dev,"failed to get I2C mux: %d\n" , r); + goto err_disable_pm; + } + omap->mux_state = mux_state; + r =mux_state_select (omap->mux_state); +if (r) { +dev_err (&pdev->dev,"failed to select I2C mux: %d\n" , r); + goto err_disable_pm; + } + } +/* reset ASAP, clearing any IRQs */ omap_i2c_init (omap);
@@ -1511,6 +1530,9 @@ static void omap_i2c_remove(struct platform_device *pdev)i2c_del_adapter (&omap->adapter); +if (omap->mux_state) +mux_state_deselect (omap->mux_state); + ret =pm_runtime_get_sync (&pdev->dev);if (ret <0 )dev_err (omap->dev,"Failed to resume hardware, skip disable\n" );
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 2/3 i2c: omap: Fix an error handling path in omap_i2c_probe()
From: Christophe JAILLET <[email protected]>
[ Upstream commit 666c23af755dccca8c25b5d5200ca28153c69a05 ]
If an error occurs after calling mux_state_select(), mux_state_deselect() should be called as already done in the remove function.
Stable-dep-of: a9503a2ecd95 ("i2c: omap: Handle omap_i2c_init() errors in omap_i2c_probe()")
--- drivers/i2c/busses/i2c-omap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-omap.c +5 -2
@@ -1461,13 +1461,13 @@ omap_i2c_probe(struct platform_device *pdev)if (IS_ERR (mux_state)) { r =PTR_ERR (mux_state);dev_dbg (&pdev->dev,"failed to get I2C mux: %d\n" , r); - goto err_disable_pm; + goto err_put_pm; } omap->mux_state = mux_state; r =mux_state_select (omap->mux_state);if (r) {dev_err (&pdev->dev,"failed to select I2C mux: %d\n" , r); - goto err_disable_pm; + goto err_put_pm; } }
@@ -1515,6 +1515,9 @@ omap_i2c_probe(struct platform_device *pdev) err_unuse_clocks:omap_i2c_write_reg (omap,OMAP_I2C_CON_REG ,0 ); +if (omap->mux_state) +mux_state_deselect (omap->mux_state); +err_put_pm:pm_runtime_dont_use_autosuspend (omap->dev);pm_runtime_put_sync (omap->dev); err_disable_pm:
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 3/3 i2c: omap: Handle omap_i2c_init() errors in omap_i2c_probe()
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit a9503a2ecd95e23d7243bcde7138192de8c1c281 ]
omap_i2c_init() can fail. Handle this error in omap_i2c_probe().
--- drivers/i2c/busses/i2c-omap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-omap.c +4 -1
@@ -1472,7 +1472,9 @@ omap_i2c_probe(struct platform_device *pdev) }/* reset ASAP, clearing any IRQs */ -omap_i2c_init (omap); + r =omap_i2c_init (omap); +if (r) + goto err_mux_state_deselect;if (omap->rev <OMAP_I2C_OMAP1_REV_2 ) r = devm_request_irq(&pdev->dev, omap->irq, omap_i2c_omap1_isr,
@@ -1515,6 +1517,7 @@ omap_i2c_probe(struct platform_device *pdev) err_unuse_clocks:omap_i2c_write_reg (omap,OMAP_I2C_CON_REG ,0 ); +err_mux_state_deselect:if (omap->mux_state)mux_state_deselect (omap->mux_state); err_put_pm:
Signature · 1 line
2.39.5