Skip to content

Commit e29c293

Browse files
committed
Merge tag 'riscv-sophgo-dt-fixes-for-v6.12-rc1' of https://github.com/sophgo/linux into HEAD
RISC-V Sophgo Devicetree fixes for v6.12-rc1 Just one minor fix to replace deprecated "snps,nr-gpios" property with "ngpios" for snps,dw-apb-gpio-port devices. Signed-off-by: Chen Wang <[email protected]> * tag 'riscv-sophgo-dt-fixes-for-v6.12-rc1' of https://github.com/sophgo/linux: riscv: dts: Replace deprecated snps,nr-gpios property for snps,dw-apb-gpio-port devices Link: https://lore.kernel.org/r/MA0P287MB2822A17623C51A558DB948FCFE482@MA0P287MB2822.INDP287.PROD.OUTLOOK.COM Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 83359f6 + d99913e commit e29c293

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/riscv/boot/dts/sophgo/sg2042.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
compatible = "snps,dw-apb-gpio-port";
113113
gpio-controller;
114114
#gpio-cells = <2>;
115-
snps,nr-gpios = <32>;
115+
ngpios = <32>;
116116
reg = <0>;
117117
interrupt-controller;
118118
#interrupt-cells = <2>;
@@ -134,7 +134,7 @@
134134
compatible = "snps,dw-apb-gpio-port";
135135
gpio-controller;
136136
#gpio-cells = <2>;
137-
snps,nr-gpios = <32>;
137+
ngpios = <32>;
138138
reg = <0>;
139139
interrupt-controller;
140140
#interrupt-cells = <2>;
@@ -156,7 +156,7 @@
156156
compatible = "snps,dw-apb-gpio-port";
157157
gpio-controller;
158158
#gpio-cells = <2>;
159-
snps,nr-gpios = <32>;
159+
ngpios = <32>;
160160
reg = <0>;
161161
interrupt-controller;
162162
#interrupt-cells = <2>;

0 commit comments

Comments
 (0)