From 4dc677be2fa4e4d2c729981ace09274cbb3b95ac Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 24 Jun 2024 19:47:05 +0200 Subject: [PATCH] 5.10-stable patches added patches: dt-bindings-i2c-google-cros-ec-i2c-tunnel-correct-path-to-i2c-controller-schema.patch i2c-ocores-set-iack-bit-after-core-is-enabled.patch --- ...orrect-path-to-i2c-controller-schema.patch | 33 ++++++++++++++++ ...s-set-iack-bit-after-core-is-enabled.patch | 39 +++++++++++++++++++ queue-5.10/series | 2 + 3 files changed, 74 insertions(+) create mode 100644 queue-5.10/dt-bindings-i2c-google-cros-ec-i2c-tunnel-correct-path-to-i2c-controller-schema.patch create mode 100644 queue-5.10/i2c-ocores-set-iack-bit-after-core-is-enabled.patch diff --git a/queue-5.10/dt-bindings-i2c-google-cros-ec-i2c-tunnel-correct-path-to-i2c-controller-schema.patch b/queue-5.10/dt-bindings-i2c-google-cros-ec-i2c-tunnel-correct-path-to-i2c-controller-schema.patch new file mode 100644 index 00000000000..b7e891a35d7 --- /dev/null +++ b/queue-5.10/dt-bindings-i2c-google-cros-ec-i2c-tunnel-correct-path-to-i2c-controller-schema.patch @@ -0,0 +1,33 @@ +From 5c8cfd592bb7632200b4edac8f2c7ec892ed9d81 Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Thu, 20 Jun 2024 13:34:50 +0200 +Subject: dt-bindings: i2c: google,cros-ec-i2c-tunnel: correct path to i2c-controller schema + +From: Krzysztof Kozlowski + +commit 5c8cfd592bb7632200b4edac8f2c7ec892ed9d81 upstream. + +The referenced i2c-controller.yaml schema is provided by dtschema +package (outside of Linux kernel), so use full path to reference it. + +Cc: stable@vger.kernel.org +Fixes: 1acd4577a66f ("dt-bindings: i2c: convert i2c-cros-ec-tunnel to json-schema") +Signed-off-by: Krzysztof Kozlowski +Reviewed-by: Conor Dooley +Signed-off-by: Andi Shyti +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml ++++ b/Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml +@@ -22,7 +22,7 @@ description: | + google,cros-ec-spi or google,cros-ec-i2c. + + allOf: +- - $ref: i2c-controller.yaml# ++ - $ref: /schemas/i2c/i2c-controller.yaml# + + properties: + compatible: diff --git a/queue-5.10/i2c-ocores-set-iack-bit-after-core-is-enabled.patch b/queue-5.10/i2c-ocores-set-iack-bit-after-core-is-enabled.patch new file mode 100644 index 00000000000..e06d8267b13 --- /dev/null +++ b/queue-5.10/i2c-ocores-set-iack-bit-after-core-is-enabled.patch @@ -0,0 +1,39 @@ +From 5a72477273066b5b357801ab2d315ef14949d402 Mon Sep 17 00:00:00 2001 +From: Grygorii Tertychnyi +Date: Mon, 20 May 2024 17:39:32 +0200 +Subject: i2c: ocores: set IACK bit after core is enabled + +From: Grygorii Tertychnyi + +commit 5a72477273066b5b357801ab2d315ef14949d402 upstream. + +Setting IACK bit when core is disabled does not clear the "Interrupt Flag" +bit in the status register, and the interrupt remains pending. + +Sometimes it causes failure for the very first message transfer, that is +usually a device probe. + +Hence, set IACK bit after core is enabled to clear pending interrupt. + +Fixes: 18f98b1e3147 ("[PATCH] i2c: New bus driver for the OpenCores I2C controller") +Signed-off-by: Grygorii Tertychnyi +Acked-by: Peter Korsgaard +Cc: stable@vger.kernel.org +Signed-off-by: Andi Shyti +Signed-off-by: Greg Kroah-Hartman +--- + drivers/i2c/busses/i2c-ocores.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/i2c/busses/i2c-ocores.c ++++ b/drivers/i2c/busses/i2c-ocores.c +@@ -443,8 +443,8 @@ static int ocores_init(struct device *de + oc_setreg(i2c, OCI2C_PREHIGH, prescale >> 8); + + /* Init the device */ +- oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_IACK); + oc_setreg(i2c, OCI2C_CONTROL, ctrl | OCI2C_CTRL_EN); ++ oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_IACK); + + return 0; + } diff --git a/queue-5.10/series b/queue-5.10/series index bccaccd7012..86518fa4baa 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -202,3 +202,5 @@ alsa-hda-realtek-limit-mic-boost-on-n14ap7.patch drm-radeon-fix-ubsan-warning-in-kv_dpm.c.patch gcov-add-support-for-gcc-14.patch kcov-don-t-lose-track-of-remote-references-during-softirqs.patch +i2c-ocores-set-iack-bit-after-core-is-enabled.patch +dt-bindings-i2c-google-cros-ec-i2c-tunnel-correct-path-to-i2c-controller-schema.patch -- 2.47.3