imx6ul/imx6ull: synchronise device trees with linux

[platform/kernel/u-boot.git] / arch / arm / dts / imx6ul-kontron-n6x1x-som-common.dtsi

diff --git a/arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi b/arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi
index e9ec6b7..09a83db 100644 (file)
--- a/arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi
+++ b/arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi
@@ -11,20 +11,15 @@
        chosen {
                stdout-path = &uart4;
        };
-
-       memory@80000000 {
-               reg = <0x80000000 0x10000000>;
-               device_type = "memory";
-       };
 };
 
 &ecspi2 {
-       cs-gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>;
+       cs-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_ecspi2>;
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                compatible = "mxicy,mx25v8035f", "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <0>;
@@ -60,16 +55,13 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_qspi>;
        status = "okay";
+};
 
-       spi-flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "spi-nand";
-               spi-max-frequency = <104000000>;
-               spi-tx-bus-width = <4>;
-               spi-rx-bus-width = <4>;
-               reg = <0>;
-       };
+&wdog1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_wdog>;
+       fsl,ext-reset-output;
+       status = "okay";
 };
 
 &iomuxc {
@@ -121,4 +113,10 @@
                        MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09      0x1b0b0
                >;
        };
+
+       pinctrl_wdog: wdoggrp {
+               fsl,pins = <
+                       MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY    0x18b0
+               >;
+       };
 };