[PATCH 0/6] AT91 DT for 3.20 #1

[PATCH 0/6] AT91 DT for 3.20 #1

[Alexandre Belloni]

This series enables RTC on the at91sam9n12 and at91rm9200.
It also adds nodes for the SRAM availabe on at91 SoCs.

Finally it adds a dtsi for the at91sam9xe and uses it for the ethernut5 dts.

Alexandre Belloni (6):
  ARM: at91/dt: at91sam9n12: Add RTC node
  ARM: at91/dt: rm9200: add RTC node
  ARM: at91/dt: at91rm9200ek: enable RTC
  ARM: at91/dt: add SRAM nodes
  ARM: at91/dt: Add a dtsi for at91sam9xe
  ARM: at91/dt: ethernut5: use at91sam9xe.dtsi

 .../devicetree/bindings/arm/atmel-at91.txt         |  1 +
 arch/arm/boot/dts/at91rm9200.dtsi                  | 12 +++++
 arch/arm/boot/dts/at91rm9200ek.dts                 |  4 ++
 arch/arm/boot/dts/at91sam9260.dtsi                 |  5 ++
 arch/arm/boot/dts/at91sam9261.dtsi                 |  5 ++
 arch/arm/boot/dts/at91sam9263.dtsi                 | 10 ++++
 arch/arm/boot/dts/at91sam9g20.dtsi                 |  9 ++++
 arch/arm/boot/dts/at91sam9g45.dtsi                 |  7 ++-
 arch/arm/boot/dts/at91sam9n12.dtsi                 | 12 +++++
 arch/arm/boot/dts/at91sam9rl.dtsi                  |  5 ++
 arch/arm/boot/dts/at91sam9x5.dtsi                  |  5 ++
 arch/arm/boot/dts/at91sam9xe.dtsi                  | 60 ++++++++++++++++++++++
 arch/arm/boot/dts/ethernut5.dts                    |  2 +-
 arch/arm/boot/dts/sama5d3.dtsi                     |  5 ++
 arch/arm/boot/dts/sama5d4.dtsi                     |  5 ++
 15 files changed, 144 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/boot/dts/at91sam9xe.dtsi

-- 
2.1.0

[PATCH 1/6] ARM: at91/dt: at91sam9n12: Add RTC node

[Alexandre Belloni]

Add node for the RTC available on the at91sam9n12.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/boot/dts/at91sam9n12.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 68eb9aded164..a7218bcc6a25 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -893,6 +893,13 @@
 				status = "disabled";
 			};
 
+			rtc at fffffeb0 {
+				compatible = "atmel,at91sam9x5-rtc";
+				reg = <0xfffffeb0 0x40>;
+				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+				status = "disabled";
+			};
+
 			pwm0: pwm at f8034000 {
 				compatible = "atmel,at91sam9rl-pwm";
 				reg = <0xf8034000 0x300>;
-- 
2.1.0

[PATCH v2 1/6] ARM: at91/dt: at91sam9n12: Add RTC node

[Alexandre Belloni]

Add node for the RTC available on the at91sam9n12.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---

Nicolas,

following our discussion, I forgot to change that one, I'm removing the 9x5
errata for the RTC on sam9n12.


 arch/arm/boot/dts/at91sam9n12.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 68eb9aded164..a7218bcc6a25 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -893,6 +893,13 @@
 				status = "disabled";
 			};
 
+			rtc at fffffeb0 {
+				compatible = "atmel,at91rm9200-rtc";
+				reg = <0xfffffeb0 0x40>;
+				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+				status = "disabled";
+			};
+
 			pwm0: pwm at f8034000 {
 				compatible = "atmel,at91sam9rl-pwm";
 				reg = <0xf8034000 0x300>;
-- 
2.1.0

[PATCH 2/6] ARM: at91/dt: rm9200: add RTC node

[Alexandre Belloni]

Add a node for the RTC available on at91rm9200.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/boot/dts/at91rm9200.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 6c97d4af61ee..f449a864b81e 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -356,6 +356,13 @@
 				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
 			};
 
+			rtc: rtc at fffffe00 {
+				compatible = "atmel,at91rm9200-rtc";
+				reg = <0xfffffe00 0x40>;
+				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+				status = "disabled";
+			};
+
 			tcb0: timer at fffa0000 {
 				compatible = "atmel,at91rm9200-tcb";
 				reg = <0xfffa0000 0x100>;
-- 
2.1.0

[PATCH 3/6] ARM: at91/dt: at91rm9200ek: enable RTC

[Alexandre Belloni]

Enable the RTC on the at91rm9200ek.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/boot/dts/at91rm9200ek.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts
index 43eb779dd6f6..2a5d21247d7e 100644
--- a/arch/arm/boot/dts/at91rm9200ek.dts
+++ b/arch/arm/boot/dts/at91rm9200ek.dts
@@ -77,6 +77,10 @@
 			dbgu: serial at fffff200 {
 				status = "okay";
 			};
+
+			rtc: rtc at fffffe00 {
+				status = "okay";
+			};
 		};
 
 		usb0: ohci at 00300000 {
-- 
2.1.0

[PATCH 4/6] ARM: at91/dt: add SRAM nodes

[Alexandre Belloni]

Add nodes for the SRAM available on atmel SoCs

Remove leftover TODOs in the sam9g45 file

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/boot/dts/at91rm9200.dtsi  |  5 +++++
 arch/arm/boot/dts/at91sam9260.dtsi |  5 +++++
 arch/arm/boot/dts/at91sam9261.dtsi |  5 +++++
 arch/arm/boot/dts/at91sam9263.dtsi | 10 ++++++++++
 arch/arm/boot/dts/at91sam9g20.dtsi |  9 +++++++++
 arch/arm/boot/dts/at91sam9g45.dtsi |  7 +++++--
 arch/arm/boot/dts/at91sam9n12.dtsi |  5 +++++
 arch/arm/boot/dts/at91sam9rl.dtsi  |  5 +++++
 arch/arm/boot/dts/at91sam9x5.dtsi  |  5 +++++
 arch/arm/boot/dts/sama5d3.dtsi     |  5 +++++
 arch/arm/boot/dts/sama5d4.dtsi     |  5 +++++
 11 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index f449a864b81e..21c2b504f977 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -66,6 +66,11 @@
 		};
 	};
 
+	sram: sram at 00200000 {
+		compatible = "mmio-sram";
+		reg = <0x00200000 0x4000>;
+	};
+
 	ahb {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index dd1313cbc314..6f52cb2eacd8 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -69,6 +69,11 @@
 		};
 	};
 
+	sram0: sram at 002ff000 {
+		compatible = "mmio-sram";
+		reg = <0x00200000 0x2000>;
+	};
+
 	ahb {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index cdb9ed612109..e247b0b5fdab 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -60,6 +60,11 @@
 		};
 	};
 
+	sram: sram at 00300000 {
+		compatible = "mmio-sram";
+		reg = <0x00300000 0x28000>;
+	};
+
 	ahb {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index ef8a70c27439..8a210d5033b1 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -62,6 +62,16 @@
 		};
 	};
 
+	sram0: sram at 00300000 {
+		compatible = "mmio-sram";
+		reg = <0x00300000 0x14000>;
+	};
+
+	sram1: sram at 00500000 {
+		compatible = "mmio-sram";
+		reg = <0x00300000 0x4000>;
+	};
+
 	ahb {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index a50ee587a7af..9012fe9d7758 100644
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -16,6 +16,15 @@
 		reg = <0x20000000 0x08000000>;
 	};
 
+	sram0: sram at 002ff000 {
+		status = "disabled";
+	};
+
+	sram1: sram at 002fc000 {
+		compatible = "mmio-sram";
+		reg = <0x00200000 0x8000>;
+	};
+
 	ahb {
 		apb {
 			i2c0: i2c at fffac000 {
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 2a8da8a884b4..ee80aa9c0759 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -74,6 +74,11 @@
 		};
 	};
 
+	sram: sram at 00300000 {
+		compatible = "mmio-sram";
+		reg = <0x00300000 0x10000>;
+	};
+
 	ahb {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -1287,7 +1292,6 @@
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00700000 0x100000>;
 			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
-			//TODO
 			clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
 			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
 			status = "disabled";
@@ -1297,7 +1301,6 @@
 			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
 			reg = <0x00800000 0x100000>;
 			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
-			//TODO
 			clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
 			clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";
 			status = "disabled";
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index a7218bcc6a25..6ea7ee3b8ff8 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -64,6 +64,11 @@
 		};
 	};
 
+	sram: sram at 00300000 {
+		compatible = "mmio-sram";
+		reg = <0x00300000 0x8000>;
+	};
+
 	ahb {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 72424371413e..c055da2f151f 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -70,6 +70,11 @@
 		};
 	};
 
+	sram: sram at 00300000 {
+		compatible = "mmio-sram";
+		reg = <0x00300000 0x4000>;
+	};
+
 	ahb {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index bbb3ba65165f..818dabdd8c0e 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -72,6 +72,11 @@
 		};
 	};
 
+	sram: sram at 00300000 {
+		compatible = "mmio-sram";
+		reg = <0x00300000 0x8000>;
+	};
+
 	ahb {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index d701ddda0e00..e17614fe58a9 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -78,6 +78,11 @@
 		};
 	};
 
+	sram: sram at 00300000 {
+		compatible = "mmio-sram";
+		reg = <0x00300000 0x20000>;
+	};
+
 	ahb {
 		compatible = "simple-bus";
 		#address-cells = <1>;
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 0a2477fe5525..1b4fe4e19721 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -103,6 +103,11 @@
 		};
 	};
 
+	ns_sram: sram at 00210000 {
+		compatible = "mmio-sram";
+		reg = <0x00210000 0x10000>;
+	};
+
 	ahb {
 		compatible = "simple-bus";
 		#address-cells = <1>;
-- 
2.1.0

[PATCH 4/6] ARM: at91/dt: add SRAM nodes

[Bo Shen]

Hi Alexandre,

On 01/13/2015 03:01 AM, Alexandre Belloni wrote:
> Add nodes for the SRAM available on atmel SoCs
>
> Remove leftover TODOs in the sam9g45 file
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
>   arch/arm/boot/dts/at91rm9200.dtsi  |  5 +++++
>   arch/arm/boot/dts/at91sam9260.dtsi |  5 +++++
>   arch/arm/boot/dts/at91sam9261.dtsi |  5 +++++
>   arch/arm/boot/dts/at91sam9263.dtsi | 10 ++++++++++
>   arch/arm/boot/dts/at91sam9g20.dtsi |  9 +++++++++
>   arch/arm/boot/dts/at91sam9g45.dtsi |  7 +++++--
>   arch/arm/boot/dts/at91sam9n12.dtsi |  5 +++++
>   arch/arm/boot/dts/at91sam9rl.dtsi  |  5 +++++
>   arch/arm/boot/dts/at91sam9x5.dtsi  |  5 +++++
>   arch/arm/boot/dts/sama5d3.dtsi     |  5 +++++
>   arch/arm/boot/dts/sama5d4.dtsi     |  5 +++++
>   11 files changed, 64 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
> index f449a864b81e..21c2b504f977 100644
> --- a/arch/arm/boot/dts/at91rm9200.dtsi
> +++ b/arch/arm/boot/dts/at91rm9200.dtsi
> @@ -66,6 +66,11 @@
>   		};
>   	};
>
> +	sram: sram at 00200000 {
> +		compatible = "mmio-sram";
> +		reg = <0x00200000 0x4000>;
> +	};
> +
>   	ahb {
>   		compatible = "simple-bus";
>   		#address-cells = <1>;
> diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
> index dd1313cbc314..6f52cb2eacd8 100644
> --- a/arch/arm/boot/dts/at91sam9260.dtsi
> +++ b/arch/arm/boot/dts/at91sam9260.dtsi
> @@ -69,6 +69,11 @@
>   		};
>   	};
>
> +	sram0: sram at 002ff000 {

Why here is 002ff000, while not 00200000?

> +		compatible = "mmio-sram";
> +		reg = <0x00200000 0x2000>;
> +	};
> +
>   	ahb {
>   		compatible = "simple-bus";
>   		#address-cells = <1>;
> diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
> index cdb9ed612109..e247b0b5fdab 100644
> --- a/arch/arm/boot/dts/at91sam9261.dtsi
> +++ b/arch/arm/boot/dts/at91sam9261.dtsi
> @@ -60,6 +60,11 @@
>   		};
>   	};
>
> +	sram: sram at 00300000 {
> +		compatible = "mmio-sram";
> +		reg = <0x00300000 0x28000>;
> +	};
> +
>   	ahb {
>   		compatible = "simple-bus";
>   		#address-cells = <1>;
> diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
> index ef8a70c27439..8a210d5033b1 100644
> --- a/arch/arm/boot/dts/at91sam9263.dtsi
> +++ b/arch/arm/boot/dts/at91sam9263.dtsi
> @@ -62,6 +62,16 @@
>   		};
>   	};
>
> +	sram0: sram at 00300000 {
> +		compatible = "mmio-sram";
> +		reg = <0x00300000 0x14000>;
> +	};
> +
> +	sram1: sram at 00500000 {
> +		compatible = "mmio-sram";
> +		reg = <0x00300000 0x4000>;
> +	};
> +
>   	ahb {
>   		compatible = "simple-bus";
>   		#address-cells = <1>;
> diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
> index a50ee587a7af..9012fe9d7758 100644
> --- a/arch/arm/boot/dts/at91sam9g20.dtsi
> +++ b/arch/arm/boot/dts/at91sam9g20.dtsi
> @@ -16,6 +16,15 @@
>   		reg = <0x20000000 0x08000000>;
>   	};
>
> +	sram0: sram at 002ff000 {

Why here is 002ff000, while not 00200000?

> +		status = "disabled";

Btw, why it needs set to disabled.

> +	};
> +
> +	sram1: sram at 002fc000 {

Why here is 002fc000, while not 00300000? And length is on 0x4000.

> +		compatible = "mmio-sram";
> +		reg = <0x00200000 0x8000>;
> +	};
> +
>   	ahb {
>   		apb {
>   			i2c0: i2c at fffac000 {
> diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
> index 2a8da8a884b4..ee80aa9c0759 100644
> --- a/arch/arm/boot/dts/at91sam9g45.dtsi
> +++ b/arch/arm/boot/dts/at91sam9g45.dtsi
> @@ -74,6 +74,11 @@
>   		};
>   	};
>
> +	sram: sram at 00300000 {
> +		compatible = "mmio-sram";
> +		reg = <0x00300000 0x10000>;
> +	};
> +
>   	ahb {
>   		compatible = "simple-bus";
>   		#address-cells = <1>;
> @@ -1287,7 +1292,6 @@
>   			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
>   			reg = <0x00700000 0x100000>;
>   			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
> -			//TODO
>   			clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
>   			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
>   			status = "disabled";
> @@ -1297,7 +1301,6 @@
>   			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
>   			reg = <0x00800000 0x100000>;
>   			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
> -			//TODO
>   			clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
>   			clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";
>   			status = "disabled";
> diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
> index a7218bcc6a25..6ea7ee3b8ff8 100644
> --- a/arch/arm/boot/dts/at91sam9n12.dtsi
> +++ b/arch/arm/boot/dts/at91sam9n12.dtsi
> @@ -64,6 +64,11 @@
>   		};
>   	};
>
> +	sram: sram at 00300000 {
> +		compatible = "mmio-sram";
> +		reg = <0x00300000 0x8000>;
> +	};
> +
>   	ahb {
>   		compatible = "simple-bus";
>   		#address-cells = <1>;
> diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
> index 72424371413e..c055da2f151f 100644
> --- a/arch/arm/boot/dts/at91sam9rl.dtsi
> +++ b/arch/arm/boot/dts/at91sam9rl.dtsi
> @@ -70,6 +70,11 @@
>   		};
>   	};
>
> +	sram: sram at 00300000 {
> +		compatible = "mmio-sram";
> +		reg = <0x00300000 0x4000>;
> +	};
> +
>   	ahb {
>   		compatible = "simple-bus";
>   		#address-cells = <1>;
> diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
> index bbb3ba65165f..818dabdd8c0e 100644
> --- a/arch/arm/boot/dts/at91sam9x5.dtsi
> +++ b/arch/arm/boot/dts/at91sam9x5.dtsi
> @@ -72,6 +72,11 @@
>   		};
>   	};
>
> +	sram: sram at 00300000 {
> +		compatible = "mmio-sram";
> +		reg = <0x00300000 0x8000>;
> +	};
> +
>   	ahb {
>   		compatible = "simple-bus";
>   		#address-cells = <1>;
> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
> index d701ddda0e00..e17614fe58a9 100644
> --- a/arch/arm/boot/dts/sama5d3.dtsi
> +++ b/arch/arm/boot/dts/sama5d3.dtsi
> @@ -78,6 +78,11 @@
>   		};
>   	};
>
> +	sram: sram at 00300000 {
> +		compatible = "mmio-sram";
> +		reg = <0x00300000 0x20000>;
> +	};
> +
>   	ahb {
>   		compatible = "simple-bus";
>   		#address-cells = <1>;
> diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
> index 0a2477fe5525..1b4fe4e19721 100644
> --- a/arch/arm/boot/dts/sama5d4.dtsi
> +++ b/arch/arm/boot/dts/sama5d4.dtsi
> @@ -103,6 +103,11 @@
>   		};
>   	};
>
> +	ns_sram: sram at 00210000 {
> +		compatible = "mmio-sram";
> +		reg = <0x00210000 0x10000>;
> +	};
> +
>   	ahb {
>   		compatible = "simple-bus";
>   		#address-cells = <1>;
>

Best Regards,
Bo Shen

[PATCH 4/6] ARM: at91/dt: add SRAM nodes

[Alexandre Belloni]

On 13/01/2015 at 09:37:48 +0800, Bo Shen wrote :
> Hi Alexandre,
> 
> On 01/13/2015 03:01 AM, Alexandre Belloni wrote:
> >
> >+	sram0: sram at 002ff000 {
> 
> Why here is 002ff000, while not 00200000?
> 
> >+		compatible = "mmio-sram";
> >+		reg = <0x00200000 0x2000>;
> >+	};
> >+

I'll correct that one. I followed what was done before. The sam9260 has
two banks, one at 0x00200000, and the other one at 0x00300000. Thanks to
address mirroring on the range, we can declare that as one contiguous
range of sram, starting at 0x002ff000.


> >  	ahb {
> >  		compatible = "simple-bus";
> >  		#address-cells = <1>;
> >diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
> >index cdb9ed612109..e247b0b5fdab 100644
> >--- a/arch/arm/boot/dts/at91sam9261.dtsi
> >+++ b/arch/arm/boot/dts/at91sam9261.dtsi
> >@@ -60,6 +60,11 @@
> >  		};
> >  	};
> >
> >+	sram: sram at 00300000 {
> >+		compatible = "mmio-sram";
> >+		reg = <0x00300000 0x28000>;
> >+	};
> >+
> >  	ahb {
> >  		compatible = "simple-bus";
> >  		#address-cells = <1>;
> >diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
> >index ef8a70c27439..8a210d5033b1 100644
> >--- a/arch/arm/boot/dts/at91sam9263.dtsi
> >+++ b/arch/arm/boot/dts/at91sam9263.dtsi
> >@@ -62,6 +62,16 @@
> >  		};
> >  	};
> >
> >+	sram0: sram at 00300000 {
> >+		compatible = "mmio-sram";
> >+		reg = <0x00300000 0x14000>;
> >+	};
> >+
> >+	sram1: sram at 00500000 {
> >+		compatible = "mmio-sram";
> >+		reg = <0x00300000 0x4000>;
> >+	};
> >+
> >  	ahb {
> >  		compatible = "simple-bus";
> >  		#address-cells = <1>;
> >diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
> >index a50ee587a7af..9012fe9d7758 100644
> >--- a/arch/arm/boot/dts/at91sam9g20.dtsi
> >+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
> >@@ -16,6 +16,15 @@
> >  		reg = <0x20000000 0x08000000>;
> >  	};
> >
> >+	sram0: sram at 002ff000 {
> 
> Why here is 002ff000, while not 00200000?
> 
> >+		status = "disabled";
> 
> Btw, why it needs set to disabled.
> 
> >+	};
> >+
> >+	sram1: sram at 002fc000 {
> 
> Why here is 002fc000, while not 00300000? And length is on 0x4000.
> 

The same here, because we use mirroring, we have to disable the one that
is coming from at91sam9260.dtsi and then declare another one. I'll
correct the addresses in the reg properties. I was first declaring two
banks but we chose to switch back to only one range.

> >+		compatible = "mmio-sram";
> >+		reg = <0x00200000 0x8000>;
> >+	};
> >+

Thanks for the review.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[PATCH 5/6] ARM: at91/dt: Add a dtsi for at91sam9xe

[Alexandre Belloni]

at91sam9xe is slightly different from at91sam9260, in particular it has a
different SRAM size and location.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 .../devicetree/bindings/arm/atmel-at91.txt         |  1 +
 arch/arm/boot/dts/at91sam9xe.dtsi                  | 60 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 arch/arm/boot/dts/at91sam9xe.dtsi

diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt
index 571fc76c6edb..ad319f84f560 100644
--- a/Documentation/devicetree/bindings/arm/atmel-at91.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt
@@ -24,6 +24,7 @@ compatible: must be one of:
     o "atmel,at91sam9g45"
     o "atmel,at91sam9n12"
     o "atmel,at91sam9rl"
+    o "atmel,at91sam9xe"
  * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific
    SoC family:
     o "atmel,sama5d3" shall be extended with the specific SoC compatible:
diff --git a/arch/arm/boot/dts/at91sam9xe.dtsi b/arch/arm/boot/dts/at91sam9xe.dtsi
new file mode 100644
index 000000000000..0278f63b2daf
--- /dev/null
+++ b/arch/arm/boot/dts/at91sam9xe.dtsi
@@ -0,0 +1,60 @@
+/*
+ * at91sam9xe.dtsi - Device Tree Include file for AT91SAM9XE family SoC
+ *
+ *  Copyright (C) 2015 Atmel,
+ *                2015 Alexandre Belloni <alexandre.Belloni@free-electrons.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "at91sam9260.dtsi"
+
+/ {
+	model = "Atmel AT91SAM9XE family SoC";
+	compatible = "atmel,at91sam9xe", "atmel,at91sam9260";
+
+	sram0: sram at 002ff000 {
+		status = "disabled";
+	};
+
+	sram1: sram at 00300000 {
+		compatible = "mmio-sram";
+		reg = <0x00300000 0x4000>;
+	};
+};
-- 
2.1.0

[PATCH 6/6] ARM: at91/dt: ethernut5: use at91sam9xe.dtsi

[Alexandre Belloni]

The ethernut5 is actually based on an at91sam9xe, use the correct dts include.

Cc: Martin Reimann <martin.reimann@egnite.de>
Cc: Tim Schendekehl <tim.schendekehl@egnite.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/boot/dts/ethernut5.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/ethernut5.dts b/arch/arm/boot/dts/ethernut5.dts
index 8f941c2db7c6..243044343ee8 100644
--- a/arch/arm/boot/dts/ethernut5.dts
+++ b/arch/arm/boot/dts/ethernut5.dts
@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 /dts-v1/;
-#include "at91sam9260.dtsi"
+#include "at91sam9xe.dtsi"
 
 / {
 	model = "Ethernut 5";
-- 
2.1.0

[PATCH 0/6] AT91 DT for 3.20 #1

[Boris Brezillon]

On Mon, 12 Jan 2015 20:01:51 +0100
Alexandre Belloni <alexandre.belloni@free-electrons.com> wrote:

> This series enables RTC on the at91sam9n12 and at91rm9200.
> It also adds nodes for the SRAM availabe on at91 SoCs.
> 
> Finally it adds a dtsi for the at91sam9xe and uses it for the ethernut5 dts.

To the whole series:

Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>

> 
> Alexandre Belloni (6):
>   ARM: at91/dt: at91sam9n12: Add RTC node
>   ARM: at91/dt: rm9200: add RTC node
>   ARM: at91/dt: at91rm9200ek: enable RTC
>   ARM: at91/dt: add SRAM nodes
>   ARM: at91/dt: Add a dtsi for at91sam9xe
>   ARM: at91/dt: ethernut5: use at91sam9xe.dtsi
> 
>  .../devicetree/bindings/arm/atmel-at91.txt         |  1 +
>  arch/arm/boot/dts/at91rm9200.dtsi                  | 12 +++++
>  arch/arm/boot/dts/at91rm9200ek.dts                 |  4 ++
>  arch/arm/boot/dts/at91sam9260.dtsi                 |  5 ++
>  arch/arm/boot/dts/at91sam9261.dtsi                 |  5 ++
>  arch/arm/boot/dts/at91sam9263.dtsi                 | 10 ++++
>  arch/arm/boot/dts/at91sam9g20.dtsi                 |  9 ++++
>  arch/arm/boot/dts/at91sam9g45.dtsi                 |  7 ++-
>  arch/arm/boot/dts/at91sam9n12.dtsi                 | 12 +++++
>  arch/arm/boot/dts/at91sam9rl.dtsi                  |  5 ++
>  arch/arm/boot/dts/at91sam9x5.dtsi                  |  5 ++
>  arch/arm/boot/dts/at91sam9xe.dtsi                  | 60 ++++++++++++++++++++++
>  arch/arm/boot/dts/ethernut5.dts                    |  2 +-
>  arch/arm/boot/dts/sama5d3.dtsi                     |  5 ++
>  arch/arm/boot/dts/sama5d4.dtsi                     |  5 ++
>  15 files changed, 144 insertions(+), 3 deletions(-)
>  create mode 100644 arch/arm/boot/dts/at91sam9xe.dtsi
> 



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com