Skip to contentSkip to conversation

arm64: freescale: Use "spi" as name for SPI controllers

PATCH New Thierry Reding 2 participants 3 messages Sep 24, 2018 – Sep 25, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 arm64: freescale: Use "spi" as name for SPI controllers

From: Thierry Reding <[email protected]>

Recent versions of DTC contain additional checks for SPI busses and warn about certain common mistakes, such as when an SPI controller has a name other than "spi".

---
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +++---
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 4 ++--
 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +1 -1
index 68ac78c4564d..5da732f82fa0 100644
@@ -337,7 +337,7 @@
 			status = "disabled";
 		};
 
-		dspi: dspi at 2100000 {
+		dspi: spi at 2100000 {
 			compatible = "fsl,ls1012a-dspi", "fsl,ls1021a-v1.0-dspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +3 -3
index 6cc4c87614b6..3fed504b5381 100644
@@ -284,7 +284,7 @@
 			interrupts = <0 43 0x4>;
 		};
 
-		qspi: quadspi at 1550000 {
+		qspi: spi at 1550000 {
 			compatible = "fsl,ls1043a-qspi", "fsl,ls1021a-qspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -382,7 +382,7 @@
 			ranges = <0x0 0x5 0x00000000 0x8000000>;
 		};
 
-		dspi0: dspi at 2100000 {
+		dspi0: spi at 2100000 {
 			compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -395,7 +395,7 @@
 			status = "disabled";
 		};
 
-		dspi1: dspi at 2110000 {
+		dspi1: spi at 2110000 {
 			compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +2 -2
index 3a2a14a8e187..51cbd50012d6 100644
@@ -202,7 +202,7 @@
 			interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
 		};
 
-		qspi: quadspi at 1550000 {
+		qspi: spi at 1550000 {
 			compatible = "fsl,ls1021a-qspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -361,7 +361,7 @@
 			#thermal-sensor-cells = <1>;
 		};
 
-		dspi: dspi at 2100000 {
+		dspi: spi at 2100000 {
 			compatible = "fsl,ls1021a-v1.0-dspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +2 -2
index 547a86ec7cd2..e45607419692 100644
@@ -485,7 +485,7 @@
 			mmu-masters = <&fsl_mc 0x300 0>;
 		};
 
-		dspi: dspi at 2100000 {
+		dspi: spi at 2100000 {
 			status = "disabled";
 			compatible = "fsl,ls2080a-dspi", "fsl,ls2085a-dspi";
 			#address-cells = <1>;
@@ -611,7 +611,7 @@
 				  3 0 0x5 0x20000000 0x00010000>;
 		};
 
-		qspi: quadspi at 20c0000 {
+		qspi: spi at 20c0000 {
 			status = "disabled";
 			compatible = "fsl,ls2080a-qspi", "fsl,ls1021a-qspi";
 			#address-cells = <1>;
Signature · 1 line
2.19.0
#1 lore raw

PATCH 2/2 arm64: freescale: Fix EEPROM unit addresses

From: Thierry Reding <[email protected]>

These unit addresses have always been wrong, but DTC only recently started complaining about it.

---
 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts +2 -2
index 440e111651d5..a59b48203688 100644
@@ -57,12 +57,12 @@
 		reg = <0x4c>;
 	};
 
-	eeprom at 56 {
+	eeprom at 52 {
 		compatible = "atmel,24c512";
 		reg = <0x52>;
 	};
 
-	eeprom at 57 {
+	eeprom at 53 {
 		compatible = "atmel,24c512";
 		reg = <0x53>;
 	};
Signature · 1 line
2.19.0
#2 lore raw

PATCH 1/2 arm64: freescale: Use "spi" as name for SPI controllers

In reply to Thierry Reding
Quoted 9 lines

-----Original Message-----
From: Thierry Reding <[email protected]>
Sent: Monday, September 24, 2018 4:40 AM
To: Shawn Guo <[email protected]>; Leo Li <[email protected]>
Cc: linux-arm-kernel at lists.infradead.org
Subject: [PATCH 1/2] arm64: freescale: Use "spi" as name for SPI controllers

Quoted 5 lines

From: Thierry Reding <[email protected]>

Recent versions of DTC contain additional checks for SPI busses and warn about certain common mistakes, such as when an SPI controller has a name other than "spi".

Thanks. There is another patch pending for this.
https://patchwork.kernel.org/patch/10599953/

Quoted 103 lines
---
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +-
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +++---
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 4 ++--
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +1 -1
index 68ac78c4564d..5da732f82fa0 100644
@@ -337,7 +337,7 @@
 			status = "disabled";
 		};
 
-		dspi: dspi at 2100000 {
+		dspi: spi at 2100000 {
 			compatible = "fsl,ls1012a-dspi", "fsl,ls1021a-v1.0-dspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +3 -3
index 6cc4c87614b6..3fed504b5381 100644
@@ -284,7 +284,7 @@
 			interrupts = <0 43 0x4>;
 		};
 
-		qspi: quadspi at 1550000 {
+		qspi: spi at 1550000 {
 			compatible = "fsl,ls1043a-qspi", "fsl,ls1021a-qspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -382,7 +382,7 @@
 			ranges = <0x0 0x5 0x00000000 0x8000000>;
 		};
 
-		dspi0: dspi at 2100000 {
+		dspi0: spi at 2100000 {
 			compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -395,7 +395,7 @@
 			status = "disabled";
 		};
 
-		dspi1: dspi at 2110000 {
+		dspi1: spi at 2110000 {
 			compatible = "fsl,ls1043a-dspi", "fsl,ls1021a-v1.0-dspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +2 -2
index 3a2a14a8e187..51cbd50012d6 100644
@@ -202,7 +202,7 @@
 			interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
 		};
 
-		qspi: quadspi at 1550000 {
+		qspi: spi at 1550000 {
 			compatible = "fsl,ls1021a-qspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -361,7 +361,7 @@
 			#thermal-sensor-cells = <1>;
 		};
 
-		dspi: dspi at 2100000 {
+		dspi: spi at 2100000 {
 			compatible = "fsl,ls1021a-v1.0-dspi";
 			#address-cells = <1>;
 			#size-cells = <0>;
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +2 -3
index 547a86ec7cd2..e45607419692 100644
@@ -485,7 +485,7 @@
 			mmu-masters = <&fsl_mc 0x300 0>;
 		};
 
-		dspi: dspi at 2100000 {
+		dspi: spi at 2100000 {
 			status = "disabled";
 			compatible = "fsl,ls2080a-dspi", "fsl,ls2085a-dspi";
 			#address-cells = <1>;
@@ -611,7 +611,7 @@
 				  3 0 0x5 0x20000000 0x00010000>;
 		};
 
-		qspi: quadspi at 20c0000 {
+		qspi: spi at 20c0000 {
 			status = "disabled";
 			compatible = "fsl,ls2080a-qspi", "fsl,ls1021a-qspi";
 			#address-cells = <1>;
--

2.19.0