From 17b035dcc8c018b158457e5fd5a32682bce57324 Mon Sep 17 00:00:00 2001 From: Claudiu Beznea Date: Tue, 10 Oct 2017 13:09:41 +0300 Subject: [PATCH] ARM: dts: at91: sama5d27_som1_ek: add pinmuxing for pwm0 Add pin muxing for pwm0 and set it as disabled since it is in conflict with the pins for leds. Signed-off-by: Claudiu Beznea Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts index 4fcfc2ae662f..7f80e8402807 100644 --- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts +++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts @@ -133,7 +133,9 @@ }; pwm0: pwm@f802c000 { - status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mikrobus1_pwm &pinctrl_mikrobus2_pwm>; + status = "disabled"; /* Conflict with leds. */ }; flx1: flexcom@f8038000 { @@ -526,7 +528,7 @@ compatible = "gpio-leds"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_led_gpio_default>; - status = "okay"; + status = "okay"; /* Conflict with pwm0. */ red { label = "red"; -- 2.25.1