From 2d3542e1c9d3267285fbf8048ab35ad6c3f95155 Mon Sep 17 00:00:00 2001 From: Stanislav Galabov Date: Fri, 24 Jun 2016 11:43:17 +0200 Subject: ramips: DTS rework Add node aliases to dtsi files. Reword dts files so they're more in-line with upstream. Fix some more warnings and errors reported by dtc Signed-off-by: Stanislav Galabov --- target/linux/ramips/dts/PX-4885.dtsi | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'target/linux/ramips/dts/PX-4885.dtsi') diff --git a/target/linux/ramips/dts/PX-4885.dtsi b/target/linux/ramips/dts/PX-4885.dtsi index 7d846afdb5..ba862fc0c0 100644 --- a/target/linux/ramips/dts/PX-4885.dtsi +++ b/target/linux/ramips/dts/PX-4885.dtsi @@ -4,27 +4,6 @@ compatible = "PX-4885", "ralink,rt5350-soc"; model = "7Links PX-4885"; - pinctrl { - state_default: pinctrl0 { - gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; - }; - }; - }; - - ethernet@10100000 { - mtd-mac-address = <&factory 0x28>; - }; - - esw@10110000 { - mediatek,portmap = <0x3f>; - }; - - wmac@10180000 { - ralink,mtd-eeprom = <&factory 0>; - }; - gpio-keys-polled { compatible = "gpio-keys-polled"; #address-cells = <1>; @@ -52,3 +31,24 @@ }; }; }; + +&pinctrl { + state_default { + gpio { + ralink,group = "i2c", "jtag", "uartf"; + ralink,function = "gpio"; + }; + }; +}; + +ðernet { + mtd-mac-address = <&factory 0x28>; +}; + +&esw { + mediatek,portmap = <0x3f>; +}; + +&wmac { + ralink,mtd-eeprom = <&factory 0>; +}; -- cgit v1.2.3 From 4d42b150033225161e839f8e63814818ec946100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 24 Jun 2016 12:56:12 +0200 Subject: ramips: fix pinctrl regression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This regression was introduced in commit 9195d8da. Signed-off-by: Álvaro Fernández Rojas --- target/linux/ramips/dts/PX-4885.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/ramips/dts/PX-4885.dtsi') diff --git a/target/linux/ramips/dts/PX-4885.dtsi b/target/linux/ramips/dts/PX-4885.dtsi index ba862fc0c0..b135b5747b 100644 --- a/target/linux/ramips/dts/PX-4885.dtsi +++ b/target/linux/ramips/dts/PX-4885.dtsi @@ -33,7 +33,7 @@ }; &pinctrl { - state_default { + state_default: pinctrl0 { gpio { ralink,group = "i2c", "jtag", "uartf"; ralink,function = "gpio"; -- cgit v1.2.3