diff options
| author | Gaël PORTAY <g.portay@overkiz.com> | 2015-04-30 09:33:33 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-04-30 09:53:17 +0200 |
| commit | 49668b014db289b034463a810cc936a79a59f1c5 (patch) | |
| tree | 3214176b388213b26a71ef053be40884741a5445 /arch/arm/boot/dts | |
| parent | d8b183479cd007f7ac5297c7bc4108985b026e56 (diff) | |
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@overkiz.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/at91-kizbox.dts | 65 |
1 files changed, 31 insertions, 34 deletions
diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts index e07afaefcf76..00c86c1d0a01 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@overkiz.com> + * Copyright (C) 2012-2014 Boris BREZILLON <b.brezillon@overkiz.com> + * 2014-2015 Gaël PORTAY <g.portay@overkiz.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@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; - }; - }; }; |