[PATCH 05/15] ARM: at91: dts: extend, don't create anew, pinctrl node

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The pinctrl device is also on the APB in the base device tree. The
barebox device tree wrongly creates a new one top-level under /.
Move it to the correct location, so the upstream node is extended.

Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
 arch/arm/dts/at91sam9263ek.dts | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/arm/dts/at91sam9263ek.dts b/arch/arm/dts/at91sam9263ek.dts
index 7fe283ced768..37f895d6ca73 100644
--- a/arch/arm/dts/at91sam9263ek.dts
+++ b/arch/arm/dts/at91sam9263ek.dts
@@ -24,15 +24,14 @@
 						wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>;
 					};
 			};
-		};
-	};
 
-
-	pinctrl@fffff200 {
-		pinctrl_board_mmc1: mmc1-board {
-			atmel,pins =
-				<AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH	/* PE18 gpio CD pin pull up and deglitch */
-				 AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;		/* PE19 gpio WP pin pull up */
+			pinctrl@fffff200 {
+				pinctrl_board_mmc1: mmc1-board {
+					atmel,pins =
+						<AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH	/* PE18 gpio CD pin pull up and deglitch */
+						 AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;		/* PE19 gpio WP pin pull up */
+				};
+			};
 		};
 	};
 };
-- 
2.27.0


_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox



[Index of Archives]     [Linux Embedded]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux