Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / keystone-k2hk-evm.dts

diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts
index 6dd13b9..ad4e22a 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2hk-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright 2013-2014 Texas Instruments, Inc.
- *
  * Keystone 2 Kepler/Hawking EVM device tree
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * Copyright (C) 2013-2017 Texas Instruments Incorporated - http://www.ti.com/
  */
 /dts-v1/;
 
@@ -29,7 +26,31 @@
                };
        };
 
-       soc {
+       leds {
+               compatible = "gpio-leds";
+               debug1_1 {
+                       label = "keystone:green:debug1";
+                       gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */
+               };
+
+               debug1_2 {
+                       label = "keystone:red:debug1";
+                       gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */
+               };
+
+               debug2 {
+                       label = "keystone:blue:debug2";
+                       gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */
+               };
+
+               debug3 {
+                       label = "keystone:blue:debug3";
+                       gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */
+               };
+       };
+};
+
+&soc0 {
                clocks {
                        refclksys: refclksys {
                                #clock-cells = <0>;
@@ -66,30 +87,6 @@
                                clock-output-names = "refclk-ddr3b";
                        };
                };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               debug1_1 {
-                       label = "keystone:green:debug1";
-                       gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */
-               };
-
-               debug1_2 {
-                       label = "keystone:red:debug1";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */
-               };
-
-               debug2 {
-                       label = "keystone:blue:debug2";
-                       gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */
-               };
-
-               debug3 {
-                       label = "keystone:blue:debug3";
-                       gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */
-               };
-       };
 };
 
 &usb_phy {
@@ -158,7 +155,7 @@
 
 &i2c0 {
        dtt@50 {
-               compatible = "at,24c1024";
+               compatible = "atmel,24c1024";
                reg = <0x50>;
        };
 };