From: Claudiu Beznea <claudiu.beznea@microchip.com>
To: <nicolas.ferre@microchip.com>,
<alexandre.belloni@free-electrons.com>, <robh+dt@kernel.org>,
<mark.rutland@arm.com>, <linux@armlinux.org.uk>
Cc: <linux-arm-kernel@lists.infradead.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Claudiu Beznea <claudiu.beznea@microchip.com>
Subject: [PATCH 06/15] ARM: dts: at91: sama5d27_som1_ek: add pinmuxing for pwm0
Date: Mon, 9 Oct 2017 19:09:28 +0300 [thread overview]
Message-ID: <1507565377-1545-7-git-send-email-claudiu.beznea@microchip.com> (raw)
In-Reply-To: <1507565377-1545-1-git-send-email-claudiu.beznea@microchip.com>
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 <claudiu.beznea@microchip.com>
---
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
next prev parent reply other threads:[~2017-10-09 16:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 16:09 [PATCH 00/14] at91 fixes and enhancements Claudiu Beznea
2017-10-09 16:09 ` [PATCH 01/15] ARM: dts: at91: sama5d27_som1_ek: add disabled status Claudiu Beznea
2017-10-09 16:09 ` [PATCH 02/15] ARM: dts: at91: sama5d27_som1_ek: enable i2c2 Claudiu Beznea
2017-10-09 16:09 ` [PATCH 03/15] ARM: dts: at91: sama5d27_som1_ek: update serial aliases Claudiu Beznea
2017-10-09 16:09 ` [PATCH 04/15] ARM: dts: at91: sama5d27_som1_ek: set USER button as a wakeup source Claudiu Beznea
2017-10-09 16:09 ` [PATCH 05/15] ARM: dts: at91: sama5d27_som1_ek: add aliases for i2c Claudiu Beznea
2017-10-09 16:09 ` Claudiu Beznea [this message]
2017-10-09 16:09 ` [PATCH 07/15] ARM: dts: at91: sama5d27_som1_ek: remove not connected CAN0 Claudiu Beznea
2017-10-09 16:09 ` [PATCH 08/15] ARM: dts: at91: sama5d27_som1_ek: remove pull-up on SD/MMC lines Claudiu Beznea
2017-10-09 16:09 ` [PATCH 09/15] ARM: dts: at91: sama5d2_xplained: Add charger node of pmic Claudiu Beznea
2017-10-10 0:39 ` Yang, Wenyou
2017-10-10 10:09 ` m18063
2017-10-09 16:09 ` [PATCH 10/15] ARM: dts: at91: sama5d2_xplained: set PB_USER as wakeup source Claudiu Beznea
2017-10-09 16:09 ` [PATCH 11/15] ARM: dts: at91: sama5d2_xplained: add pinmuxing for pwm0 Claudiu Beznea
2017-10-09 16:09 ` [PATCH 12/15] ARM: dts: at91: sama5d2_xplained: remove pull-up on SD/MMC lines Claudiu Beznea
2017-10-09 16:09 ` [PATCH 13/15] ARM: dts: at91: at91sam9x25ek: add CAN1 interface Claudiu Beznea
2017-10-09 16:09 ` [PATCH 14/15] ARM: dts: at91: at91sam9x25ek: add pwm0 Claudiu Beznea
2017-10-09 16:09 ` [PATCH 15/15] ARM: dts: at91: at91sam9x5ek: use DMA for USART0 Claudiu Beznea
2017-10-10 9:30 ` [PATCH 00/14] at91 fixes and enhancements m18063
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1507565377-1545-7-git-send-email-claudiu.beznea@microchip.com \
--to=claudiu.beznea@microchip.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=nicolas.ferre@microchip.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®