Merge tag 'linux-watchdog-4.17-rc1' of git://www.linux-watchdog.org/linux-watchdog

[mirror_ubuntu-eoan-kernel.git] / arch / arm / boot / dts / at91sam9263.dtsi

diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index f2405671e3bdcbc1d6c3364c7b73d4b936a569a6..87fb0660ab5d6790c44342276c1211bcc2f9422d 100644 (file)
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -437,8 +437,8 @@
                                usart0 {
                                        pinctrl_usart0: usart0-0 {
                                                atmel,pins =
-                                                       <AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA26 periph A with pullup */
-                                                        AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA27 periph A */
+                                                       <AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                        AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                        pinctrl_usart0_rts: usart0_rts-0 {
@@ -455,8 +455,8 @@
                                usart1 {
                                        pinctrl_usart1: usart1-0 {
                                                atmel,pins =
-                                                       <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD0 periph A with pullup */
-                                                        AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PD1 periph A */
+                                                       <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                        AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                        pinctrl_usart1_rts: usart1_rts-0 {
@@ -473,8 +473,8 @@
                                usart2 {
                                        pinctrl_usart2: usart2-0 {
                                                atmel,pins =
-                                                       <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD2 periph A with pullup */
-                                                        AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PD3 periph A */
+                                                       <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                        AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                        };
 
                                        pinctrl_usart2_rts: usart2_rts-0 {