From 275943dba49f717be01e41a6eede8b3b3b3d41c2 Mon Sep 17 00:00:00 2001
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Date: Tue, 20 Sep 2022 10:32:47 +0200
Subject: [PATCH 1/2] ARM: dts: at91: sam9x60ek: fix indentation for pinctrl
 sub-nodes

The indentation went far on the right due to an extra tab for
each pinctrl sub-nodes.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
---
 arch/arm/dts/sam9x60ek.dts | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/dts/sam9x60ek.dts b/arch/arm/dts/sam9x60ek.dts
index 54c694bd78..eb44868a3e 100644
--- a/arch/arm/dts/sam9x60ek.dts
+++ b/arch/arm/dts/sam9x60ek.dts
@@ -80,26 +80,26 @@
 			};
 
 			pinctrl {
-					pinctrl_qspi: qspi {
-						atmel,pins =
-							<AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE
-							 AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE
-							 AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
-							 AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
-							 AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
-							 AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
-					};
+				pinctrl_qspi: qspi {
+					atmel,pins =
+						<AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE
+						 AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE
+						 AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+						 AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+						 AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+						 AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
+				};
 
-					pinctrl_flx0: flx0_default {
-						atmel,pins =
-							<AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE
-							 AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;
-					};
+				pinctrl_flx0: flx0_default {
+					atmel,pins =
+						<AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE
+						 AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+				};
 
-					pinctrl_onewire_tm_default: onewire_tm_default {
-						atmel,pins =
-							<AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
-					};
+				pinctrl_onewire_tm_default: onewire_tm_default {
+					atmel,pins =
+						<AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
+				};
 
 			};
 		};

From 17e21d7cbfe7eff0b1916176f7a11492948122dc Mon Sep 17 00:00:00 2001
From: Mihai Sain <mihai.sain@microchip.com>
Date: Mon, 17 Oct 2022 11:37:11 +0300
Subject: [PATCH 2/2] ARM: dts: at91: sama7g5: fix signal name of pin PB2

The signal name of pin PB2 with function F is FLEXCOM11_IO1
as it is defined in the datasheet.

Fixes: 558378a4cd ("ARM: mach-at91: add support for new SoC sama7g5")
Signed-off-by: Mihai Sain <mihai.sain@microchip.com>
---
 arch/arm/dts/sama7g5-pinfunc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/dts/sama7g5-pinfunc.h b/arch/arm/dts/sama7g5-pinfunc.h
index 38d6962d00..b77185f8ed 100644
--- a/arch/arm/dts/sama7g5-pinfunc.h
+++ b/arch/arm/dts/sama7g5-pinfunc.h
@@ -261,7 +261,7 @@
 #define PIN_PB2__FLEXCOM6_IO0		PINMUX_PIN(PIN_PB2, 2, 1)
 #define PIN_PB2__ADTRG			PINMUX_PIN(PIN_PB2, 3, 1)
 #define PIN_PB2__A20			PINMUX_PIN(PIN_PB2, 4, 1)
-#define PIN_PB2__FLEXCOM11_IO0		PINMUX_PIN(PIN_PB2, 6, 3)
+#define PIN_PB2__FLEXCOM11_IO1		PINMUX_PIN(PIN_PB2, 6, 3)
 #define PIN_PB3				35
 #define PIN_PB3__GPIO			PINMUX_PIN(PIN_PB3, 0, 0)
 #define PIN_PB3__RF1			PINMUX_PIN(PIN_PB3, 1, 1)