Skip to contentSkip to conversation

at91: serial: add usart3 in separat dtsi

PATCH New Jiri Prchal 3 participants 3 messages Oct 16, 2013

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

PATCH 1/1 at91: serial: add usart3 in separat dtsi

This patch adds usart3 for AT91SAM9G25 and X25.
Based on sugescion of Nicolas Ferre it's in separated dtsi file included in both g25 and x25 files.

Signed-off-by <[email protected]>
---
 arch/arm/boot/dts/at91sam9g25.dtsi       |    1 +
 arch/arm/boot/dts/at91sam9x25.dtsi       |    1 +
 arch/arm/boot/dts/at91sam9x5-usart3.dtsi |   27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 arch/arm/boot/dts/at91sam9x5-usart3.dtsi
arch/arm/boot/dts/at91sam9g25.dtsi +1 -0
index b4ec6fe..980e9a7 100644
@@ -7,6 +7,7 @@
  */
 
 #include "at91sam9x5.dtsi"
+#include "at91sam9x5-usart3.dtsi"
 
 / {
 	model = "Atmel AT91SAM9G25 SoC";
arch/arm/boot/dts/at91sam9x25.dtsi +1 -0
index 49e94ab..3ac17ee 100644
@@ -7,6 +7,7 @@
  */
 
 #include "at91sam9x5.dtsi"
+#include "at91sam9x5-usart3.dtsi"
 
 / {
 	model = "Atmel AT91SAM9X25 SoC";
arch/arm/boot/dts/at91sam9x5-usart3.dtsi new file +27 -0
new file mode 100644
index 0000000..f5b6979
@@ -0,0 +1,27 @@
+/*
+ * at91sam9x5-usert3.dtsi - Device Tree Include file for AT91SAM9G25 or 
+ * AT91SAM9X25 SoC
+ *
+ * Copyright (C) 2013 Jiri Prchal <[email protected]>
+ *
+ * Licensed under GPLv2.
+ */
+
+/ {
+	aliases {
+		serial4 = &usart3;
+	};
+
+	ahb {
+		apb {
+			usart3: serial at f8028000 {
+				compatible = "atmel,at91sam9260-usart";
+				reg = <0xf8028000 0x200>;
+				interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_usart3>;
+				status = "disabled";
+			};
+		};
+	};
+};
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 at91: serial: add usart3 in separat dtsi

Hello Jiri,

Quoted 42 lines · Jiri Prchal

This patch adds usart3 for AT91SAM9G25 and X25.
Based on sugescion of Nicolas Ferre it's in separated dtsi file included in both g25 and x25 files.

Signed-off-by <[email protected]>
---
  arch/arm/boot/dts/at91sam9g25.dtsi       |    1 +
  arch/arm/boot/dts/at91sam9x25.dtsi       |    1 +
  arch/arm/boot/dts/at91sam9x5-usart3.dtsi |   27 +++++++++++++++++++++++++++
  3 files changed, 29 insertions(+)

create mode 100644 arch/arm/boot/dts/at91sam9x5-usart3.dtsi

arch/arm/boot/dts/at91sam9g25.dtsi +1 -0
index b4ec6fe..980e9a7 100644
@@ -7,6 +7,7 @@
   */
 
  #include "at91sam9x5.dtsi"
+#include "at91sam9x5-usart3.dtsi"
 
  / {
  	model = "Atmel AT91SAM9G25 SoC";
arch/arm/boot/dts/at91sam9x25.dtsi +1 -0
index 49e94ab..3ac17ee 100644
@@ -7,6 +7,7 @@
   */
 
  #include "at91sam9x5.dtsi"
+#include "at91sam9x5-usart3.dtsi"
 
  / {
  	model = "Atmel AT91SAM9X25 SoC";
arch/arm/boot/dts/at91sam9x5-usart3.dtsi new file +0 -0
new file mode 100644
index 0000000..f5b6979

arch/arm/boot/dts/at91sam9x5-usart3.dtsi line 2

Quoted 2 lines
arch/arm/boot/dts/at91sam9x5-usart3.dtsi new file +2 -0
@@ -0,0 +1,27 @@
+/*
+ * at91sam9x5-usert3.dtsi - Device Tree Include file for AT91SAM9G25 or

typo here : at91sam9x5-usert3.dtsi -> at91sam9x5-usart3.dts.

I won't complain about this, but some at91 dts(i) names already use "_" instead of "-":
- at91sam9g20ek_common.dtsi
- at91sam9g20ek_2mmc.dts

I personally prefer the hypen version, but I think it's up to Atmel maintainers to decide which name sould be used.

Quoted 15 lines
arch/arm/boot/dts/at91sam9x5-usart3.dtsi new file +15 -0
+ * AT91SAM9X25 SoC
+ *
+ * Copyright (C) 2013 Jiri Prchal <[email protected]>
+ *
+ * Licensed under GPLv2.
+ */
+
+/ {
+	aliases {
+		serial4 = &usart3;
+	};
+
+	ahb {
+		apb {
+			usart3: serial at f8028000 {

arch/arm/boot/dts/at91sam9x5-usart3.dtsi line 27

Quoted 10 lines
arch/arm/boot/dts/at91sam9x5-usart3.dtsi new file +10 -0
+				compatible = "atmel,at91sam9260-usart";
+				reg = <0xf8028000 0x200>;
+				interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_usart3>;
+				status = "disabled";
+			};
+		};
+	};
+};

I would have moved the the pinctrl definition in this file too. In fact, that's what I did in my patch (
https://lkml.org/lkml/2013/8/7/252).

Anyway, I'm not sure, but I think Nicolas already applied my patch in his at91-3.13-cleanup branch.

If this is not the case, I'll be pleased to add my Acked-by after you've added the pinctrl definitions
and fixed the the typo.

Best Regards,

Boris

#2 lore raw

PATCH 1/1 at91: serial: add usart3 in separat dtsi

On 16/10/2013 14:14, boris brezillon :

Quoted 86 lines

Hello Jiri,

Quoted 42 lines · Jiri Prchal

This patch adds usart3 for AT91SAM9G25 and X25.
Based on sugescion of Nicolas Ferre it's in separated dtsi file included in both g25 and x25 files.

Signed-off-by <[email protected]>
---
   arch/arm/boot/dts/at91sam9g25.dtsi       |    1 +
   arch/arm/boot/dts/at91sam9x25.dtsi       |    1 +
   arch/arm/boot/dts/at91sam9x5-usart3.dtsi |   27 +++++++++++++++++++++++++++
   3 files changed, 29 insertions(+)

create mode 100644 arch/arm/boot/dts/at91sam9x5-usart3.dtsi

arch/arm/boot/dts/at91sam9g25.dtsi +1 -0
index b4ec6fe..980e9a7 100644
@@ -7,6 +7,7 @@
    */
 
   #include "at91sam9x5.dtsi"
+#include "at91sam9x5-usart3.dtsi"
 
   / {
   	model = "Atmel AT91SAM9G25 SoC";
arch/arm/boot/dts/at91sam9x25.dtsi +1 -0
index 49e94ab..3ac17ee 100644
@@ -7,6 +7,7 @@
    */
 
   #include "at91sam9x5.dtsi"
+#include "at91sam9x5-usart3.dtsi"
 
   / {
   	model = "Atmel AT91SAM9X25 SoC";
arch/arm/boot/dts/at91sam9x5-usart3.dtsi new file +0 -0
new file mode 100644
index 0000000..f5b6979

arch/arm/boot/dts/at91sam9x5-usart3.dtsi line 2

Quoted 2 lines
arch/arm/boot/dts/at91sam9x5-usart3.dtsi new file +2 -0
@@ -0,0 +1,27 @@
+/*
+ * at91sam9x5-usert3.dtsi - Device Tree Include file for AT91SAM9G25 or

typo here : at91sam9x5-usert3.dtsi -> at91sam9x5-usart3.dts.

I won't complain about this, but some at91 dts(i) names already use "_" instead of "-":
- at91sam9g20ek_common.dtsi
- at91sam9g20ek_2mmc.dts

I personally prefer the hypen version, but I think it's up to Atmel maintainers to decide which name sould be used.

Quoted 15 lines
arch/arm/boot/dts/at91sam9x5-usart3.dtsi new file +15 -0
+ * AT91SAM9X25 SoC
+ *
+ * Copyright (C) 2013 Jiri Prchal <[email protected]>
+ *
+ * Licensed under GPLv2.
+ */
+
+/ {
+	aliases {
+		serial4 = &usart3;
+	};
+
+	ahb {
+		apb {
+			usart3: serial at f8028000 {

arch/arm/boot/dts/at91sam9x5-usart3.dtsi line 27

Quoted 10 lines
arch/arm/boot/dts/at91sam9x5-usart3.dtsi new file +10 -0
+				compatible = "atmel,at91sam9260-usart";
+				reg = <0xf8028000 0x200>;
+				interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_usart3>;
+				status = "disabled";
+			};
+		};
+	};
+};

I would have moved the the pinctrl definition in this file too. In fact, that's what I did in my patch (
https://lkml.org/lkml/2013/8/7/252).

Quoted 2 lines

Anyway, I'm not sure, but I think Nicolas already applied my patch in his at91-3.13-cleanup branch.

Absolutely, this feature is already included in Boris' patch series. You can have a look here:

https://github.com/at91linux/linux-at91/commit/d195608acc78db293468694ed5225a39e440429d

Quoted 3 lines

If this is not the case, I'll be pleased to add my Acked-by after you've added the pinctrl definitions
and fixed the the typo.

No need to resend it.

Best regards,

Signature · 1 line
Nicolas Ferre