diff mbox

[RFC,v2] ARM: at91: add support for Cosino board series by HCE Engineering

Message ID 20131113174624.GC10964@enneenne.com (mailing list archive)
State New, archived
Headers show

Commit Message

Rodolfo Giometti Nov. 13, 2013, 5:46 p.m. UTC
On Wed, Nov 13, 2013 at 06:34:30PM +0100, Nicolas Ferre wrote:
> From: Rodolfo Giometti <giometti@linux.it>
> 
> This patch adds the Cosino at91sam9g35 based CPU module and the
> Cosino Mega 2560 extension board.
> 
> Web site: http://www.cosino.it
> 
> Signed-off-by: Rodolfo Giometti <giometti@linux.it>
> [nicolas.ferre@atmel.com: adapted to newer kernel, modified commit message]
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Rodolfo,
> 
> Can you please review this adaptation of your previous patch to newer kernel.
> I hope to integrate your board in upcoming 3.14.
> 
> You will see that I addressed the remarks by Jean-Christophe and Russell (about
> commit message). Please tell me if it is good on your side.

I did some changes... attached are the correct patches.

Here the changelog V1 -> V2:

[Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>]
* prefix "at91-" added
* atmel,mux-mask stuff removed
* "compatible" stuff is now on the same line for easy-grep(TM)
* lcd binding dropped

Ciao,

Rodolfo

Comments

Nicolas Ferre Nov. 14, 2013, 8:56 a.m. UTC | #1
On 13/11/2013 18:46, Rodolfo Giometti :
> On Wed, Nov 13, 2013 at 06:34:30PM +0100, Nicolas Ferre wrote:
>> From: Rodolfo Giometti <giometti@linux.it>
>>
>> This patch adds the Cosino at91sam9g35 based CPU module and the
>> Cosino Mega 2560 extension board.
>>
>> Web site: http://www.cosino.it
>>
>> Signed-off-by: Rodolfo Giometti <giometti@linux.it>
>> [nicolas.ferre@atmel.com: adapted to newer kernel, modified commit message]
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>> ---
>> Rodolfo,
>>
>> Can you please review this adaptation of your previous patch to newer kernel.
>> I hope to integrate your board in upcoming 3.14.
>>
>> You will see that I addressed the remarks by Jean-Christophe and Russell (about
>> commit message). Please tell me if it is good on your side.
>
> I did some changes... attached are the correct patches.

Doing the diff between our patch I only seen a difference in nand binding:
nand-on-flash-bbt;
is present in my adaptation while it is not in yours but I do not think 
it is a problem to keep it.

> Here the changelog V1 -> V2:
>
> [Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>]
> * prefix "at91-" added
> * atmel,mux-mask stuff removed
> * "compatible" stuff is now on the same line for easy-grep(TM)
> * lcd binding dropped

Absolutely, I will add it to the commit log and integrate in the 
upcoming at91-3.14-dt branch.

Thanks for your quick feedback. Bye,
Rodolfo Giometti Nov. 14, 2013, 10:20 a.m. UTC | #2
On Thu, Nov 14, 2013 at 09:56:01AM +0100, Nicolas Ferre wrote:
> On 13/11/2013 18:46, Rodolfo Giometti :
> >On Wed, Nov 13, 2013 at 06:34:30PM +0100, Nicolas Ferre wrote:
> >>From: Rodolfo Giometti <giometti@linux.it>
> >>
> >>This patch adds the Cosino at91sam9g35 based CPU module and the
> >>Cosino Mega 2560 extension board.
> >>
> >>Web site: http://www.cosino.it
> >>
> >>Signed-off-by: Rodolfo Giometti <giometti@linux.it>
> >>[nicolas.ferre@atmel.com: adapted to newer kernel, modified commit message]
> >>Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> >>---
> >>Rodolfo,
> >>
> >>Can you please review this adaptation of your previous patch to newer kernel.
> >>I hope to integrate your board in upcoming 3.14.
> >>
> >>You will see that I addressed the remarks by Jean-Christophe and Russell (about
> >>commit message). Please tell me if it is good on your side.
> >
> >I did some changes... attached are the correct patches.
> 
> Doing the diff between our patch I only seen a difference in nand binding:
> nand-on-flash-bbt;
> is present in my adaptation while it is not in yours but I do not
> think it is a problem to keep it.

Well, I tested Cosino's NAND flash without such parameter... however
if you think it could not be a problem you can leave it.

> >Here the changelog V1 -> V2:
> >
> >[Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>]
> >* prefix "at91-" added
> >* atmel,mux-mask stuff removed
> >* "compatible" stuff is now on the same line for easy-grep(TM)
> >* lcd binding dropped
> 
> Absolutely, I will add it to the commit log and integrate in the
> upcoming at91-3.14-dt branch.
> 
> Thanks for your quick feedback. Bye,

Great! Thanks. :)

Ciao,

Rodolfo
diff mbox

Patch

From fa3e3c198b67d96983ce0605944a184e0195140a Mon Sep 17 00:00:00 2001
From: Rodolfo Giometti <giometti@linux.it>
Date: Wed, 6 Nov 2013 16:31:50 +0100
Subject: [PATCH 1/1] arm mach-at91: add support for Cosino board series by HCE
 Engineering

This patch adds the Cosino at91sam9g35 based CPU module and the
Cosino Mega 2560 extension board.

Web site: http://www.cosino.it

Signed-off-by: Rodolfo Giometti <giometti@linux.it>
[nicolas.ferre@atmel.com: adapted to newer kernel, modified commit message]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 arch/arm/boot/dts/Makefile                 |   1 +
 arch/arm/boot/dts/at91-cosino.dtsi         | 121 +++++++++++++++++++++++++++++
 arch/arm/boot/dts/at91-cosino_mega2560.dts |  85 ++++++++++++++++++++
 3 files changed, 207 insertions(+)
 create mode 100644 arch/arm/boot/dts/at91-cosino.dtsi
 create mode 100644 arch/arm/boot/dts/at91-cosino_mega2560.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ab6a9f5..b05f5e6 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -35,6 +35,7 @@  dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb
 dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
 dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
 dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
+dtb-$(CONFIG_ARCH_AT91) += at91-cosino_mega2560.dtb
 # sama5d3
 dtb-$(CONFIG_ARCH_AT91)	+= sama5d31ek.dtb
 dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb
diff --git a/arch/arm/boot/dts/at91-cosino.dtsi b/arch/arm/boot/dts/at91-cosino.dtsi
new file mode 100644
index 0000000..43beca9
--- /dev/null
+++ b/arch/arm/boot/dts/at91-cosino.dtsi
@@ -0,0 +1,121 @@ 
+/*
+ * cosino.dtsi - Device Tree file for Cosino core module
+ *
+ * Copyright (C) 2013 - Rodolfo Giometti <giometti@linux.it>
+ *			HCE Engineering
+ *
+ * Derived from at91sam9x5ek.dtsi by:
+ *	Copyright (C) 2012 Atmel,
+ *	2012 Nicolas Ferre <nicolas.ferre@atmel.com>
+ *
+ * Licensed under GPLv2 or later.
+ */
+
+#include "at91sam9g35.dtsi"
+
+/ {
+	model = "HCE Cosino core module";
+	compatible = "hce,cosino", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
+
+	chosen {
+		bootargs = "console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait";
+	};
+
+	memory {
+		reg = <0x20000000 0x8000000>;
+	};
+
+	clocks {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		main_clock: clock@0 {
+			compatible = "atmel,osc", "fixed-clock";
+			clock-frequency = <12000000>;
+		};
+	};
+
+	ahb {
+		apb {
+			mmc0: mmc@f0008000 {
+				pinctrl-0 = <
+					&pinctrl_board_mmc0
+					&pinctrl_mmc0_slot0_clk_cmd_dat0
+					&pinctrl_mmc0_slot0_dat1_3>;
+				status = "okay";
+				slot@0 {
+					reg = <0>;
+					bus-width = <4>;
+					cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
+				};
+			};
+
+			dbgu: serial@fffff200 {
+				status = "okay";
+			};
+
+			usart0: serial@f801c000 {
+				status = "okay";
+			};
+
+			i2c0: i2c@f8010000 {
+				status = "okay";
+			};
+
+			adc0: adc@f804c000 {
+				atmel,adc-clock-rate = <1000000>;
+				atmel,adc-ts-wires = <4>;
+				atmel,adc-ts-pressure-threshold = <10000>;
+				status = "okay";
+			};
+
+			pinctrl@fffff400 {
+				mmc0 {
+					pinctrl_board_mmc0: mmc0-board {
+						atmel,pins =
+							<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;	/* PD15 gpio CD pin pull up and deglitch */
+					};
+				};
+			};
+
+			watchdog@fffffe40 {
+				status = "okay";
+			};
+		};
+
+		nand0: nand@40000000 {
+			nand-bus-width = <8>;
+			nand-ecc-mode = "hw";
+			atmel,has-pmecc;	/* Enable PMECC */
+			atmel,pmecc-cap = <4>;
+			atmel,pmecc-sector-size = <512>;
+			status = "okay";
+
+			at91bootstrap@0 {
+				label = "at91bootstrap";
+				reg = <0x0 0x40000>;
+			};
+
+			uboot@40000 {
+				label = "u-boot";
+				reg = <0x40000 0x80000>;
+			};
+
+			ubootenv@c0000 {
+				label = "U-Boot Env";
+				reg = <0xc0000 0x140000>;
+			};
+
+			kernel@200000 {
+				label = "kernel";
+				reg = <0x200000 0x600000>;
+			};
+
+			rootfs@800000 {
+				label = "rootfs";
+				reg = <0x800000 0x0f800000>;
+			};
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/at91-cosino_mega2560.dts b/arch/arm/boot/dts/at91-cosino_mega2560.dts
new file mode 100644
index 0000000..7727be5
--- /dev/null
+++ b/arch/arm/boot/dts/at91-cosino_mega2560.dts
@@ -0,0 +1,85 @@ 
+/*
+ * cosino_mega2560.dts - Device Tree file for Cosino board with Mega 2560
+ *			 extension
+ *
+ * Copyright (C) 2013 - Rodolfo Giometti <giometti@linux.it>
+ *			HCE Engineering
+ *
+ * Derived from at91sam9g35ek.dts by:
+ * 	Copyright (C) 2012 Atmel,
+ *      2012 Nicolas Ferre <nicolas.ferre@atmel.com>
+ *
+ * Licensed under GPLv2 or later.
+ */
+
+/dts-v1/;
+#include "at91-cosino.dtsi"
+
+/ {
+	model = "HCE Cosino Mega 2560";
+	compatible = "hce,cosino_mega2560", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
+
+	ahb {
+		apb {
+			macb0: ethernet@f802c000 {
+				phy-mode = "rmii";
+				status = "okay";
+			};
+
+			adc0: adc@f804c000 {
+				atmel,adc-clock-rate = <1000000>;
+				atmel,adc-ts-wires = <4>;
+				atmel,adc-ts-pressure-threshold = <10000>;
+				status = "okay";
+			};
+
+
+			tsadcc: tsadcc@f804c000 {
+				status = "okay";
+			};
+
+			rtc@fffffeb0 {
+				status = "okay";
+			};
+
+			usart1: serial@f8020000 {
+			       status = "okay";
+			};
+
+			usart2: serial@f8024000 {
+			       status = "okay";
+			};
+
+			usb2: gadget@f803c000 {
+				atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
+				status = "okay";
+			};
+
+			mmc1: mmc@f000c000 {
+				pinctrl-0 = <
+					&pinctrl_board_mmc0
+					&pinctrl_mmc1_slot0_clk_cmd_dat0
+					&pinctrl_mmc1_slot0_dat1_3>;
+				status = "okay";
+				slot@0 {
+					reg = <0>;
+					bus-width = <4>;
+					non-removable;
+				};
+			};
+		};
+
+		usb0: ohci@00600000 {
+			status = "okay";
+			num-ports = <3>;
+			atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */
+					   &pioD 19 GPIO_ACTIVE_LOW
+					   &pioD 20 GPIO_ACTIVE_LOW
+					  >;
+		};
+
+		usb1: ehci@00700000 {
+			status = "okay";
+		};
+	};
+};
-- 
1.8.1.2