diff --git a/dts/arm/nucleo_l476rg.dts b/dts/arm/nucleo_l476rg.dts
index 0e06bb45c34..09f8ae45bad 100644
--- a/dts/arm/nucleo_l476rg.dts
+++ b/dts/arm/nucleo_l476rg.dts
@@ -1,43 +1,7 @@
 /*
- * Copyright 2015 - Maxime Coquelin <mcoquelin.stm32@gmail.com>
+ * Copyright (c) 2017 Linaro Limited
  *
- * 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.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /dts-v1/;
@@ -47,21 +11,24 @@
 	model = "STMicroelectronics STM32L476RG-NUCLEO board";
 	compatible = "st,stm32l476rg-nucleo", "st,stm32l476";
 
+	sram0: memory {
+		reg = <0x20000000 0x18000>;
+	};
+
+	flash0: flash {
+		reg = <0x08000000 0x100000>;
+	};
+
 	chosen {
 		zephyr,console = &usart2;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 	};
 
-
 	leds {
 		compatible = "gpio-leds";
-		red {
-			gpios = <&gpiog 14 0>;
-		};
 		green {
-			gpios = <&gpiog 13 0>;
-			linux,default-trigger = "heartbeat";
+			gpios = <&gpioa 5 0>;
 		};
 	};
 };
diff --git a/dts/arm/stm32l476.dtsi b/dts/arm/stm32l476.dtsi
index 001fb0f28cf..fdb8b93c7c4 100644
--- a/dts/arm/stm32l476.dtsi
+++ b/dts/arm/stm32l476.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Linaro Limited.
+ * Copyright (c) 2017 Linaro Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,14 +8,6 @@
 
 / {
 
-	sram0: memory {
-		reg = <0x20000000 0x18000>;
-	};
-
-	flash0: flash {
-		reg = <0x08000000 0x100000>;
-	};
-
 	clocks {
 		clk_hse: clk-hse {
 			#clock-cells = <0>;
@@ -70,23 +62,18 @@
 			status = "disabled";
 		};
 
-		syscfg: system-config@40010000 {
-			compatible = "syscon";
-			reg = <0x40013800 0x400>;
-		};
-
 		pin-controller {
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "st,stm32l4xx-pinctrl";
 			ranges = <0 0x48000000 0x2000>;
-			pins-are-numbered;
 
 			gpioa: gpio@48000000 {
 				gpio-controller;
 				#gpio-cells = <2>;
 				reg = <0x0 0x400>;
 				st,bank-name = "GPIOA";
+
 			};
 
 			gpiob: gpio@48000400 {