diff --git a/arch/arm/boot/dts/imx28-wirenboard50.dts b/arch/arm/boot/dts/imx28-wirenboard50.dts index 7a423e0658466..c3317fcd2fb54 100644 --- a/arch/arm/boot/dts/imx28-wirenboard50.dts +++ b/arch/arm/boot/dts/imx28-wirenboard50.dts @@ -439,76 +439,76 @@ gpios { A1_OUT { - gpios = <&gpio0 26 0>; + io-gpios = <&gpio0 26 0>; output-low; }; A2_OUT { - gpios = <&gpio0 16 0>; + io-gpios = <&gpio0 16 0>; output-low; }; A3_OUT { - gpios = <&gpio0 24 0>; + io-gpios = <&gpio0 24 0>; output-low; }; A4_OUT { - gpios = <&gpio0 20 0>; + io-gpios = <&gpio0 20 0>; output-low; }; A1_IN { - gpios = <&gpio0 4 0>; + io-gpios = <&gpio0 4 0>; input; }; A2_IN { - gpios = <&gpio0 5 0>; + io-gpios = <&gpio0 5 0>; input; }; A3_IN { - gpios = <&gpio0 6 0>; + io-gpios = <&gpio0 6 0>; input; }; A4_IN { - gpios = <&gpio0 28 0>; + io-gpios = <&gpio0 28 0>; input; }; R1_IN { - gpios = <&gpio3 28 0>; + io-gpios = <&gpio3 28 0>; input; }; R2_IN { - gpios = <&gpio3 10 0>; + io-gpios = <&gpio3 10 0>; input; }; CHARGER_STAT_1 { - gpios = <&gpio1 11 0>; + io-gpios = <&gpio1 11 0>; input; }; CHARGER_STAT_2 { - gpios = <&gpio1 10 0>; + io-gpios = <&gpio1 10 0>; input; }; }; gsm { power-type = <2>; - gpio-power = <&gpio0 17 0>; - gpio-pwrkey = <&gpio0 2 0>; - gpio-status = <&gpio1 7 0>; + power-gpios = <&gpio0 17 0>; + pwrkey-gpios = <&gpio0 2 0>; + status-gpios = <&gpio1 7 0>; }; radio { - gpio-irq = <&gpio1 6 0>; - gpio-dio2 = <&gpio1 5 0>; + irq-gpios = <&gpio1 6 0>; + dio2-gpios = <&gpio1 5 0>; spi-major-minor = <32765 0>; }; }; diff --git a/arch/arm/boot/dts/imx28-wirenboard52.dts b/arch/arm/boot/dts/imx28-wirenboard52.dts index f97d816baf47c..9a1ef3a11274a 100644 --- a/arch/arm/boot/dts/imx28-wirenboard52.dts +++ b/arch/arm/boot/dts/imx28-wirenboard52.dts @@ -567,81 +567,81 @@ gpios { A1_OUT { - gpios = <&gpio0 26 0>; + io-gpios = <&gpio0 26 0>; output-low; }; A2_OUT { - gpios = <&gpio0 16 0>; + io-gpios = <&gpio0 16 0>; output-low; }; A3_OUT { - gpios = <&gpio0 24 0>; + io-gpios = <&gpio0 24 0>; output-low; }; A4_OUT { - gpios = <&gpio0 20 0>; + io-gpios = <&gpio0 20 0>; output-low; }; A1_IN { - gpios = <&gpio0 6 1>; + io-gpios = <&gpio0 6 1>; input; }; A2_IN { - gpios = <&gpio0 7 1>; + io-gpios = <&gpio0 7 1>; input; }; A3_IN { - gpios = <&gpio0 28 1>; + io-gpios = <&gpio0 28 1>; input; }; A4_IN { - gpios = <&gpio0 27 1>; + io-gpios = <&gpio0 27 1>; input; }; R1_IN { - gpios = <&gpio0 5 1>; + io-gpios = <&gpio0 5 1>; input; }; R2_IN { - gpios = <&gpio0 4 1>; + io-gpios = <&gpio0 4 1>; input; }; BATTERY_PRESENT { - gpios = <&gpio1 30 1>; + io-gpios = <&gpio1 30 1>; input; }; BATTERY_CHARGING { - gpios = <&gpio3 6 1>; + io-gpios = <&gpio3 6 1>; input; }; 5V_OUT { - gpios = <&gpio2 14 0>; + io-gpios = <&gpio2 14 0>; output-low; }; }; gsm { power-type = <2>; - gpio-power = <&gpio0 17 0>; - gpio-pwrkey = <&gpio0 2 0>; - gpio-status = <&gpio1 7 0>; + power-gpios = <&gpio0 17 0>; + pwrkey-gpios = <&gpio0 2 0>; + status-gpios = <&gpio1 7 0>; }; radio { - gpio-irq = <&gpio1 6 0>; - gpio-dio2 = <&gpio1 5 0>; + irq-gpios = <&gpio1 6 0>; + dio2-gpios = <&gpio1 5 0>; spi-major-minor = <32765 0>; }; }; diff --git a/arch/arm/boot/dts/imx28-wirenboard55.dts b/arch/arm/boot/dts/imx28-wirenboard55.dts index 4b1a03925c507..8a1af9124a496 100644 --- a/arch/arm/boot/dts/imx28-wirenboard55.dts +++ b/arch/arm/boot/dts/imx28-wirenboard55.dts @@ -599,67 +599,67 @@ gpios { A1_OUT { - gpios = <&gpio0 26 0>; + io-gpios = <&gpio0 26 0>; output-low; }; A2_OUT { - gpios = <&gpio0 16 0>; + io-gpios = <&gpio0 16 0>; output-low; }; A3_OUT { - gpios = <&gpio0 24 0>; + io-gpios = <&gpio0 24 0>; output-low; }; A4_OUT { - gpios = <&gpio0 20 0>; + io-gpios = <&gpio0 20 0>; output-low; }; A1_IN { - gpios = <&gpio0 6 1>; + io-gpios = <&gpio0 6 1>; input; }; A2_IN { - gpios = <&gpio0 7 1>; + io-gpios = <&gpio0 7 1>; input; }; A3_IN { - gpios = <&gpio0 28 1>; + io-gpios = <&gpio0 28 1>; input; }; A4_IN { - gpios = <&gpio0 27 1>; + io-gpios = <&gpio0 27 1>; input; }; R1_IN { - gpios = <&gpio0 5 1>; + io-gpios = <&gpio0 5 1>; input; }; BATTERY_PRESENT { - gpios = <&gpio1 30 1>; + io-gpios = <&gpio1 30 1>; input; }; BATTERY_CHARGING { - gpios = <&gpio3 6 1>; + io-gpios = <&gpio3 6 1>; input; }; 5V_OUT { - gpios = <&gpio2 14 0>; + io-gpios = <&gpio2 14 0>; output-low; }; MOD3_OFF { - gpios = <&gpio2 26 0>; + io-gpios = <&gpio2 26 0>; output-low; internal; }; @@ -667,14 +667,14 @@ gsm { power-type = <2>; - gpio-power = <&gpio0 17 0>; - gpio-pwrkey = <&gpio0 2 0>; - gpio-status = <&gpio1 7 0>; + power-gpios = <&gpio0 17 0>; + pwrkey-gpios = <&gpio0 2 0>; + status-gpios = <&gpio1 7 0>; }; radio { - gpio-irq = <&gpio1 6 0>; - gpio-dio2 = <&gpio1 5 0>; + irq-gpios = <&gpio1 6 0>; + dio2-gpios = <&gpio1 5 0>; spi-major-minor = <32765 0>; }; }; diff --git a/arch/arm/boot/dts/imx28-wirenboard58.dts b/arch/arm/boot/dts/imx28-wirenboard58.dts index 899bd76e7bdfa..d771b335759af 100644 --- a/arch/arm/boot/dts/imx28-wirenboard58.dts +++ b/arch/arm/boot/dts/imx28-wirenboard58.dts @@ -683,67 +683,67 @@ gpios { A1_OUT { - gpios = <&gpio0 26 0>; + io-gpios = <&gpio0 26 0>; output-low; }; A2_OUT { - gpios = <&gpio0 16 0>; + io-gpios = <&gpio0 16 0>; output-low; }; A3_OUT { - gpios = <&gpio0 24 0>; + io-gpios = <&gpio0 24 0>; output-low; }; A4_OUT { - gpios = <&gpio0 20 0>; + io-gpios = <&gpio0 20 0>; output-low; }; A1_IN { - gpios = <&gpio0 6 1>; + io-gpios = <&gpio0 6 1>; input; }; A2_IN { - gpios = <&gpio0 7 1>; + io-gpios = <&gpio0 7 1>; input; }; A3_IN { - gpios = <&gpio0 28 1>; + io-gpios = <&gpio0 28 1>; input; }; A4_IN { - gpios = <&gpio0 27 1>; + io-gpios = <&gpio0 27 1>; input; }; R1_IN { - gpios = <&gpio0 5 1>; + io-gpios = <&gpio0 5 1>; input; }; BATTERY_PRESENT { - gpios = <&gpio1 25 1>; + io-gpios = <&gpio1 25 1>; input; }; BATTERY_CHARGING { - gpios = <&gpio3 30 1>; + io-gpios = <&gpio3 30 1>; input; }; 5V_OUT { - gpios = <&gpio2 14 0>; + io-gpios = <&gpio2 14 0>; output-low; }; MOD3_OFF { - gpios = <&gpio2 26 0>; + io-gpios = <&gpio2 26 0>; output-low; internal; }; @@ -751,14 +751,14 @@ gsm { power-type = <2>; - gpio-power = <&gpio0 17 0>; - gpio-pwrkey = <&gpio0 2 0>; - gpio-status = <&gpio1 7 0>; + power-gpios = <&gpio0 17 0>; + pwrkey-gpios = <&gpio0 2 0>; + status-gpios = <&gpio1 7 0>; }; radio { - gpio-irq = <&gpio1 6 0>; - gpio-dio2 = <&gpio1 5 0>; + irq-gpios = <&gpio1 6 0>; + dio2-gpios = <&gpio1 5 0>; spi-major-minor = <32765 0>; }; }; diff --git a/arch/arm/boot/dts/imx6ul-wirenboard-evk.dts b/arch/arm/boot/dts/imx6ul-wirenboard-evk.dts index b3836b6669453..4c7656778f877 100644 --- a/arch/arm/boot/dts/imx6ul-wirenboard-evk.dts +++ b/arch/arm/boot/dts/imx6ul-wirenboard-evk.dts @@ -200,42 +200,42 @@ gpios { A1_OUT { - gpios = <&gpio3 15 0>; + io-gpios = <&gpio3 15 0>; output-low; }; A2_OUT { - gpios = <&gpio3 16 0>; + io-gpios = <&gpio3 16 0>; output-low; }; A3_OUT { - gpios = <&gpio3 17 0>; + io-gpios = <&gpio3 17 0>; output-low; }; A4_OUT { - gpios = <&gpio3 18 0>; + io-gpios = <&gpio3 18 0>; output-low; }; 5V_OUT { - gpios = <&gpio2 15 0>; + io-gpios = <&gpio2 15 0>; output-low; }; }; gsm { power-type = <2>; - gpio-power = <&gpio3 23 0>; - gpio-pwrkey = <&gpio3 20 0>; - gpio-status = <&gpio3 19 1>; - gpio-simsel = <&gpio3 24 0>; + power-gpios = <&gpio3 23 0>; + pwrkey-gpios = <&gpio3 20 0>; + status-gpios = <&gpio3 19 1>; + simsel-gpios = <&gpio3 24 0>; }; rfm { - gpio-irq = <&gpio3 14 0>; - gpio-dio2 = <&gpio3 13 0>; + irq-gpios = <&gpio3 14 0>; + dio2-gpios = <&gpio3 13 0>; spi-major-minor = <32765 0>; }; }; diff --git a/arch/arm/boot/dts/imx6ul-wirenboard61.dts b/arch/arm/boot/dts/imx6ul-wirenboard61.dts index 6d97d8f77457a..3de90fd59d7bd 100644 --- a/arch/arm/boot/dts/imx6ul-wirenboard61.dts +++ b/arch/arm/boot/dts/imx6ul-wirenboard61.dts @@ -283,52 +283,52 @@ gpios { A1_OUT { - gpios = <&gpio3 15 0>; + io-gpios = <&gpio3 15 0>; output-low; }; A2_OUT { - gpios = <&gpio3 16 0>; + io-gpios = <&gpio3 16 0>; output-low; }; A3_OUT { - gpios = <&gpio3 17 0>; + io-gpios = <&gpio3 17 0>; output-low; }; A4_OUT { - gpios = <&gpio3 18 0>; + io-gpios = <&gpio3 18 0>; output-low; }; 5V_OUT { - gpios = <&gpio1 27 0>; + io-gpios = <&gpio1 27 0>; output-low; }; V_OUT { - gpios = <&gpio3 9 0>; + io-gpios = <&gpio3 9 0>; output-low; }; V_OUT_OK { - gpios = <&gpio3 8 0>; + io-gpios = <&gpio3 8 0>; input; }; }; gsm { power-type = <2>; - gpio-power = <&gpio4 24 0>; - gpio-pwrkey = <&gpio3 20 0>; - gpio-status = <&gpio3 19 1>; - gpio-simselect = <&gpio3 24 0>; + power-gpios = <&gpio4 24 0>; + pwrkey-gpios = <&gpio3 20 0>; + status-gpios = <&gpio3 19 1>; + simselect-gpios = <&gpio3 24 0>; }; radio { - gpio-irq = <&gpio3 14 0>; - gpio-dio2 = <&gpio3 13 0>; + irq-gpios = <&gpio3 14 0>; + dio2-gpios = <&gpio3 13 0>; spi-major-minor = <9 0>; };