From 0989b7ad3a38345bc09a535782884d78ec195c9d Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 23 Feb 2022 06:58:46 -0500 Subject: kernel: bump 5.10 to 5.10.102 Removed upstreamed: bcm4908/patches-5.10/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.102&id=f333c1916fd6b55900029bf8f918cc00009e2111 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia --- ...brcm-usb-improve-getting-OF-matching-data.patch | 4 +-- ...m-usb-specify-init-function-format-at-str.patch | 6 ++--- ...y-phy-brcm-usb-support-PHY-on-the-BCM4908.patch | 2 +- ...cmstb-fix-support-for-DSL-and-CM-variants.patch | 30 ---------------------- 4 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 target/linux/bcm4908/patches-5.10/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch (limited to 'target/linux/bcm4908') diff --git a/target/linux/bcm4908/patches-5.10/086-v5.12-0001-phy-phy-brcm-usb-improve-getting-OF-matching-data.patch b/target/linux/bcm4908/patches-5.10/086-v5.12-0001-phy-phy-brcm-usb-improve-getting-OF-matching-data.patch index cc71373165..ec9b1fea3d 100644 --- a/target/linux/bcm4908/patches-5.10/086-v5.12-0001-phy-phy-brcm-usb-improve-getting-OF-matching-data.patch +++ b/target/linux/bcm4908/patches-5.10/086-v5.12-0001-phy-phy-brcm-usb-improve-getting-OF-matching-data.patch @@ -27,7 +27,7 @@ Signed-off-by: Vinod Koul #include #include #include -@@ -427,7 +428,6 @@ static int brcm_usb_phy_probe(struct pla +@@ -457,7 +458,6 @@ static int brcm_usb_phy_probe(struct pla struct device_node *dn = pdev->dev.of_node; int err; const char *mode; @@ -35,7 +35,7 @@ Signed-off-by: Vinod Koul void (*dvr_init)(struct brcm_usb_init_params *params); const struct match_chip_info *info; struct regmap *rmap; -@@ -441,8 +441,9 @@ static int brcm_usb_phy_probe(struct pla +@@ -471,8 +471,9 @@ static int brcm_usb_phy_probe(struct pla priv->ini.family_id = brcmstb_get_family_id(); priv->ini.product_id = brcmstb_get_product_id(); diff --git a/target/linux/bcm4908/patches-5.10/086-v5.12-0002-phy-phy-brcm-usb-specify-init-function-format-at-str.patch b/target/linux/bcm4908/patches-5.10/086-v5.12-0002-phy-phy-brcm-usb-specify-init-function-format-at-str.patch index bdc932732c..ffb064f95f 100644 --- a/target/linux/bcm4908/patches-5.10/086-v5.12-0002-phy-phy-brcm-usb-specify-init-function-format-at-str.patch +++ b/target/linux/bcm4908/patches-5.10/086-v5.12-0002-phy-phy-brcm-usb-specify-init-function-format-at-str.patch @@ -20,7 +20,7 @@ Signed-off-by: Vinod Koul --- a/drivers/phy/broadcom/phy-brcm-usb.c +++ b/drivers/phy/broadcom/phy-brcm-usb.c -@@ -35,7 +35,7 @@ struct value_to_name_map { +@@ -36,7 +36,7 @@ struct value_to_name_map { }; struct match_chip_info { @@ -29,7 +29,7 @@ Signed-off-by: Vinod Koul u8 required_regs[BRCM_REGS_MAX + 1]; u8 optional_reg; }; -@@ -428,7 +428,6 @@ static int brcm_usb_phy_probe(struct pla +@@ -458,7 +458,6 @@ static int brcm_usb_phy_probe(struct pla struct device_node *dn = pdev->dev.of_node; int err; const char *mode; @@ -37,7 +37,7 @@ Signed-off-by: Vinod Koul const struct match_chip_info *info; struct regmap *rmap; int x; -@@ -444,8 +443,8 @@ static int brcm_usb_phy_probe(struct pla +@@ -474,8 +473,8 @@ static int brcm_usb_phy_probe(struct pla info = of_device_get_match_data(&pdev->dev); if (!info) return -ENOENT; diff --git a/target/linux/bcm4908/patches-5.10/086-v5.12-0005-phy-phy-brcm-usb-support-PHY-on-the-BCM4908.patch b/target/linux/bcm4908/patches-5.10/086-v5.12-0005-phy-phy-brcm-usb-support-PHY-on-the-BCM4908.patch index a2cea0f138..362738c802 100644 --- a/target/linux/bcm4908/patches-5.10/086-v5.12-0005-phy-phy-brcm-usb-support-PHY-on-the-BCM4908.patch +++ b/target/linux/bcm4908/patches-5.10/086-v5.12-0005-phy-phy-brcm-usb-support-PHY-on-the-BCM4908.patch @@ -35,7 +35,7 @@ Signed-off-by: Vinod Koul Enable this to support the Broadcom STB USB PHY. --- a/drivers/phy/broadcom/phy-brcm-usb.c +++ b/drivers/phy/broadcom/phy-brcm-usb.c -@@ -287,6 +287,10 @@ static const struct match_chip_info chip +@@ -317,6 +317,10 @@ static const struct match_chip_info chip static const struct of_device_id brcm_usb_dt_ids[] = { { diff --git a/target/linux/bcm4908/patches-5.10/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch b/target/linux/bcm4908/patches-5.10/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch deleted file mode 100644 index 4efe4fa1cf..0000000000 --- a/target/linux/bcm4908/patches-5.10/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Tue, 15 Feb 2022 08:27:35 +0100 -Subject: [PATCH] i2c: brcmstb: fix support for DSL and CM variants -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -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") -Cc: Kamal Dasu -Signed-off-by: Rafał Miłecki -Acked-by: Florian Fainelli ---- - 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 -@@ -674,7 +674,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); -- cgit v1.2.3