From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Wed, 11 Feb 2015 16:49:02 +0000 (+0100)
Subject: ARM: at91/dt: sama5d3: add uart1 pinctrl definition
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3c309ab8fa896ba74959c8a0523aee6c25b3b80f;p=linux-beck.git

ARM: at91/dt: sama5d3: add uart1 pinctrl definition

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 1477e97df8f0..7de02f104004 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -784,6 +784,14 @@
 					};
 				};
 
+				uart1 {
+					pinctrl_uart1: uart1-0 {
+						atmel,pins =
+							<AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE	/* conflicts with TWD0, ISI_VSYNC */
+							 AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;	/* conflicts with TWCK0, ISI_HSYNC */
+					};
+				};
+
 				usart0 {
 					pinctrl_usart0: usart0-0 {
 						atmel,pins =