These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / imx6qdl-hummingboard.dtsi

diff --git a/kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index 151a3db..6dd0b76 100644 (file)
--- a/kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -7,9 +7,8 @@
  * 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.
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
  *
  *     This file is distributed in the hope that it will be useful
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -192,6 +191,12 @@
                        >;
                };
 
+               pinctrl_hummingboard_pcie_reset: hummingboard-pcie-reset {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x1b0b1
+                       >;
+               };
+
                pinctrl_hummingboard_pwm1: pwm1grp {
                        fsl,pins = <MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b1>;
                };
@@ -245,6 +250,13 @@
        };
 };
 
+&pcie {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hummingboard_pcie_reset>;
+       reset-gpio = <&gpio3 4 0>;
+       status = "okay";
+};
+
 &pwm1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_hummingboard_pwm1>;
@@ -263,7 +275,6 @@
 };
 
 &ssi1 {
-       fsl,mode = "i2s-slave";
        status = "okay";
 };
 
@@ -288,6 +299,6 @@
                &pinctrl_hummingboard_usdhc2
        >;
        vmmc-supply = <&reg_3p3v>;
-       cd-gpios = <&gpio1 4 0>;
+       cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
        status = "okay";
 };