From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754873AbdJIQKA (ORCPT ); Mon, 9 Oct 2017 12:10:00 -0400 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:53549 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754577AbdJIQJ6 (ORCPT ); Mon, 9 Oct 2017 12:09:58 -0400 X-IronPort-AV: E=Sophos;i="5.42,500,1500966000"; d="scan'208";a="7707641" From: Claudiu Beznea To: , , , , CC: , , , Claudiu Beznea Subject: [PATCH 06/15] ARM: dts: at91: sama5d27_som1_ek: add pinmuxing for pwm0 Date: Mon, 9 Oct 2017 19:09:28 +0300 Message-ID: <1507565377-1545-7-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507565377-1545-1-git-send-email-claudiu.beznea@microchip.com> References: <1507565377-1545-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 6c4c976a99d1..339f4e71cf40 100644 --- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts +++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts @@ -136,7 +136,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 { @@ -529,7 +531,7 @@ compatible = "gpio-leds"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_led_gpio_default>; - status = "okay"; + status = "okay"; /* Conflict with pwm0. */ red { label = "red"; -- 2.7.4