diff mbox series

[v4,2/8] ARM: dts: at91: sam9x60: move flexcom definitions

Message ID	20230112110208.97946-3-durai.manickamkr@microchip.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Durai Manickam KR <durai.manickamkr@microchip.com> To: <Hari.PrasathGE@microchip.com>, <balamanikandan.gunasundar@microchip.com>, <manikandan.m@microchip.com>, <varshini.rajendran@microchip.com>, <dharma.b@microchip.com>, <nayabbasha.sayed@microchip.com>, <balakrishnan.s@microchip.com>, <claudiu.beznea@microchip.com>, <cristian.birsan@microchip.com>, <nicolas.ferre@microchip.com>, <krzysztof.kozlowski@linaro.org>, <alexandre.belloni@bootlin.com>, <davem@davemloft.net>, <arnd@arndb.de>, <olof@lixom.net>, <soc@kernel.org>, <devicetree@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>, <Kavyasree.Kotagiri@microchip.com>, <Horatiu.Vultur@microchip.com>, <robh+dt@kernel.org>, <andrew@lunn.ch>, <michael@walle.cc>, <jerry.ray@microchip.com> CC: Durai Manickam KR <durai.manickamkr@microchip.com> Subject: [PATCH v4 2/8] ARM: dts: at91: sam9x60: move flexcom definitions Date: Thu, 12 Jan 2023 16:32:02 +0530 Message-ID: <20230112110208.97946-3-durai.manickamkr@microchip.com> In-Reply-To: <20230112110208.97946-1-durai.manickamkr@microchip.com> References: <20230112110208.97946-1-durai.manickamkr@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: bulk
Series	Add support for sam9x60 curiosity board \| [v4,0/8] Add support for sam9x60 curiosity board [v4,1/8] ARM: dts: at91: sam9x60: Fix the label numbering for the flexcom functions [v4,2/8] ARM: dts: at91: sam9x60: move flexcom definitions [v4,3/8] ARM: dts: at91: sam9x60: fix spi4 node [v4,4/8] ARM: dts: at91: sam9x60: Specify the FIFO size for the Flexcom UART [v4,5/8] ARM: dts: at91: sam9x60: Add DMA bindings for the flexcom nodes [v4,6/8] ARM: dts: at91: sam9x60: Add missing flexcom definitions [v4,7/8] dt-bindings: arm: at91: Add info on sam9x60 curiosity [v4,8/8] ARM: dts: at91: sam9x60_curiosity: Add device tree for sam9x60 curiosity board

Commit Message

Durai Manickam KR Jan. 12, 2023, 11:02 a.m. UTC

  Move the flexcom definitions from board specific DTS file
to the SoC specific DTSI file for sam9x60ek.

Signed-off-by: Manikandan Muralidharan <manikandan.m@microchip.com>
Signed-off-by: Hari Prasath Gujulan Elango <Hari.PrasathGE@microchip.com>
[durai.manickamkr@microchip.com: Logical split-up of this patch]
Signed-off-by: Durai Manickam KR <durai.manickamkr@microchip.com>
---
 arch/arm/boot/dts/at91-sam9x60ek.dts | 33 +------------------
 arch/arm/boot/dts/sam9x60.dtsi       | 49 ++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 32 deletions(-)

Comments

Claudiu Beznea Jan. 16, 2023, 9:50 a.m. UTC | #1

On 12.01.2023 13:02, Durai Manickam KR wrote:
> Move the flexcom definitions from board specific DTS file
> to the SoC specific DTSI file for sam9x60ek.
> 
> Signed-off-by: Manikandan Muralidharan <manikandan.m@microchip.com>
> Signed-off-by: Hari Prasath Gujulan Elango <Hari.PrasathGE@microchip.com>
> [durai.manickamkr@microchip.com: Logical split-up of this patch]
> Signed-off-by: Durai Manickam KR <durai.manickamkr@microchip.com>

The From: field is from you and the 1st SoB is Manikandan. From and 1st SoB
should match. Can you check and resubmit. See this for more details:
https://www.kernel.org/doc/html/v6.1/process/submitting-patches.html#developer-s-certificate-of-origin-1-1

> ---
>  arch/arm/boot/dts/at91-sam9x60ek.dts | 33 +------------------
>  arch/arm/boot/dts/sam9x60.dtsi       | 49 ++++++++++++++++++++++++++++
>  2 files changed, 50 insertions(+), 32 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts
> index cf5d786531f2..4ff84633dd43 100644
> --- a/arch/arm/boot/dts/at91-sam9x60ek.dts
> +++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
> @@ -207,15 +207,10 @@ &flx0 {
>  	status = "okay";
>  
>  	i2c0: i2c@600 {
> -		compatible = "microchip,sam9x60-i2c";
> -		reg = <0x600 0x200>;
> -		interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&pinctrl_flx0_default>;
> -		atmel,fifo-size = <16>;
>  		i2c-analog-filter;
>  		i2c-digital-filter;
>  		i2c-digital-filter-width-ns = <35>;
> @@ -235,14 +230,8 @@ &flx4 {
>  	status = "disabled";
>  
>  	spi4: spi@400 {
> -		compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
> -		reg = <0x400 0x200>;
> -		interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
> -		clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
> -		clock-names = "spi_clk";
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&pinctrl_flx4_default>;
> -		atmel,fifo-size = <16>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
>  		status = "disabled";
> @@ -254,23 +243,8 @@ &flx5 {
>  	status = "okay";
>  
>  	uart5: serial@200 {
> -		compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";

The compatible list here is different from the one you inserted in dtsi. Is
there a reason? Is there a reason for this? If so, could you please specify
it in commit description.

> -		reg = <0x200 0x200>;
> -		atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
> -		interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
> -		dmas = <&dma0
> -			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
> -			 AT91_XDMAC_DT_PERID(10))>,
> -		       <&dma0
> -			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
> -			 AT91_XDMAC_DT_PERID(11))>;
> -		dma-names = "tx", "rx";
> -		clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
> -		clock-names = "usart";
> -		pinctrl-0 = <&pinctrl_flx5_default>;
>  		pinctrl-names = "default";
> -		atmel,use-dma-rx;
> -		atmel,use-dma-tx;
> +		pinctrl-0 = <&pinctrl_flx5_default>;
>  		status = "okay";
>  	};
>  };
> @@ -280,15 +254,10 @@ &flx6 {
>  	status = "okay";
>  
>  	i2c6: i2c@600 {
> -		compatible = "microchip,sam9x60-i2c";
> -		reg = <0x600 0x200>;
> -		interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -		clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&pinctrl_flx6_default>;
> -		atmel,fifo-size = <16>;
>  		i2c-analog-filter;
>  		i2c-digital-filter;
>  		i2c-digital-filter-width-ns = <35>;
> diff --git a/arch/arm/boot/dts/sam9x60.dtsi b/arch/arm/boot/dts/sam9x60.dtsi
> index 8f5477e307dd..74c90158801b 100644
> --- a/arch/arm/boot/dts/sam9x60.dtsi
> +++ b/arch/arm/boot/dts/sam9x60.dtsi
> @@ -170,6 +170,16 @@ flx4: flexcom@f0000000 {
>  				#size-cells = <1>;
>  				ranges = <0x0 0xf0000000 0x800>;
>  				status = "disabled";
> +
> +				spi4: spi@400 {
> +					compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
> +					reg = <0x400 0x200>;
> +					interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
> +					clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
> +					clock-names = "spi_clk";
> +					atmel,fifo-size = <16>;
> +					status = "disabled";
> +				};
>  			};
>  
>  			flx5: flexcom@f0004000 {
> @@ -180,6 +190,27 @@ flx5: flexcom@f0004000 {
>  				#size-cells = <1>;
>  				ranges = <0x0 0xf0004000 0x800>;
>  				status = "disabled";
> +
> +				uart5: serial@200 {
> +					compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
> +					reg = <0x200 0x200>;
> +					atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
> +					interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
> +					dmas = <&dma0
> +						(AT91_XDMAC_DT_MEM_IF(0) |
> +						 AT91_XDMAC_DT_PER_IF(1) |
> +						 AT91_XDMAC_DT_PERID(10))>,
> +						<&dma0
> +						(AT91_XDMAC_DT_MEM_IF(0) |
> +						 AT91_XDMAC_DT_PER_IF(1) |
> +						 AT91_XDMAC_DT_PERID(11))>;
> +					dma-names = "tx", "rx";
> +					clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
> +					clock-names = "usart";
> +					atmel,use-dma-rx;
> +					atmel,use-dma-tx;
> +					status = "disabled";
> +				};
>  			};
>  
>  			dma0: dma-controller@f0008000 {
> @@ -379,6 +410,15 @@ flx6: flexcom@f8010000 {
>  				#size-cells = <1>;
>  				ranges = <0x0 0xf8010000 0x800>;
>  				status = "disabled";
> +
> +				i2c6: i2c@600 {
> +					compatible = "microchip,sam9x60-i2c";
> +					reg = <0x600 0x200>;
> +					interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>;
> +					clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
> +					atmel,fifo-size = <16>;
> +					status = "disabled";
> +				};
>  			};
>  
>  			flx7: flexcom@f8014000 {
> @@ -409,6 +449,15 @@ flx0: flexcom@f801c000 {
>  				#size-cells = <1>;
>  				ranges = <0x0 0xf801c000 0x800>;
>  				status = "disabled";
> +
> +				i2c0: i2c@600 {
> +					compatible = "microchip,sam9x60-i2c";
> +					reg = <0x600 0x200>;
> +					interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
> +					clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
> +					atmel,fifo-size = <16>;
> +					status = "disabled";
> +				};
>  			};
>  
>  			flx1: flexcom@f8020000 {

diff mbox series

Patch

diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts
index cf5d786531f2..4ff84633dd43 100644
--- a/arch/arm/boot/dts/at91-sam9x60ek.dts
+++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
@@ -207,15 +207,10 @@  &flx0 {
 	status = "okay";
 
 	i2c0: i2c@600 {
-		compatible = "microchip,sam9x60-i2c";
-		reg = <0x600 0x200>;
-		interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_flx0_default>;
-		atmel,fifo-size = <16>;
 		i2c-analog-filter;
 		i2c-digital-filter;
 		i2c-digital-filter-width-ns = <35>;
@@ -235,14 +230,8 @@  &flx4 {
 	status = "disabled";
 
 	spi4: spi@400 {
-		compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
-		reg = <0x400 0x200>;
-		interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
-		clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
-		clock-names = "spi_clk";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_flx4_default>;
-		atmel,fifo-size = <16>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
@@ -254,23 +243,8 @@  &flx5 {
 	status = "okay";
 
 	uart5: serial@200 {
-		compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
-		reg = <0x200 0x200>;
-		atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
-		interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
-		dmas = <&dma0
-			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
-			 AT91_XDMAC_DT_PERID(10))>,
-		       <&dma0
-			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
-			 AT91_XDMAC_DT_PERID(11))>;
-		dma-names = "tx", "rx";
-		clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
-		clock-names = "usart";
-		pinctrl-0 = <&pinctrl_flx5_default>;
 		pinctrl-names = "default";
-		atmel,use-dma-rx;
-		atmel,use-dma-tx;
+		pinctrl-0 = <&pinctrl_flx5_default>;
 		status = "okay";
 	};
 };
@@ -280,15 +254,10 @@  &flx6 {
 	status = "okay";
 
 	i2c6: i2c@600 {
-		compatible = "microchip,sam9x60-i2c";
-		reg = <0x600 0x200>;
-		interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_flx6_default>;
-		atmel,fifo-size = <16>;
 		i2c-analog-filter;
 		i2c-digital-filter;
 		i2c-digital-filter-width-ns = <35>;
diff --git a/arch/arm/boot/dts/sam9x60.dtsi b/arch/arm/boot/dts/sam9x60.dtsi
index 8f5477e307dd..74c90158801b 100644
--- a/arch/arm/boot/dts/sam9x60.dtsi
+++ b/arch/arm/boot/dts/sam9x60.dtsi
@@ -170,6 +170,16 @@  flx4: flexcom@f0000000 {
 				#size-cells = <1>;
 				ranges = <0x0 0xf0000000 0x800>;
 				status = "disabled";
+
+				spi4: spi@400 {
+					compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
+					reg = <0x400 0x200>;
+					interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
+					clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
+					clock-names = "spi_clk";
+					atmel,fifo-size = <16>;
+					status = "disabled";
+				};
 			};
 
 			flx5: flexcom@f0004000 {
@@ -180,6 +190,27 @@  flx5: flexcom@f0004000 {
 				#size-cells = <1>;
 				ranges = <0x0 0xf0004000 0x800>;
 				status = "disabled";
+
+				uart5: serial@200 {
+					compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
+					reg = <0x200 0x200>;
+					atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
+					interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
+					dmas = <&dma0
+						(AT91_XDMAC_DT_MEM_IF(0) |
+						 AT91_XDMAC_DT_PER_IF(1) |
+						 AT91_XDMAC_DT_PERID(10))>,
+						<&dma0
+						(AT91_XDMAC_DT_MEM_IF(0) |
+						 AT91_XDMAC_DT_PER_IF(1) |
+						 AT91_XDMAC_DT_PERID(11))>;
+					dma-names = "tx", "rx";
+					clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
+					clock-names = "usart";
+					atmel,use-dma-rx;
+					atmel,use-dma-tx;
+					status = "disabled";
+				};
 			};
 
 			dma0: dma-controller@f0008000 {
@@ -379,6 +410,15 @@  flx6: flexcom@f8010000 {
 				#size-cells = <1>;
 				ranges = <0x0 0xf8010000 0x800>;
 				status = "disabled";
+
+				i2c6: i2c@600 {
+					compatible = "microchip,sam9x60-i2c";
+					reg = <0x600 0x200>;
+					interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>;
+					clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
+					atmel,fifo-size = <16>;
+					status = "disabled";
+				};
 			};
 
 			flx7: flexcom@f8014000 {
@@ -409,6 +449,15 @@  flx0: flexcom@f801c000 {
 				#size-cells = <1>;
 				ranges = <0x0 0xf801c000 0x800>;
 				status = "disabled";
+
+				i2c0: i2c@600 {
+					compatible = "microchip,sam9x60-i2c";
+					reg = <0x600 0x200>;
+					interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
+					clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
+					atmel,fifo-size = <16>;
+					status = "disabled";
+				};
 			};
 
 			flx1: flexcom@f8020000 {