313197d707
This gets us in sync with dts from kernel 4.11. Two patches were already backported earlier. I decided to use 03x prefix as it's kind of similar to the 3xx prefix: 3xx - architecture specific patches It isn't any documented or strict rule though. We don't need to stick to it if we hit any problems. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
33 lines
876 B
Diff
33 lines
876 B
Diff
From 14e0ea34058ce13794877206f05a6ab5034e147b Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Mon, 19 Sep 2016 10:43:19 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- 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";
|
|
};
|
|
|