[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1430379218-13758-3-git-send-email-g.portay@overkiz.com>
Date: Thu, 30 Apr 2015 09:33:33 +0200
From: Gaël PORTAY <g.portay@...rkiz.com>
To: Nicolas Ferre <nicolas.ferre@...el.com>,
Boris Brezillon <boris.brezillon@...e-electrons.com>,
Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>
Cc: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Gaël PORTAY <g.portay@...rkiz.com>
Subject: [PATCH v3 2/7] ARM: at91/dt: at91-kizbox: sanitize file
Consists in:
* sorting nodes by address as possible or alphabetically,
* adding myself as new maintainer and
* update license.
Signed-off-by: Gaël PORTAY <g.portay@...rkiz.com>
Acked-by: Boris Brezillon <boris.brezillon@...e-electrons.com>
---
arch/arm/boot/dts/at91-kizbox.dts | 65 +++++++++++++++++++--------------------
1 file changed, 31 insertions(+), 34 deletions(-)
diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts
index e07afae..00c86c1 100644
--- a/arch/arm/boot/dts/at91-kizbox.dts
+++ b/arch/arm/boot/dts/at91-kizbox.dts
@@ -1,16 +1,16 @@
/*
* at91-kizbox.dts - Device Tree file for Overkiz Kizbox board
*
- * Copyright (C) 2012 Boris BREZILLON <linux-arm@...rkiz.com>
+ * Copyright (C) 2012-2014 Boris BREZILLON <b.brezillon@...rkiz.com>
+ * 2014-2015 Gaël PORTAY <g.portay@...rkiz.com>
*
- * 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@...ff200 {
- status = "okay";
- };
-
usart0: serial@...b0000 {
status = "okay";
};
@@ -57,6 +53,10 @@
status = "okay";
};
+ dbgu: serial@...ff200 {
+ status = "okay";
+ };
+
watchdog@...ffd40 {
timeout-sec = <15>;
atmel,max-heartbeat-sec = <16>;
@@ -65,6 +65,11 @@
};
};
+ usb0: ohci@...00000 {
+ num-ports = <1>;
+ status = "okay";
+ };
+
nand0: nand@...00000 {
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@...00000 {
- 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists