From b756ea2a909a36d7e931b96edf0d15539421c733 Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Sun, 12 Apr 2020 20:58:29 +0800 Subject: ramips: replace pinctrl property names Upstream pinctrl driver in drivers/staging uses groups/function/ralink,num-gpios instead of ralink,group/ralink,function/ralink,nr-gpio Replace these properties in dts as well as the pinctrl driver in patches-4.14. This commit is created using: sed -i 's/ralink,group/groups/g' sed -i 's/ralink,function/function/g' sed -i 's/ralink,nr-gpio/ralink,num-gpios/g' Signed-off-by: Chuanhong Guo --- target/linux/ramips/dts/rt5350.dtsi | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'target/linux/ramips/dts/rt5350.dtsi') diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index 89a3903118..9be841f8cb 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -116,7 +116,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,nr-gpio = <22>; + ralink,num-gpios = <22>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -133,7 +133,7 @@ #gpio-cells = <2>; ralink,gpio-base = <22>; - ralink,nr-gpio = <6>; + ralink,num-gpios = <6>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -275,43 +275,43 @@ i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; phy_led_pins: phy_led { phy_led { - ralink,group = "led"; - ralink,function = "led"; + groups = "led"; + function = "led"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; uartf_pins: uartf { uartf { - ralink,group = "uartf"; - ralink,function = "uartf"; + groups = "uartf"; + function = "uartf"; }; }; spi_cs1: spi1 { spi1 { - ralink,group = "spi_cs1"; - ralink,function = "spi_cs1"; + groups = "spi_cs1"; + function = "spi_cs1"; }; }; }; -- cgit v1.2.3