Move the flexcom definitions to the SoC specifc DTSI file retaining only
the pinmux and desired functions in the board specific DTS file of
sam9x60ek.
Signed-off-by: Hari Prasath <[email protected]>
Signed-off-by: Manikandan M <[email protected]>
Signed-off-by: Durai Manickam KR <[email protected]>
---
arch/arm/boot/dts/at91-sam9x60ek.dts | 34 +-----------------
arch/arm/boot/dts/sam9x60.dtsi | 52 ++++++++++++++++++++++++++--
2 files changed, 51 insertions(+), 35 deletions(-)
diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts
index b9b7a235ef89..9d9e50c77794 100644
--- a/arch/arm/boot/dts/at91-sam9x60ek.dts
+++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
@@ -211,15 +211,10 @@
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>;
@@ -239,16 +234,8 @@
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";
};
};
@@ -258,22 +245,8 @@
status = "okay";
uart5: serial@200 {
- compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
- reg = <0x200 0x200>;
- 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";
};
};
@@ -283,15 +256,10 @@
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 d3f60f6a456d..f0e0dc20de1b 100644
--- a/arch/arm/boot/dts/sam9x60.dtsi
+++ b/arch/arm/boot/dts/sam9x60.dtsi
@@ -169,6 +169,16 @@
#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 {
@@ -179,6 +189,26 @@
#size-cells = <1>;
ranges = <0x0 0xf0004000 0x800>;
status = "disabled";
+
+ uart5: serial@200 {
+ compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
+ reg = <0x200 0x200>;
+ 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 {
@@ -378,6 +408,15 @@
#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 {
@@ -404,10 +443,19 @@
compatible = "atmel,sama5d2-flexcom";
reg = <0xf801c000 0x200>;
clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
- #address-cells = <1>;
- #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>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
+ atmel,fifo-size = <16>;
+ status = "disabled";
+ };
};
flx1: flexcom@f8020000 {
--
2.17.1
On 07.09.2022 12:20, Hari Prasath wrote:
> Move the flexcom definitions to the SoC specifc DTSI file retaining only
> the pinmux and desired functions in the board specific DTS file of
> sam9x60ek.
>
> Signed-off-by: Hari Prasath <[email protected]>
> Signed-off-by: Manikandan M <[email protected]>
> Signed-off-by: Durai Manickam KR <[email protected]>
> ---
> arch/arm/boot/dts/at91-sam9x60ek.dts | 34 +-----------------
> arch/arm/boot/dts/sam9x60.dtsi | 52 ++++++++++++++++++++++++++--
> 2 files changed, 51 insertions(+), 35 deletions(-)
>
> diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts
> index b9b7a235ef89..9d9e50c77794 100644
> --- a/arch/arm/boot/dts/at91-sam9x60ek.dts
> +++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
> @@ -211,15 +211,10 @@
> 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>;
> @@ -239,16 +234,8 @@
> 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>;
This is not moved it is deleted, it should go in a different patch.
> status = "disabled";
> };
> };
> @@ -258,22 +245,8 @@
> status = "okay";
>
> uart5: serial@200 {
> - compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
> - reg = <0x200 0x200>;
> - 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";
> };
> };
> @@ -283,15 +256,10 @@
> 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 d3f60f6a456d..f0e0dc20de1b 100644
> --- a/arch/arm/boot/dts/sam9x60.dtsi
> +++ b/arch/arm/boot/dts/sam9x60.dtsi
> @@ -169,6 +169,16 @@
> #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 {
> @@ -179,6 +189,26 @@
> #size-cells = <1>;
> ranges = <0x0 0xf0004000 0x800>;
> status = "disabled";
> +
> + uart5: serial@200 {
> + compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
> + reg = <0x200 0x200>;
> + 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 {
> @@ -378,6 +408,15 @@
> #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 {
> @@ -404,10 +443,19 @@
> compatible = "atmel,sama5d2-flexcom";
> reg = <0xf801c000 0x200>;
> clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
> - #address-cells = <1>;
> - #size-cells = <1>;
This should remain here.
> ranges = <0x0 0xf801c000 0x800>;
> status = "disabled";
> +
> + 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>;
> + atmel,fifo-size = <16>;
> + status = "disabled";
> + };
> };
>
> flx1: flexcom@f8020000 {