Merge branch 'at91-5.10-trunk/dt' into linux-5.10-at91

linux4sam · Jul 23, 2021 · 3a36d91 · 3a36d91
2 parents a9b8853 + 01b3590
commit 3a36d91
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -248,6 +248,14 @@
 							<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
 							 AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
 					};
+
+					pinctrl_d2_led: d2_led_default {
+						atmel,pins = <AT91_PIOE 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+					};
+
+					pinctrl_d3_led: d3_led_default {
+						atmel,pins = <AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+					};
 				};
 			};
 		};
@@ -362,6 +370,9 @@
 
 	leds {
 		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_d2_led &pinctrl_d3_led>;
+		status = "okay";
 
 		d2 {
 			label = "d2";
@@ -370,7 +381,7 @@
 		};
 
 		d3 {
-			label = "d3";
+			label = "d3"; /* Conflict with EBI CS0, USART2 CTS. */
 			gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
 		};
 	};