From 28de86e8169597a70905211e41c8e9b38aab97f0 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Wed, 22 Aug 2018 06:26:36 +0200 Subject: [PATCH] ramips: drop not existing groups from pinmux RT5350 neither have rgmii nor a mdio pinmux group. MT7628an doesn't have a jtag group. Having these groups defined might cause a boot panic. The pin controller fails to initialise for kernels > 4.9 if invalid groups are used. If a subsystem references a pin controller configuration node, it can not find this node and errors out. In worst case it's the SPI driver which errors out and we have no root filesystem to mount. Signed-off-by: Mathias Kresin --- target/linux/ramips/dts/3G150B.dts | 2 +- target/linux/ramips/dts/ALL5003.dts | 2 +- target/linux/ramips/dts/DIR-300-B7.dts | 2 +- target/linux/ramips/dts/DIR-320-B1.dts | 2 +- target/linux/ramips/dts/MPRA1.dts | 2 +- target/linux/ramips/dts/MPRA2.dts | 2 +- target/linux/ramips/dts/NCS601W.dts | 2 +- target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi | 2 +- target/linux/ramips/dts/WIZARD8800.dts | 2 +- target/linux/ramips/dts/WRTNODE2P.dts | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/ramips/dts/3G150B.dts b/target/linux/ramips/dts/3G150B.dts index 601d6c6b32..90a52fa8bc 100644 --- a/target/linux/ramips/dts/3G150B.dts +++ b/target/linux/ramips/dts/3G150B.dts @@ -96,7 +96,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf", "led"; + ralink,group = "i2c", "jtag", "uartf", "led"; ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/ALL5003.dts b/target/linux/ramips/dts/ALL5003.dts index 55818874da..303bc4068e 100644 --- a/target/linux/ramips/dts/ALL5003.dts +++ b/target/linux/ramips/dts/ALL5003.dts @@ -91,7 +91,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,group = "i2c", "jtag", "uartf"; ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/DIR-300-B7.dts b/target/linux/ramips/dts/DIR-300-B7.dts index 72e6a8dd6d..f6a8582501 100644 --- a/target/linux/ramips/dts/DIR-300-B7.dts +++ b/target/linux/ramips/dts/DIR-300-B7.dts @@ -87,7 +87,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,group = "i2c", "jtag", "uartf"; ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/DIR-320-B1.dts b/target/linux/ramips/dts/DIR-320-B1.dts index ab1e888a0d..36c23de08a 100644 --- a/target/linux/ramips/dts/DIR-320-B1.dts +++ b/target/linux/ramips/dts/DIR-320-B1.dts @@ -109,7 +109,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,group = "i2c", "jtag", "uartf"; ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/MPRA1.dts b/target/linux/ramips/dts/MPRA1.dts index 4c8c2064b7..22e2010e27 100644 --- a/target/linux/ramips/dts/MPRA1.dts +++ b/target/linux/ramips/dts/MPRA1.dts @@ -102,7 +102,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf", "led"; + ralink,group = "i2c", "jtag", "uartf", "led"; ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts index 71bcb1a016..7c8cdd2eb3 100644 --- a/target/linux/ramips/dts/MPRA2.dts +++ b/target/linux/ramips/dts/MPRA2.dts @@ -98,7 +98,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,group = "i2c", "jtag", "uartf"; ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/NCS601W.dts b/target/linux/ramips/dts/NCS601W.dts index 7b67a81cb9..cd1a7a5342 100644 --- a/target/linux/ramips/dts/NCS601W.dts +++ b/target/linux/ramips/dts/NCS601W.dts @@ -49,7 +49,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,group = "i2c", "jtag", "uartf"; ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi b/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi index d27bf017a9..81cb81fb26 100644 --- a/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi +++ b/target/linux/ramips/dts/RT5350F-OLINUXINO.dtsi @@ -56,7 +56,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "jtag", "rgmii", "mdio"; + ralink,group = "jtag"; ralink,function = "gpio"; }; uartf_gpio { diff --git a/target/linux/ramips/dts/WIZARD8800.dts b/target/linux/ramips/dts/WIZARD8800.dts index ff5500f021..1e99359e33 100644 --- a/target/linux/ramips/dts/WIZARD8800.dts +++ b/target/linux/ramips/dts/WIZARD8800.dts @@ -57,7 +57,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; + ralink,group = "i2c", "jtag", "uartf"; ralink,function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/WRTNODE2P.dts b/target/linux/ramips/dts/WRTNODE2P.dts index f9cc1e97f2..d49470afbc 100644 --- a/target/linux/ramips/dts/WRTNODE2P.dts +++ b/target/linux/ramips/dts/WRTNODE2P.dts @@ -23,7 +23,7 @@ &pinctrl { state_default: pinctrl0 { gpio { - ralink,group = "i2c", "gpio", "jtag"; + ralink,group = "i2c", "gpio"; ralink,function = "gpio"; }; }; -- 2.25.1