summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
diff options
context:
space:
mode:
authorStefan Wahren <stefan.wahren@i2se.com>2018-04-21 13:28:34 +0200
committerEric Anholt <eric@anholt.net>2018-04-23 22:00:36 +0200
commitc4bb97821744b02e04be2744c1a726e2a21e7779 (patch)
tree7b0b13cf7af1398b861cb618997d3dad8680ad3a /arch/arm/boot/dts/bcm2836-rpi-2-b.dts
parentLinux 4.17-rc1 (diff)
downloadlinux-c4bb97821744b02e04be2744c1a726e2a21e7779.tar.xz
linux-c4bb97821744b02e04be2744c1a726e2a21e7779.zip
ARM: dts: bcm283x: Fix PWM pin assignment
All RPi 1 and 2 boards used the PWM (audio out) on pin 40 and 45. So it was easy to define them in bcm2835-rpi.dtsi. Starting with RPi 3 this wont work anymore, because it uses pin 40 and 41. Furthermore the Zero variants doesn't have audio out. This patch fixes this pin conflict by moving the PWM node to the board-level. Change summary: RPi 3 B: PWM1 45 -> 41 Zero, Zero W: PWM disabled all other: no functional change Reported-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'arch/arm/boot/dts/bcm2836-rpi-2-b.dts')
-rw-r--r--arch/arm/boot/dts/bcm2836-rpi-2-b.dts6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index 5c339adabdf0..2fef70a09953 100644
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -41,6 +41,12 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
};
+&pwm {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
+ status = "okay";
+};
+
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;