diff options
| author | Tom Rini <[email protected]> | 2025-01-26 16:17:48 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-01-26 16:19:33 -0600 |
| commit | d8a7100d658eb201fa0e955667fdff298db31945 (patch) | |
| tree | 90447acc915dafdd9227d24f748b5f1a3976b9d3 /dts/upstream/src/arc | |
| parent | 2348dd8e41ea7912f2ecf35684bbe6386281fb57 (diff) | |
| parent | 844493d7e99cb795f3e28130ee09ba7a6441162f (diff) | |
Subtree merge tag 'v6.13-dts' of dts repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
[rockchip fixes from Jonas Karlman via IRC]
Diffstat (limited to 'dts/upstream/src/arc')
| -rw-r--r-- | dts/upstream/src/arc/axc001.dtsi | 2 | ||||
| -rw-r--r-- | dts/upstream/src/arc/axc003.dtsi | 2 | ||||
| -rw-r--r-- | dts/upstream/src/arc/axc003_idu.dtsi | 2 | ||||
| -rw-r--r-- | dts/upstream/src/arc/axs10x_mb.dtsi | 12 | ||||
| -rw-r--r-- | dts/upstream/src/arc/hsdk.dts | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/dts/upstream/src/arc/axc001.dtsi b/dts/upstream/src/arc/axc001.dtsi index 2a151607b08..88bcc7ab6f5 100644 --- a/dts/upstream/src/arc/axc001.dtsi +++ b/dts/upstream/src/arc/axc001.dtsi @@ -54,7 +54,7 @@ compatible = "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells = <2>; - snps,nr-gpios = <30>; + ngpios = <30>; reg = <0>; interrupt-controller; #interrupt-cells = <2>; diff --git a/dts/upstream/src/arc/axc003.dtsi b/dts/upstream/src/arc/axc003.dtsi index c0a812674ce..9a2dc39a5cf 100644 --- a/dts/upstream/src/arc/axc003.dtsi +++ b/dts/upstream/src/arc/axc003.dtsi @@ -62,7 +62,7 @@ compatible = "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells = <2>; - snps,nr-gpios = <30>; + ngpios = <30>; reg = <0>; interrupt-controller; #interrupt-cells = <2>; diff --git a/dts/upstream/src/arc/axc003_idu.dtsi b/dts/upstream/src/arc/axc003_idu.dtsi index 67556f4b705..f31382cb8be 100644 --- a/dts/upstream/src/arc/axc003_idu.dtsi +++ b/dts/upstream/src/arc/axc003_idu.dtsi @@ -69,7 +69,7 @@ compatible = "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells = <2>; - snps,nr-gpios = <30>; + ngpios = <30>; reg = <0>; interrupt-controller; #interrupt-cells = <2>; diff --git a/dts/upstream/src/arc/axs10x_mb.dtsi b/dts/upstream/src/arc/axs10x_mb.dtsi index b6443538530..3add2fe257f 100644 --- a/dts/upstream/src/arc/axs10x_mb.dtsi +++ b/dts/upstream/src/arc/axs10x_mb.dtsi @@ -250,7 +250,7 @@ compatible = "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells = <2>; - snps,nr-gpios = <32>; + ngpios = <32>; reg = <0>; }; @@ -258,7 +258,7 @@ compatible = "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells = <2>; - snps,nr-gpios = <8>; + ngpios = <8>; reg = <1>; }; @@ -266,7 +266,7 @@ compatible = "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells = <2>; - snps,nr-gpios = <8>; + ngpios = <8>; reg = <2>; }; }; @@ -281,7 +281,7 @@ compatible = "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells = <2>; - snps,nr-gpios = <30>; + ngpios = <30>; reg = <0>; }; @@ -289,7 +289,7 @@ compatible = "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells = <2>; - snps,nr-gpios = <10>; + ngpios = <10>; reg = <1>; }; @@ -297,7 +297,7 @@ compatible = "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells = <2>; - snps,nr-gpios = <8>; + ngpios = <8>; reg = <2>; }; }; diff --git a/dts/upstream/src/arc/hsdk.dts b/dts/upstream/src/arc/hsdk.dts index 41b980df862..98bb850722a 100644 --- a/dts/upstream/src/arc/hsdk.dts +++ b/dts/upstream/src/arc/hsdk.dts @@ -308,7 +308,7 @@ compatible = "snps,dw-apb-gpio-port"; gpio-controller; #gpio-cells = <2>; - snps,nr-gpios = <24>; + ngpios = <24>; reg = <0>; }; }; |