From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 19 Sep 2016 08:43:19 +0000 (+0200)
Subject: ARM: dts: bcm283x: add pinctrl group to &pwm, drop pins from &gpio
X-Git-Tag: v4.10-rc1~82^2~8^2^2~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=14e0ea34058ce13794877206f05a6ab5034e147b;p=linux-2.6-block.git

ARM: dts: bcm283x: add pinctrl group to &pwm, drop pins from &gpio

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
---

diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index e9b47b2bbc33..5663772fc460 100644
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -39,7 +39,7 @@
 	};
 
 	alt0: alt0 {
-		brcm,pins = <0 1 2 3 4 5 7 8 9 10 11 14 15 40 45>;
+		brcm,pins = <0 1 2 3 4 5 7 8 9 10 11 14 15>;
 		brcm,function = <BCM2835_FSEL_ALT0>;
 	};
 
@@ -69,6 +69,8 @@
 };
 
 &pwm {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
 	status = "okay";
 };