Merge patch series "arm: dts: sc5xx: device tree updates and fixes"

Ozan Durgut <[email protected]> says:

This series introduces updates for Analog Devices SC5xx boards.

It cleans up device trees by renaming GPIO expanders and removing
incorrect SPI flash definitions from the common include file.

For the SC598, this series updates the EZLITE board to the latest
Revision E hardware. It also adds missing GPIO hogs and enables
additional commands for the EZKIT configuration.

Link: https://lore.kernel.org/r/[email protected]

10 files changed, 47 insertions, 22 deletions

diff --git a/arch/arm/dts/sc573-ezkit.dts b/arch/arm/dts/sc573-ezkit.dts
index a848d55be62..4a3d1ed5c56 100644
--- a/arch/arm/dts/sc573-ezkit.dts
+++ b/arch/arm/dts/sc573-ezkit.dts
@@ -14,7 +14,7 @@
 };
 
 &i2c0 {
-	gpio_expander1: mcp23017@21 {
+	gpio_expander0: mcp23017@21 {
 		compatible = "microchip,mcp23017";
 		reg = <0x21>;
 		gpio-controller;
@@ -118,7 +118,7 @@
 		};
 	};
 
-	gpio_expander2: mcp23017@22 {
+	gpio_expander1: mcp23017@22 {
 		compatible = "microchip,mcp23017";
 		reg = <0x22>;
 		gpio-controller;
diff --git a/arch/arm/dts/sc584-ezkit.dts b/arch/arm/dts/sc584-ezkit.dts
index e9f4e1da383..176faa50672 100644
--- a/arch/arm/dts/sc584-ezkit.dts
+++ b/arch/arm/dts/sc584-ezkit.dts
@@ -13,7 +13,7 @@
 };
 
 &i2c2 {
-	gpio_expander1: mcp23017@21 {
+	gpio_expander0: mcp23017@21 {
 		compatible = "microchip,mcp23017";
 		reg = <0x21>;
 		gpio-controller;
@@ -125,7 +125,7 @@
 		};
 	};
 
-	gpio_expander2: mcp23017@22 {
+	gpio_expander1: mcp23017@22 {
 		compatible = "microchip,mcp23017";
 		reg = <0x22>;
 		gpio-controller;
diff --git a/arch/arm/dts/sc589-ezkit.dts b/arch/arm/dts/sc589-ezkit.dts
index 39ac7a4fd6e..d8eb5b6f8fe 100644
--- a/arch/arm/dts/sc589-ezkit.dts
+++ b/arch/arm/dts/sc589-ezkit.dts
@@ -17,7 +17,7 @@
 &i2c0 {
 	#address-cells = <1>;
 	#size-cells = <0>;
-	gpio_expander1: mcp23017@21 {
+	gpio_expander0: mcp23017@21 {
 		compatible = "microchip,mcp23017";
 		reg = <0x21>;
 		gpio-controller;
@@ -145,7 +145,7 @@
 		};
 	};
 
-	gpio_expander2: mcp23017@22 {
+	gpio_expander1: mcp23017@22 {
 		compatible = "microchip,mcp23017";
 		reg = <0x22>;
 		gpio-controller;
diff --git a/arch/arm/dts/sc594-som-ezkit.dts b/arch/arm/dts/sc594-som-ezkit.dts
index c8a01fba527..afc16df577a 100644
--- a/arch/arm/dts/sc594-som-ezkit.dts
+++ b/arch/arm/dts/sc594-som-ezkit.dts
@@ -13,7 +13,7 @@
 };
 
 &i2c2 {
-	gpio_expander2: mcp23017@22 {
+	crr_gpio_expander: mcp23017@22 {
 		compatible = "microchip,mcp23017";
 		reg = <0x22>;
 		gpio-controller;
diff --git a/arch/arm/dts/sc594-som-ezlite.dts b/arch/arm/dts/sc594-som-ezlite.dts
index 970d3b1a377..ab6f94352fc 100644
--- a/arch/arm/dts/sc594-som-ezlite.dts
+++ b/arch/arm/dts/sc594-som-ezlite.dts
@@ -13,7 +13,7 @@
 };
 
 &i2c2 {
-	gpio_expander: adp5588@30 {
+	crr_gpio_expander: adp5588@30 {
 		compatible = "adi,adp5588";
 		reg = <0x30>;
 		gpio-controller;
diff --git a/arch/arm/dts/sc598-som-ezkit.dts b/arch/arm/dts/sc598-som-ezkit.dts
index 36ea66714cb..493d2010e32 100644
--- a/arch/arm/dts/sc598-som-ezkit.dts
+++ b/arch/arm/dts/sc598-som-ezkit.dts
@@ -13,7 +13,7 @@
 };
 
 &i2c2 {
-	gpio_expander2: mcp23017@22 {
+	crr_gpio_expander: mcp23017@22 {
 		compatible = "microchip,mcp23017";
 		reg = <0x22>;
 		gpio-controller;
diff --git a/arch/arm/dts/sc598-som-ezlite.dts b/arch/arm/dts/sc598-som-ezlite.dts
index 72d336a6673..40cabd1db0d 100644
--- a/arch/arm/dts/sc598-som-ezlite.dts
+++ b/arch/arm/dts/sc598-som-ezlite.dts
@@ -5,7 +5,7 @@
 
 /dts-v1/;
 
-#include "sc598-som-revD.dtsi"
+#include "sc598-som-revE.dtsi"
 
 / {
 	model = "ADI SC598-SOM-EZLITE";
@@ -13,7 +13,7 @@
 };
 
 &i2c2 {
-	gpio_expander: adp5588@30 {
+	crr_gpio_expander: adp5588@30 {
 		compatible = "adi,adp5588";
 		reg = <0x30>;
 		gpio-controller;
diff --git a/arch/arm/dts/sc598-som-revD.dtsi b/arch/arm/dts/sc598-som-revD.dtsi
index bf1ef88cb58..26e272966ff 100644
--- a/arch/arm/dts/sc598-som-revD.dtsi
+++ b/arch/arm/dts/sc598-som-revD.dtsi
@@ -55,6 +55,38 @@
 			line-name = "spi2flash-cs";
 			bootph-pre-ram;
 		};
+
+		uart0 {
+			gpio-hog;
+			gpios = <5 GPIO_ACTIVE_LOW>;
+			output-high;
+			line-name = "uart0-en";
+			bootph-pre-ram;
+		};
+
+		uart0-flow-en {
+			gpio-hog;
+			gpios = <6 GPIO_ACTIVE_LOW>;
+			output-low;
+			line-name = "uart0-flow-en";
+			bootph-pre-ram;
+		};
+
+		som-emmc {
+			gpio-hog;
+			gpios = <8 GPIO_ACTIVE_LOW>;
+			output-high;
+			line-name = "som-emmc-en";
+			bootph-pre-ram;
+		};
+
+		crr-sdcard {
+			gpio-hog;
+			gpios = <9 GPIO_ACTIVE_LOW>;
+			output-low;
+			line-name = "crr-sdcard-en";
+			bootph-pre-ram;
+		};
 	};
 };
 
diff --git a/arch/arm/dts/sc5xx.dtsi b/arch/arm/dts/sc5xx.dtsi
index 483661d0b1b..9d346ae62e0 100644
--- a/arch/arm/dts/sc5xx.dtsi
+++ b/arch/arm/dts/sc5xx.dtsi
@@ -154,17 +154,6 @@
 			clock-names = "spi";
 			status = "okay";
 			bootph-pre-ram;
-
-			flash1: is25lp512@1 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "jedec,spi-nor", "is25lp512";
-				reg = <1>;
-				spi-tx-bus-width = <4>;
-				spi-rx-bus-width = <4>;
-				spi-max-frequency = <10000000>;
-				bootph-pre-ram;
-			};
 		};
 
 		wdog: watchdog@31008000 {
diff --git a/configs/sc598-som-ezkit-spl_defconfig b/configs/sc598-som-ezkit-spl_defconfig
index 567faadefa9..498af6d2052 100644
--- a/configs/sc598-som-ezkit-spl_defconfig
+++ b/configs/sc598-som-ezkit-spl_defconfig
@@ -109,3 +109,7 @@ CONFIG_USB_DWC2=y
 CONFIG_USB_STORAGE=y
 # CONFIG_SPL_CRC8 is not set
 # CONFIG_TOOLS_MKEFICAPSULE is not set
+CONFIG_CMD_FAT=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_WGET=y