From 44ce70f0e209c12cc9548d5fa60890997a2707f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 13 Sep 2022 10:24:42 +0200 Subject: [PATCH] bcm53xx: drop downstream patch that now breaks pinctrl driver MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes: [ 0.292536] ns-pinmux 1800c100.cru:pinctrl: invalid resource [ 0.298322] ns-pinmux 1800c100.cru:pinctrl: Failed to map pinctrl regs [ 0.305578] ns-pinmux: probe of 1800c100.cru:pinctrl failed with error -22 Linux 5.4.157 included commit 6d0b30784fcd9 ("Revert "pinctrl: bcm: ns: support updated DT binding as syscon subnode"") which makes pinctrl driver expect the old DT syntax. Drop downstream patch switching pinctrl node to the invalidated syntax. Fixes: 0b7311300b01d ("kernel: bump 5.4 to 5.4.158") Signed-off-by: Rafał Miłecki --- ...01X-Update-Northstar-pinctrl-binding.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch diff --git a/target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch b/target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch deleted file mode 100644 index e3ec87d4e4..0000000000 --- a/target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Subject: [PATCH] ARM: dts: BCM5301X: Update Northstar pinctrl binding -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Rafał Miłecki ---- - ---- a/arch/arm/boot/dts/bcm5301x.dtsi -+++ b/arch/arm/boot/dts/bcm5301x.dtsi -@@ -424,16 +424,12 @@ - #size-cells = <1>; - - cru@100 { -- compatible = "simple-bus"; -+ compatible = "syscon", "simple-mfd"; - reg = <0x100 0x1a4>; -- ranges; -- #address-cells = <1>; -- #size-cells = <1>; - -- pinctrl: pin-controller@1c0 { -+ pinctrl: pinctrl { - compatible = "brcm,bcm4708-pinmux"; -- reg = <0x1c0 0x24>; -- reg-names = "cru_gpio_control"; -+ offset = <0xc0>; - - spi-pins { - groups = "spi_grp"; -- 2.30.2