Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932136AbbDUMGe (ORCPT ); Tue, 21 Apr 2015 08:06:34 -0400 Received: from 6.mo68.mail-out.ovh.net ([46.105.63.100]:59748 "EHLO 6.mo68.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755148AbbDUMFi (ORCPT ); Tue, 21 Apr 2015 08:05:38 -0400 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= To: Nicolas Ferre , Boris Brezillon , Alexandre Belloni , Jean-Christophe PLAGNIOL-VILLARD Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?Ga=C3=ABl=20PORTAY?= Subject: [PATCH v2 2/7] ARM: at91/dt: at91-kizbox: sanitize file Date: Tue, 21 Apr 2015 14:05:13 +0200 Message-Id: <1429617918-32086-3-git-send-email-g.portay@overkiz.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429617918-32086-1-git-send-email-g.portay@overkiz.com> References: <1429617918-32086-1-git-send-email-g.portay@overkiz.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 4399453888024603502 X-Ovh-Remote: 80.245.18.66 () X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: -100 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeektddrheehucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeektddrheehucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3011 Lines: 146 Consists in: * sorting nodes by address as possible or alphabetically, * adding myself as new maintainer and * update license. Signed-off-by: Gaël PORTAY --- arch/arm/boot/dts/at91-kizbox.dts | 67 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts index e83e4f9..00c86c1 100644 --- a/arch/arm/boot/dts/at91-kizbox.dts +++ b/arch/arm/boot/dts/at91-kizbox.dts @@ -1,16 +1,16 @@ /* - * kizbox.dts - Device Tree file for Overkiz Kizbox board + * at91-kizbox.dts - Device Tree file for Overkiz Kizbox board * - * Copyright (C) 2012 Boris BREZILLON + * Copyright (C) 2012-2014 Boris BREZILLON + * 2014-2015 Gaël PORTAY * - * Licensed under GPLv2. + * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9g20.dtsi" / { - - model = "Overkiz kizbox"; + model = "Overkiz Kizbox"; compatible = "overkiz,kizbox", "atmel,at91sam9g20", "atmel,at91sam9"; chosen { @@ -38,10 +38,6 @@ ahb { apb { - dbgu: serial@fffff200 { - status = "okay"; - }; - usart0: serial@fffb0000 { status = "okay"; }; @@ -57,6 +53,10 @@ status = "okay"; }; + dbgu: serial@fffff200 { + status = "okay"; + }; + watchdog@fffffd40 { timeout-sec = <15>; atmel,max-heartbeat-sec = <16>; @@ -65,6 +65,11 @@ }; }; + usb0: ohci@00500000 { + num-ports = <1>; + status = "okay"; + }; + nand0: nand@40000000 { nand-bus-width = <8>; nand-ecc-mode = "soft"; @@ -79,24 +84,36 @@ label = "ubi"; reg = <0xc0000 0x7f40000>; }; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + reset { + label = "reset"; + gpios = <&pioB 30 GPIO_ACTIVE_LOW>; + linux,code = <0x100>; + gpio-key,wakeup; }; - usb0: ohci@00500000 { - num-ports = <1>; - status = "okay"; + mode { + label = "mode"; + gpios = <&pioB 31 GPIO_ACTIVE_LOW>; + linux,code = <0x101>; + gpio-key,wakeup; }; }; i2c@0 { status = "okay"; - pcf8563@51 { - /* nxp pcf8563 rtc */ + rtc: pcf8563@51 { compatible = "nxp,pcf8563"; reg = <0x51>; }; - }; leds { @@ -127,24 +144,4 @@ linux,default-trigger = "none"; }; }; - - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - - reset { - label = "reset"; - gpios = <&pioB 30 GPIO_ACTIVE_LOW>; - linux,code = <0x100>; - gpio-key,wakeup; - }; - - mode { - label = "mode"; - gpios = <&pioB 31 GPIO_ACTIVE_LOW>; - linux,code = <0x101>; - gpio-key,wakeup; - }; - }; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/