From f000174883b89519c8e04c085f6fa95b995c15d1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 21 Feb 2022 08:16:56 +0100 Subject: [PATCH] 4.9-stable patches added patches: i2c-brcmstb-fix-support-for-dsl-and-cm-variants.patch --- ...-fix-support-for-dsl-and-cm-variants.patch | 36 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 queue-4.9/i2c-brcmstb-fix-support-for-dsl-and-cm-variants.patch diff --git a/queue-4.9/i2c-brcmstb-fix-support-for-dsl-and-cm-variants.patch b/queue-4.9/i2c-brcmstb-fix-support-for-dsl-and-cm-variants.patch new file mode 100644 index 00000000000..3e85bf47762 --- /dev/null +++ b/queue-4.9/i2c-brcmstb-fix-support-for-dsl-and-cm-variants.patch @@ -0,0 +1,36 @@ +From 834cea3a252ed4847db076a769ad9efe06afe2d5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Tue, 15 Feb 2022 08:27:35 +0100 +Subject: i2c: brcmstb: fix support for DSL and CM variants +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rafał Miłecki + +commit 834cea3a252ed4847db076a769ad9efe06afe2d5 upstream. + +DSL and CM (Cable Modem) support 8 B max transfer size and have a custom +DT binding for that reason. This driver was checking for a wrong +"compatible" however which resulted in an incorrect setup. + +Fixes: e2e5a2c61837 ("i2c: brcmstb: Adding support for CM and DSL SoCs") +Signed-off-by: Rafał Miłecki +Acked-by: Florian Fainelli +Signed-off-by: Wolfram Sang +Signed-off-by: Greg Kroah-Hartman +--- + drivers/i2c/busses/i2c-brcmstb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/i2c/busses/i2c-brcmstb.c ++++ b/drivers/i2c/busses/i2c-brcmstb.c +@@ -645,7 +645,7 @@ static int brcmstb_i2c_probe(struct plat + + /* set the data in/out register size for compatible SoCs */ + if (of_device_is_compatible(dev->device->of_node, +- "brcmstb,brcmper-i2c")) ++ "brcm,brcmper-i2c")) + dev->data_regsz = sizeof(u8); + else + dev->data_regsz = sizeof(u32); diff --git a/queue-4.9/series b/queue-4.9/series index 2d681694d28..616cde5b5ff 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -25,6 +25,7 @@ asoc-ops-fix-stereo-change-notifications-in-snd_soc_put_volsw.patch asoc-ops-fix-stereo-change-notifications-in-snd_soc_put_volsw_range.patch nfs-lookup_directory-is-also-ok-with-symlinks.patch edac-fix-calculation-of-returned-address-and-next-offset-in-edac_align_ptr.patch +i2c-brcmstb-fix-support-for-dsl-and-cm-variants.patch kvm-x86-pmu-use-amd64_raw_event_mask-for-perf_type_r.patch nfs-do-not-report-writeback-errors-in-nfs_getattr.patch ata-libata-core-disable-trim-on-m88v29.patch -- 2.47.3