From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932218AbdJJKLG (ORCPT ); Tue, 10 Oct 2017 06:11:06 -0400 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:17852 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932191AbdJJKLD (ORCPT ); Tue, 10 Oct 2017 06:11:03 -0400 X-IronPort-AV: E=Sophos;i="5.42,504,1500966000"; d="scan'208";a="8193002" From: Claudiu Beznea To: , , , , CC: , , , Claudiu Beznea Subject: [PATCH v2 10/14] ARM: dts: at91: sama5d2_xplained: add pinmuxing for pwm0 Date: Tue, 10 Oct 2017 13:09:45 +0300 Message-ID: <1507630189-15504-11-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507630189-15504-1-git-send-email-claudiu.beznea@microchip.com> References: <1507630189-15504-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 pins for leds. Signed-off-by: Claudiu Beznea --- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index 0b78476cec4a..851a095fd51d 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -224,7 +224,9 @@ }; pwm0: pwm@f802c000 { - status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_pwm2_default>; + status = "disabled"; /* conflict with leds */ }; flx0: flexcom@f8034000 { @@ -494,6 +496,11 @@ bias-disable; }; + pinctrl_pwm0_pwm2_default: pwm0_pwm2_default { + pinmux = , + ; + bias-pull-up; + }; }; classd: classd@fc048000 { @@ -530,7 +537,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