From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754416AbbCECRA (ORCPT ); Wed, 4 Mar 2015 21:17:00 -0500 Received: from nasmtp01.atmel.com ([192.199.1.245]:35537 "EHLO DVREDG01.corp.atmel.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754379AbbCECQ6 (ORCPT ); Wed, 4 Mar 2015 21:16:58 -0500 Message-ID: <54F7BC1E.3020808@atmel.com> Date: Thu, 5 Mar 2015 10:14:54 +0800 From: Josh Wu User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Nicolas Ferre CC: , Boris Brezillon , Alexandre Belloni , Bo Shen , "Rob Herring" , Pawel Moll , Mark Rutland , Ian Campbell , "Kumar Gala" , Russell King , "Andrew Victor" , Jean-Christophe Plagniol-Villard , , Subject: Re: [PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board References: <1425437508-30976-1-git-send-email-josh.wu@atmel.com> <1425437508-30976-2-git-send-email-josh.wu@atmel.com> <54F6E789.5080508@atmel.com> In-Reply-To: <54F6E789.5080508@atmel.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.168.5.13] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/4/2015 7:07 PM, Nicolas Ferre wrote: > Le 04/03/2015 03:51, Josh Wu a écrit : >> Add at91 sama5d4 xplained board support. >> >> Signed-off-by: Josh Wu >> --- >> >> Changes in v4: >> - Thanks to Bo Shen to find following leds issues: >> 1. the leds' label is changed in new xplained board. >> 2. as piod bank is disabled in sama5d4, that will whole led driver >> not work. So just disable the led which used piod. >> >> Changes in v3: >> - add phy0 child node under macb0 >> - rebase on top of linux next, re-formated the arch/arm/boot/dts/Makefile >> >> Changes in v2: >> - to be sorted by memory address, put the adc dt node after usart4. >> >> arch/arm/boot/dts/Makefile | 3 +- >> arch/arm/boot/dts/at91-sama5d4_xplained.dts | 239 ++++++++++++++++++++++++++++ >> 2 files changed, 241 insertions(+), 1 deletion(-) >> create mode 100644 arch/arm/boot/dts/at91-sama5d4_xplained.dts >> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >> index a1c776b..5c189a5 100644 >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> @@ -42,7 +42,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ >> sama5d34ek.dtb \ >> sama5d35ek.dtb \ >> sama5d36ek.dtb \ >> - at91-sama5d4ek.dtb >> + at91-sama5d4ek.dtb \ >> + at91-sama5d4_xplained.dtb >> dtb-$(CONFIG_ARCH_ATLAS6) += \ >> atlas6-evb.dtb >> dtb-$(CONFIG_ARCH_ATLAS7) += \ >> diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts >> new file mode 100644 >> index 0000000..af8f4f5 >> --- /dev/null >> +++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts >> @@ -0,0 +1,239 @@ >> +/* >> + * at91-sama5d4_xplained.dts - Device Tree file for SAMA5D4 Xplained board >> + * >> + * Copyright (C) 2015 Atmel, >> + * 2015 Josh Wu >> + * >> + * 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. >> + */ >> +/dts-v1/; >> +#include "sama5d4.dtsi" >> + >> +/ { >> + model = "Atmel SAMA5D4 Xplained"; >> + compatible = "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,sama5"; >> + >> + chosen { >> + bootargs = "console=ttyS0,115200 ignore_loglevel earlyprintk"; >> + }; >> + >> + memory { >> + reg = <0x20000000 0x20000000>; >> + }; >> + >> + clocks { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + ranges; >> + >> + main_clock: clock@0 { >> + compatible = "atmel,osc", "fixed-clock"; >> + clock-frequency = <12000000>; >> + }; >> + >> + slow_xtal { >> + clock-frequency = <32768>; >> + }; >> + >> + main_xtal { >> + clock-frequency = <12000000>; >> + }; >> + }; >> + >> + ahb { >> + apb { >> + spi0: spi@f8010000 { >> + cs-gpios = <&pioC 3 0>, <0>, <0>, <0>; >> + status = "okay"; >> + m25p80@0 { >> + compatible = "atmel,at25df321a"; >> + spi-max-frequency = <50000000>; >> + reg = <0>; >> + }; >> + }; >> + >> + macb0: ethernet@f8020000 { >> + phy-mode = "rmii"; >> + status = "okay"; >> + >> + phy0: ethernet-phy@1 { >> + interrupt-parent = <&pioE>; >> + interrupts = <1 IRQ_TYPE_EDGE_FALLING>; >> + reg = <1>; >> + }; >> + }; >> + >> + mmc1: mmc@fc000000 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>; >> + status = "okay"; >> + slot@0 { >> + reg = <0>; >> + bus-width = <4>; >> + cd-gpios = <&pioE 3 0>; >> + }; >> + }; >> + >> + usart3: serial@fc00c000 { >> + status = "okay"; >> + }; >> + >> + usart4: serial@fc010000 { >> + status = "okay"; >> + }; >> + >> + adc0: adc@fc034000 { >> + atmel,adc-vref = <3300>; >> + status = "okay"; >> + }; >> + >> + watchdog@fc068640 { >> + status = "okay"; >> + }; >> + >> + pinctrl@fc06a000 { >> + board { >> + pinctrl_mmc1_cd: mmc1_cd { >> + atmel,pins = >> + ; >> + }; >> + pinctrl_usba_vbus: usba_vbus { >> + atmel,pins = >> + ; >> + }; >> + pinctrl_key_gpio: key_gpio_0 { >> + atmel,pins = >> + ; /* PE13 gpio */ > Nit: useless comment which is wrong. I remove it. oh, my bad. > > > >> + }; >> + }; >> + }; >> + }; >> + >> + usb0: gadget@00400000 { >> + atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_usba_vbus>; >> + status = "okay"; >> + }; >> + >> + usb1: ohci@00500000 { >> + num-ports = <3>; >> + atmel,vbus-gpio = <0 >> + &pioE 11 GPIO_ACTIVE_HIGH >> + &pioE 14 GPIO_ACTIVE_HIGH >> + >; >> + status = "okay"; >> + }; >> + >> + usb2: ehci@00600000 { >> + status = "okay"; >> + }; >> + >> + nand0: nand@80000000 { >> + nand-bus-width = <8>; >> + nand-ecc-mode = "hw"; >> + nand-on-flash-bbt; >> + atmel,has-pmecc; >> + status = "okay"; >> + >> + at91bootstrap@0 { >> + label = "at91bootstrap"; >> + reg = <0x0 0x40000>; >> + }; >> + >> + bootloader@40000 { >> + label = "bootloader"; >> + reg = <0x40000 0x80000>; >> + }; >> + >> + bootloaderenv@c0000 { >> + label = "bootloader env"; >> + reg = <0xc0000 0xc0000>; >> + }; >> + >> + dtb@180000 { >> + label = "device tree"; >> + reg = <0x180000 0x80000>; >> + }; >> + >> + kernel@200000 { >> + label = "kernel"; >> + reg = <0x200000 0x600000>; >> + }; >> + >> + rootfs@800000 { >> + label = "rootfs"; >> + reg = <0x800000 0x0f800000>; >> + }; >> + }; >> + }; >> + >> + gpio_keys { >> + compatible = "gpio-keys"; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_key_gpio>; >> + >> + pb_user1 { >> + label = "pb_user1"; >> + gpios = <&pioE 8 GPIO_ACTIVE_HIGH>; >> + linux,code = <0x100>; >> + gpio-key,wakeup; >> + }; >> + }; >> + >> + leds { >> + compatible = "gpio-leds"; >> + status = "okay"; >> + >> + d8 { >> + label = "d8"; >> + gpios = <&pioD 30 GPIO_ACTIVE_HIGH>; >> + status = "disabled"; >> + }; >> + >> + d10 { >> + label = "d10"; >> + gpios = <&pioE 15 GPIO_ACTIVE_LOW>; >> + linux,default-trigger = "heartbeat"; >> + }; >> + }; >> +}; >> > Otherwise, it's okay: > Acked-by: Nicolas Ferre > > I take it for at91-4.1-dt (no need to respin it). Thank you. Best Regards, Josh Wu > > Bye, From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Wu Subject: Re: [PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board Date: Thu, 5 Mar 2015 10:14:54 +0800 Message-ID: <54F7BC1E.3020808@atmel.com> References: <1425437508-30976-1-git-send-email-josh.wu@atmel.com> <1425437508-30976-2-git-send-email-josh.wu@atmel.com> <54F6E789.5080508@atmel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <54F6E789.5080508-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Nicolas Ferre Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Boris Brezillon , Alexandre Belloni , Bo Shen , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Andrew Victor , Jean-Christophe Plagniol-Villard , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: devicetree@vger.kernel.org On 3/4/2015 7:07 PM, Nicolas Ferre wrote: > Le 04/03/2015 03:51, Josh Wu a =E9crit : >> Add at91 sama5d4 xplained board support. >> >> Signed-off-by: Josh Wu >> --- >> >> Changes in v4: >> - Thanks to Bo Shen to find following leds issues: >> 1. the leds' label is changed in new xplained board. >> 2. as piod bank is disabled in sama5d4, that will whole led dri= ver >> not work. So just disable the led which used piod. >> >> Changes in v3: >> - add phy0 child node under macb0 >> - rebase on top of linux next, re-formated the arch/arm/boot/dts/Mak= efile >> >> Changes in v2: >> - to be sorted by memory address, put the adc dt node after usart4. >> >> arch/arm/boot/dts/Makefile | 3 +- >> arch/arm/boot/dts/at91-sama5d4_xplained.dts | 239 ++++++++++++++++= ++++++++++++ >> 2 files changed, 241 insertions(+), 1 deletion(-) >> create mode 100644 arch/arm/boot/dts/at91-sama5d4_xplained.dts >> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >> index a1c776b..5c189a5 100644 >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> @@ -42,7 +42,8 @@ dtb-$(CONFIG_SOC_SAM_V7) +=3D \ >> sama5d34ek.dtb \ >> sama5d35ek.dtb \ >> sama5d36ek.dtb \ >> - at91-sama5d4ek.dtb >> + at91-sama5d4ek.dtb \ >> + at91-sama5d4_xplained.dtb >> dtb-$(CONFIG_ARCH_ATLAS6) +=3D \ >> atlas6-evb.dtb >> dtb-$(CONFIG_ARCH_ATLAS7) +=3D \ >> diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/= boot/dts/at91-sama5d4_xplained.dts >> new file mode 100644 >> index 0000000..af8f4f5 >> --- /dev/null >> +++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts >> @@ -0,0 +1,239 @@ >> +/* >> + * at91-sama5d4_xplained.dts - Device Tree file for SAMA5D4 Xplaine= d board >> + * >> + * Copyright (C) 2015 Atmel, >> + * 2015 Josh Wu >> + * >> + * This file is dual-licensed: you can use it either under the term= s >> + * of the GPL or the X11 license, at your option. Note that this du= al >> + * 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 th= e >> + * 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 documentati= on >> + * 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 t= he >> + * 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 Softwa= re. >> + * >> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KI= ND, >> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANT= IES >> + * 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 O= R >> + * OTHER DEALINGS IN THE SOFTWARE. >> + */ >> +/dts-v1/; >> +#include "sama5d4.dtsi" >> + >> +/ { >> + model =3D "Atmel SAMA5D4 Xplained"; >> + compatible =3D "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,s= ama5"; >> + >> + chosen { >> + bootargs =3D "console=3DttyS0,115200 ignore_loglevel earlyprintk"= ; >> + }; >> + >> + memory { >> + reg =3D <0x20000000 0x20000000>; >> + }; >> + >> + clocks { >> + #address-cells =3D <1>; >> + #size-cells =3D <1>; >> + ranges; >> + >> + main_clock: clock@0 { >> + compatible =3D "atmel,osc", "fixed-clock"; >> + clock-frequency =3D <12000000>; >> + }; >> + >> + slow_xtal { >> + clock-frequency =3D <32768>; >> + }; >> + >> + main_xtal { >> + clock-frequency =3D <12000000>; >> + }; >> + }; >> + >> + ahb { >> + apb { >> + spi0: spi@f8010000 { >> + cs-gpios =3D <&pioC 3 0>, <0>, <0>, <0>; >> + status =3D "okay"; >> + m25p80@0 { >> + compatible =3D "atmel,at25df321a"; >> + spi-max-frequency =3D <50000000>; >> + reg =3D <0>; >> + }; >> + }; >> + >> + macb0: ethernet@f8020000 { >> + phy-mode =3D "rmii"; >> + status =3D "okay"; >> + >> + phy0: ethernet-phy@1 { >> + interrupt-parent =3D <&pioE>; >> + interrupts =3D <1 IRQ_TYPE_EDGE_FALLING>; >> + reg =3D <1>; >> + }; >> + }; >> + >> + mmc1: mmc@fc000000 { >> + pinctrl-names =3D "default"; >> + pinctrl-0 =3D <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 = &pinctrl_mmc1_cd>; >> + status =3D "okay"; >> + slot@0 { >> + reg =3D <0>; >> + bus-width =3D <4>; >> + cd-gpios =3D <&pioE 3 0>; >> + }; >> + }; >> + >> + usart3: serial@fc00c000 { >> + status =3D "okay"; >> + }; >> + >> + usart4: serial@fc010000 { >> + status =3D "okay"; >> + }; >> + >> + adc0: adc@fc034000 { >> + atmel,adc-vref =3D <3300>; >> + status =3D "okay"; >> + }; >> + >> + watchdog@fc068640 { >> + status =3D "okay"; >> + }; >> + >> + pinctrl@fc06a000 { >> + board { >> + pinctrl_mmc1_cd: mmc1_cd { >> + atmel,pins =3D >> + = ; >> + }; >> + pinctrl_usba_vbus: usba_vbus { >> + atmel,pins =3D >> + ; >> + }; >> + pinctrl_key_gpio: key_gpio_0 { >> + atmel,pins =3D >> + = ; /* PE13 gpio */ > Nit: useless comment which is wrong. I remove it. oh, my bad. > > > >> + }; >> + }; >> + }; >> + }; >> + >> + usb0: gadget@00400000 { >> + atmel,vbus-gpio =3D <&pioE 31 GPIO_ACTIVE_HIGH>; >> + pinctrl-names =3D "default"; >> + pinctrl-0 =3D <&pinctrl_usba_vbus>; >> + status =3D "okay"; >> + }; >> + >> + usb1: ohci@00500000 { >> + num-ports =3D <3>; >> + atmel,vbus-gpio =3D <0 >> + &pioE 11 GPIO_ACTIVE_HIGH >> + &pioE 14 GPIO_ACTIVE_HIGH >> + >; >> + status =3D "okay"; >> + }; >> + >> + usb2: ehci@00600000 { >> + status =3D "okay"; >> + }; >> + >> + nand0: nand@80000000 { >> + nand-bus-width =3D <8>; >> + nand-ecc-mode =3D "hw"; >> + nand-on-flash-bbt; >> + atmel,has-pmecc; >> + status =3D "okay"; >> + >> + at91bootstrap@0 { >> + label =3D "at91bootstrap"; >> + reg =3D <0x0 0x40000>; >> + }; >> + >> + bootloader@40000 { >> + label =3D "bootloader"; >> + reg =3D <0x40000 0x80000>; >> + }; >> + >> + bootloaderenv@c0000 { >> + label =3D "bootloader env"; >> + reg =3D <0xc0000 0xc0000>; >> + }; >> + >> + dtb@180000 { >> + label =3D "device tree"; >> + reg =3D <0x180000 0x80000>; >> + }; >> + >> + kernel@200000 { >> + label =3D "kernel"; >> + reg =3D <0x200000 0x600000>; >> + }; >> + >> + rootfs@800000 { >> + label =3D "rootfs"; >> + reg =3D <0x800000 0x0f800000>; >> + }; >> + }; >> + }; >> + >> + gpio_keys { >> + compatible =3D "gpio-keys"; >> + #address-cells =3D <1>; >> + #size-cells =3D <0>; >> + >> + pinctrl-names =3D "default"; >> + pinctrl-0 =3D <&pinctrl_key_gpio>; >> + >> + pb_user1 { >> + label =3D "pb_user1"; >> + gpios =3D <&pioE 8 GPIO_ACTIVE_HIGH>; >> + linux,code =3D <0x100>; >> + gpio-key,wakeup; >> + }; >> + }; >> + >> + leds { >> + compatible =3D "gpio-leds"; >> + status =3D "okay"; >> + >> + d8 { >> + label =3D "d8"; >> + gpios =3D <&pioD 30 GPIO_ACTIVE_HIGH>; >> + status =3D "disabled"; >> + }; >> + >> + d10 { >> + label =3D "d10"; >> + gpios =3D <&pioE 15 GPIO_ACTIVE_LOW>; >> + linux,default-trigger =3D "heartbeat"; >> + }; >> + }; >> +}; >> > Otherwise, it's okay: > Acked-by: Nicolas Ferre > > I take it for at91-4.1-dt (no need to respin it). Thank you. Best Regards, Josh Wu > > Bye, -- To unsubscribe from this list: send the line "unsubscribe devicetree" i= n the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: josh.wu@atmel.com (Josh Wu) Date: Thu, 5 Mar 2015 10:14:54 +0800 Subject: [PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board In-Reply-To: <54F6E789.5080508@atmel.com> References: <1425437508-30976-1-git-send-email-josh.wu@atmel.com> <1425437508-30976-2-git-send-email-josh.wu@atmel.com> <54F6E789.5080508@atmel.com> Message-ID: <54F7BC1E.3020808@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 3/4/2015 7:07 PM, Nicolas Ferre wrote: > Le 04/03/2015 03:51, Josh Wu a ?crit : >> Add at91 sama5d4 xplained board support. >> >> Signed-off-by: Josh Wu >> --- >> >> Changes in v4: >> - Thanks to Bo Shen to find following leds issues: >> 1. the leds' label is changed in new xplained board. >> 2. as piod bank is disabled in sama5d4, that will whole led driver >> not work. So just disable the led which used piod. >> >> Changes in v3: >> - add phy0 child node under macb0 >> - rebase on top of linux next, re-formated the arch/arm/boot/dts/Makefile >> >> Changes in v2: >> - to be sorted by memory address, put the adc dt node after usart4. >> >> arch/arm/boot/dts/Makefile | 3 +- >> arch/arm/boot/dts/at91-sama5d4_xplained.dts | 239 ++++++++++++++++++++++++++++ >> 2 files changed, 241 insertions(+), 1 deletion(-) >> create mode 100644 arch/arm/boot/dts/at91-sama5d4_xplained.dts >> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >> index a1c776b..5c189a5 100644 >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> @@ -42,7 +42,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ >> sama5d34ek.dtb \ >> sama5d35ek.dtb \ >> sama5d36ek.dtb \ >> - at91-sama5d4ek.dtb >> + at91-sama5d4ek.dtb \ >> + at91-sama5d4_xplained.dtb >> dtb-$(CONFIG_ARCH_ATLAS6) += \ >> atlas6-evb.dtb >> dtb-$(CONFIG_ARCH_ATLAS7) += \ >> diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts >> new file mode 100644 >> index 0000000..af8f4f5 >> --- /dev/null >> +++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts >> @@ -0,0 +1,239 @@ >> +/* >> + * at91-sama5d4_xplained.dts - Device Tree file for SAMA5D4 Xplained board >> + * >> + * Copyright (C) 2015 Atmel, >> + * 2015 Josh Wu >> + * >> + * 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. >> + */ >> +/dts-v1/; >> +#include "sama5d4.dtsi" >> + >> +/ { >> + model = "Atmel SAMA5D4 Xplained"; >> + compatible = "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,sama5"; >> + >> + chosen { >> + bootargs = "console=ttyS0,115200 ignore_loglevel earlyprintk"; >> + }; >> + >> + memory { >> + reg = <0x20000000 0x20000000>; >> + }; >> + >> + clocks { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + ranges; >> + >> + main_clock: clock at 0 { >> + compatible = "atmel,osc", "fixed-clock"; >> + clock-frequency = <12000000>; >> + }; >> + >> + slow_xtal { >> + clock-frequency = <32768>; >> + }; >> + >> + main_xtal { >> + clock-frequency = <12000000>; >> + }; >> + }; >> + >> + ahb { >> + apb { >> + spi0: spi at f8010000 { >> + cs-gpios = <&pioC 3 0>, <0>, <0>, <0>; >> + status = "okay"; >> + m25p80 at 0 { >> + compatible = "atmel,at25df321a"; >> + spi-max-frequency = <50000000>; >> + reg = <0>; >> + }; >> + }; >> + >> + macb0: ethernet at f8020000 { >> + phy-mode = "rmii"; >> + status = "okay"; >> + >> + phy0: ethernet-phy at 1 { >> + interrupt-parent = <&pioE>; >> + interrupts = <1 IRQ_TYPE_EDGE_FALLING>; >> + reg = <1>; >> + }; >> + }; >> + >> + mmc1: mmc at fc000000 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>; >> + status = "okay"; >> + slot at 0 { >> + reg = <0>; >> + bus-width = <4>; >> + cd-gpios = <&pioE 3 0>; >> + }; >> + }; >> + >> + usart3: serial at fc00c000 { >> + status = "okay"; >> + }; >> + >> + usart4: serial at fc010000 { >> + status = "okay"; >> + }; >> + >> + adc0: adc at fc034000 { >> + atmel,adc-vref = <3300>; >> + status = "okay"; >> + }; >> + >> + watchdog at fc068640 { >> + status = "okay"; >> + }; >> + >> + pinctrl at fc06a000 { >> + board { >> + pinctrl_mmc1_cd: mmc1_cd { >> + atmel,pins = >> + ; >> + }; >> + pinctrl_usba_vbus: usba_vbus { >> + atmel,pins = >> + ; >> + }; >> + pinctrl_key_gpio: key_gpio_0 { >> + atmel,pins = >> + ; /* PE13 gpio */ > Nit: useless comment which is wrong. I remove it. oh, my bad. > > > >> + }; >> + }; >> + }; >> + }; >> + >> + usb0: gadget at 00400000 { >> + atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_usba_vbus>; >> + status = "okay"; >> + }; >> + >> + usb1: ohci at 00500000 { >> + num-ports = <3>; >> + atmel,vbus-gpio = <0 >> + &pioE 11 GPIO_ACTIVE_HIGH >> + &pioE 14 GPIO_ACTIVE_HIGH >> + >; >> + status = "okay"; >> + }; >> + >> + usb2: ehci at 00600000 { >> + status = "okay"; >> + }; >> + >> + nand0: nand at 80000000 { >> + nand-bus-width = <8>; >> + nand-ecc-mode = "hw"; >> + nand-on-flash-bbt; >> + atmel,has-pmecc; >> + status = "okay"; >> + >> + at91bootstrap at 0 { >> + label = "at91bootstrap"; >> + reg = <0x0 0x40000>; >> + }; >> + >> + bootloader at 40000 { >> + label = "bootloader"; >> + reg = <0x40000 0x80000>; >> + }; >> + >> + bootloaderenv at c0000 { >> + label = "bootloader env"; >> + reg = <0xc0000 0xc0000>; >> + }; >> + >> + dtb at 180000 { >> + label = "device tree"; >> + reg = <0x180000 0x80000>; >> + }; >> + >> + kernel at 200000 { >> + label = "kernel"; >> + reg = <0x200000 0x600000>; >> + }; >> + >> + rootfs at 800000 { >> + label = "rootfs"; >> + reg = <0x800000 0x0f800000>; >> + }; >> + }; >> + }; >> + >> + gpio_keys { >> + compatible = "gpio-keys"; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_key_gpio>; >> + >> + pb_user1 { >> + label = "pb_user1"; >> + gpios = <&pioE 8 GPIO_ACTIVE_HIGH>; >> + linux,code = <0x100>; >> + gpio-key,wakeup; >> + }; >> + }; >> + >> + leds { >> + compatible = "gpio-leds"; >> + status = "okay"; >> + >> + d8 { >> + label = "d8"; >> + gpios = <&pioD 30 GPIO_ACTIVE_HIGH>; >> + status = "disabled"; >> + }; >> + >> + d10 { >> + label = "d10"; >> + gpios = <&pioE 15 GPIO_ACTIVE_LOW>; >> + linux,default-trigger = "heartbeat"; >> + }; >> + }; >> +}; >> > Otherwise, it's okay: > Acked-by: Nicolas Ferre > > I take it for at91-4.1-dt (no need to respin it). Thank you. Best Regards, Josh Wu > > Bye,