| From ef53b58fd627f2b9401a47440ca1802fe6dcca0e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 9 Sep 2019 14:05:27 +0530 |
| Subject: arm64: dts: Fix gpio to pinmux mapping |
| |
| From: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com> |
| |
| [ Upstream commit 965f6603e3335a953f4f876792074cb36bf65f7f ] |
| |
| There are total of 151 non-secure gpio (0-150) and four |
| pins of pinmux (91, 92, 93 and 94) are not mapped to any |
| gpio pin, hence update same in DT. |
| |
| Fixes: 8aa428cc1e2e ("arm64: dts: Add pinctrl DT nodes for Stingray SOC") |
| Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com> |
| Reviewed-by: Ray Jui <ray.jui@broadcom.com> |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi | 5 +++-- |
| arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 3 +-- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi |
| index 15214d05fec1c..8c20d4a0cb4ed 100644 |
| --- a/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi |
| +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi |
| @@ -42,13 +42,14 @@ |
| |
| pinmux: pinmux@0014029c { |
| compatible = "pinctrl-single"; |
| - reg = <0x0014029c 0x250>; |
| + reg = <0x0014029c 0x26c>; |
| #address-cells = <1>; |
| #size-cells = <1>; |
| pinctrl-single,register-width = <32>; |
| pinctrl-single,function-mask = <0xf>; |
| pinctrl-single,gpio-range = < |
| - &range 0 154 MODE_GPIO |
| + &range 0 91 MODE_GPIO |
| + &range 95 60 MODE_GPIO |
| >; |
| range: gpio-range { |
| #pinctrl-single,gpio-range-cells = <3>; |
| diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi |
| index 2b76293b51c83..3d2921ef29351 100644 |
| --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi |
| +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi |
| @@ -444,8 +444,7 @@ |
| <&pinmux 108 16 27>, |
| <&pinmux 135 77 6>, |
| <&pinmux 141 67 4>, |
| - <&pinmux 145 149 6>, |
| - <&pinmux 151 91 4>; |
| + <&pinmux 145 149 6>; |
| }; |
| |
| i2c1: i2c@000e0000 { |
| -- |
| 2.20.1 |
| |