[PATCH 1/2] arch: nios2: rename 'altr,gpio-bank-width' -> 'altr,ngpio'

[PATCH 1/2] arch: nios2: rename 'altr,gpio-bank-width' -> 'altr,ngpio'

[Alexandru Ardelean]

There is no more 'altr,gpio-bank-width' in the 'altr,pio-1.0' driver.
There is a 'altr,ngpio' which is  what the property wants to configure.

This change updates all occurrences of 'altr,gpio-bank-width' to
'altr,ngpio'.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
 Documentation/devicetree/bindings/fpga/fpga-region.txt | 4 ++--
 arch/nios2/boot/dts/10m50_devboard.dts                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/fpga/fpga-region.txt b/Documentation/devicetree/bindings/fpga/fpga-region.txt
index 90c44694a30b..b0dacb6a3390 100644
--- a/Documentation/devicetree/bindings/fpga/fpga-region.txt
+++ b/Documentation/devicetree/bindings/fpga/fpga-region.txt
@@ -263,7 +263,7 @@ Overlay contains:
 			gpio@10040 {
 				compatible = "altr,pio-1.0";
 				reg = <0x10040 0x20>;
-				altr,gpio-bank-width = <4>;
+				altr,ngpio = <4>;
 				#gpio-cells = <2>;
 				clocks = <2>;
 				gpio-controller;
@@ -468,7 +468,7 @@ programming is the FPGA based bridge of fpga_region1.
 				compatible = "altr,pio-1.0";
 				reg = <0x10040 0x20>;
 				clocks = <0x2>;
-				altr,gpio-bank-width = <0x4>;
+				altr,ngpio = <0x4>;
 				resetvalue = <0x0>;
 				#gpio-cells = <0x2>;
 				gpio-controller;
diff --git a/arch/nios2/boot/dts/10m50_devboard.dts b/arch/nios2/boot/dts/10m50_devboard.dts
index 5e4ab032c1e8..739ad96a6cc1 100644
--- a/arch/nios2/boot/dts/10m50_devboard.dts
+++ b/arch/nios2/boot/dts/10m50_devboard.dts
@@ -179,7 +179,7 @@
 		led_pio: gpio@180014d0 {
 			compatible = "altr,pio-1.0";
 			reg = <0x180014d0 0x00000010>;
-			altr,gpio-bank-width = <4>;
+			altr,ngpio = <4>;
 			resetvalue = <15>;
 			#gpio-cells = <2>;
 			gpio-controller;
@@ -190,7 +190,7 @@
 			reg = <0x180014c0 0x00000010>;
 			interrupt-parent = <&cpu>;
 			interrupts = <6>;
-			altr,gpio-bank-width = <3>;
+			altr,ngpio = <3>;
 			altr,interrupt-type = <2>;
 			edge_type = <1>;
 			level_trigger = <0>;
-- 
2.20.1

[PATCH 2/2] arch: nios2: remove 'resetvalue' property

[Alexandru Ardelean]

The 'altr,pio-1.0' driver does not handle the 'resetvalue', so remove it.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
 Documentation/devicetree/bindings/fpga/fpga-region.txt | 1 -
 arch/nios2/boot/dts/10m50_devboard.dts                 | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/fpga/fpga-region.txt b/Documentation/devicetree/bindings/fpga/fpga-region.txt
index b0dacb6a3390..8ab19d1d3f9a 100644
--- a/Documentation/devicetree/bindings/fpga/fpga-region.txt
+++ b/Documentation/devicetree/bindings/fpga/fpga-region.txt
@@ -469,7 +469,6 @@ programming is the FPGA based bridge of fpga_region1.
 				reg = <0x10040 0x20>;
 				clocks = <0x2>;
 				altr,ngpio = <0x4>;
-				resetvalue = <0x0>;
 				#gpio-cells = <0x2>;
 				gpio-controller;
 			};
diff --git a/arch/nios2/boot/dts/10m50_devboard.dts b/arch/nios2/boot/dts/10m50_devboard.dts
index 739ad96a6cc1..56339bef3247 100644
--- a/arch/nios2/boot/dts/10m50_devboard.dts
+++ b/arch/nios2/boot/dts/10m50_devboard.dts
@@ -180,7 +180,6 @@
 			compatible = "altr,pio-1.0";
 			reg = <0x180014d0 0x00000010>;
 			altr,ngpio = <4>;
-			resetvalue = <15>;
 			#gpio-cells = <2>;
 			gpio-controller;
 		};
@@ -194,7 +193,6 @@
 			altr,interrupt-type = <2>;
 			edge_type = <1>;
 			level_trigger = <0>;
-			resetvalue = <0>;
 			#gpio-cells = <2>;
 			gpio-controller;
 		};
-- 
2.20.1

Re: [PATCH 1/2] arch: nios2: rename 'altr,gpio-bank-width' -> 'altr,ngpio'

[Rob Herring]

On Fri, 6 Mar 2020 13:54:49 +0200, Alexandru Ardelean wrote:
> There is no more 'altr,gpio-bank-width' in the 'altr,pio-1.0' driver.
> There is a 'altr,ngpio' which is  what the property wants to configure.
> 
> This change updates all occurrences of 'altr,gpio-bank-width' to
> 'altr,ngpio'.
> 
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
> ---
>  Documentation/devicetree/bindings/fpga/fpga-region.txt | 4 ++--
>  arch/nios2/boot/dts/10m50_devboard.dts                 | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 2/2] arch: nios2: remove 'resetvalue' property

[Rob Herring]

On Fri, 6 Mar 2020 13:54:50 +0200, Alexandru Ardelean wrote:
> The 'altr,pio-1.0' driver does not handle the 'resetvalue', so remove it.
> 
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
> ---
>  Documentation/devicetree/bindings/fpga/fpga-region.txt | 1 -
>  arch/nios2/boot/dts/10m50_devboard.dts                 | 2 --
>  2 files changed, 3 deletions(-)
> 

Acked-by: Rob Herring <robh@kernel.org>