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/rt2880.dtsi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'target/linux/ramips/dts/rt2880.dtsi') diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi index 762fe49e7c..321c1b14cf 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -80,7 +80,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,nr-gpio = <24>; + ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -94,7 +94,7 @@ #gpio-cells = <2>; ralink,gpio-base = <24>; - ralink,nr-gpio = <16>; + ralink,num-gpios = <16>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -110,7 +110,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,nr-gpio = <32>; + ralink,num-gpios = <32>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -153,29 +153,29 @@ state_default: pinctrl0 { sdram { - ralink,group = "sdram"; - ralink,function = "sdram"; + groups = "sdram"; + function = "sdram"; }; }; 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"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; }; -- cgit v1.2.3