From: Claudiu Beznea Date: Tue, 10 Oct 2017 10:09:45 +0000 (+0300) Subject: ARM: dts: at91: sama5d2_xplained: add pinmuxing for pwm0 X-Git-Tag: v4.15-rc1~75^2~22^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0036d85b5bdd67f1f2be8b59bca5044166555b4f;p=thirdparty%2Fkernel%2Flinux.git ARM: dts: at91: sama5d2_xplained: add pinmuxing for pwm0 Add pin muxing for pwm0 and set it as disabled since it is in conflict with pins for leds. Signed-off-by: Claudiu Beznea Signed-off-by: Alexandre Belloni --- diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index 69ca8573231c8..7d385c868ffbf 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -233,7 +233,9 @@ }; pwm0: pwm@f802c000 { - status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_pwm2_default>; + status = "disabled"; /* conflict with leds */ }; flx0: flexcom@f8034000 { @@ -503,6 +505,11 @@ bias-disable; }; + pinctrl_pwm0_pwm2_default: pwm0_pwm2_default { + pinmux = , + ; + bias-pull-up; + }; }; classd: classd@fc048000 { @@ -539,7 +546,7 @@ compatible = "gpio-leds"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_led_gpio_default>; - status = "okay"; + status = "okay"; /* conflict with pwm0 */ red { label = "red";