devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 1/2] ARM: at91: sama5d4/dts: add #{address, size}_cells properties for macb0
@ 2015-03-04  2:51 Josh Wu
       [not found] ` <1425437508-30976-1-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Josh Wu @ 2015-03-04  2:51 UTC (permalink / raw)
  To: Nicolas Ferre
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	Boris Brezillon, Alexandre Belloni, Bo Shen, Josh Wu,
	Andrew Victor, Jean-Christophe Plagniol-Villard, Rob Herring,
	Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King,
	devicetree-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA

macb0 DT node can have phy child nodes, so add the #{address,
size}_cells for macb0 node.

Signed-off-by: Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
---

Changes in v4:
- fix typo in commit message: cell -> cells

Changes in v3:
- new added

Changes in v2: None

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

diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index d986b41..07953f2 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -852,6 +852,8 @@
 				interrupts = <54 IRQ_TYPE_LEVEL_HIGH 3>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_macb0_rmii>;
+				#address-cells = <1>;
+				#size-cells = <0>;
 				clocks = <&macb0_clk>, <&macb0_clk>;
 				clock-names = "hclk", "pclk";
 				status = "disabled";
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board
       [not found] ` <1425437508-30976-1-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
@ 2015-03-04  2:51   ` Josh Wu
       [not found]     ` <1425437508-30976-2-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Josh Wu @ 2015-03-04  2:51 UTC (permalink / raw)
  To: Nicolas Ferre
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	Boris Brezillon, Alexandre Belloni, Bo Shen, Josh Wu, Rob Herring,
	Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King,
	Andrew Victor, Jean-Christophe Plagniol-Villard,
	devicetree-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA

Add at91 sama5d4 xplained board support.

Signed-off-by: Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
---

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 <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
+ *
+ * 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 =
+							<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
+					};
+					pinctrl_usba_vbus: usba_vbus {
+						atmel,pins =
+							<AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;
+					};
+					pinctrl_key_gpio: key_gpio_0 {
+						atmel,pins =
+							<AT91_PIOE 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PE13 gpio */
+					};
+				};
+			};
+		};
+
+		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";
+		};
+	};
+};
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board
       [not found]     ` <1425437508-30976-2-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
@ 2015-03-04 11:07       ` Nicolas Ferre
       [not found]         ` <54F6E789.5080508-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Ferre @ 2015-03-04 11:07 UTC (permalink / raw)
  To: Josh Wu
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	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,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA

Le 04/03/2015 03:51, Josh Wu a écrit :
> Add at91 sama5d4 xplained board support.
> 
> Signed-off-by: Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
> ---
> 
> 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 <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
> + *
> + * 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 =
> +							<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
> +					};
> +					pinctrl_usba_vbus: usba_vbus {
> +						atmel,pins =
> +							<AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;
> +					};
> +					pinctrl_key_gpio: key_gpio_0 {
> +						atmel,pins =
> +							<AT91_PIOE 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PE13 gpio */

Nit: useless comment which is wrong. I remove it.



> +					};
> +				};
> +			};
> +		};
> +
> +		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 <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>

I take it for at91-4.1-dt (no need to respin it).

Bye,
-- 
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board
       [not found]         ` <54F6E789.5080508-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
@ 2015-03-05  2:14           ` Josh Wu
  0 siblings, 0 replies; 4+ messages in thread
From: Josh Wu @ 2015-03-05  2:14 UTC (permalink / raw)
  To: Nicolas Ferre
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	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,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA

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 <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
>> ---
>>
>> 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 <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
>> + *
>> + * 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 =
>> +							<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
>> +					};
>> +					pinctrl_usba_vbus: usba_vbus {
>> +						atmel,pins =
>> +							<AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;
>> +					};
>> +					pinctrl_key_gpio: key_gpio_0 {
>> +						atmel,pins =
>> +							<AT91_PIOE 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* 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 <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
>
> 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" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-03-05  2:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-04  2:51 [PATCH v4 1/2] ARM: at91: sama5d4/dts: add #{address, size}_cells properties for macb0 Josh Wu
     [not found] ` <1425437508-30976-1-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2015-03-04  2:51   ` [PATCH v4 2/2] ARM: at91: dts: sama5d4: add dts for sama5d4 xplained board Josh Wu
     [not found]     ` <1425437508-30976-2-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2015-03-04 11:07       ` Nicolas Ferre
     [not found]         ` <54F6E789.5080508-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2015-03-05  2:14           ` Josh Wu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).