diff mbox

[1/5] ARM: dts: qcom: Replace gpio node with pinctrl node

Message ID 1434486676-21812-2-git-send-email-sboyd@codeaurora.org (mailing list archive)
State Accepted, archived
Delegated to: Andy Gross
Headers show

Commit Message

Stephen Boyd June 16, 2015, 8:31 p.m. UTC 
Now that we have a proper pinctrl driver for the gpio block we
can change the compatible field here and configure the pinmux on
msm8960 devices.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 arch/arm/boot/dts/qcom-msm8960.dtsi | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Andy Gross July 23, 2015, 8:59 p.m. UTC | #1 
On Tue, Jun 16, 2015 at 01:31:12PM -0700, Stephen Boyd wrote:
> Now that we have a proper pinctrl driver for the gpio block we
> can change the compatible field here and configure the pinmux on
> msm8960 devices.
> 
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---

Applied, thanks
diff mbox

Patch

diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi
index a02b984cc68d..1ae3fe828e59 100644
--- a/arch/arm/boot/dts/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8960.dtsi
@@ -73,11 +73,10 @@ 
 			cpu-offset = <0x80000>;
 		};
 
-		msmgpio: gpio@800000 {
-			compatible = "qcom,msm-gpio";
+		msmgpio: pinctrl@800000 {
+			compatible = "qcom,msm8960-pinctrl";
 			gpio-controller;
 			#gpio-cells = <2>;
-			ngpio = <150>;
 			interrupts = <0 16 0x4>;
 			interrupt-controller;
 			#interrupt-cells = <2>;