Merge branch '2019-07-12-master-imports'

[oweals/u-boot.git] / arch / arm / dts / stm32429i-eval.dts

diff --git a/arch/arm/dts/stm32429i-eval.dts b/arch/arm/dts/stm32429i-eval.dts
index 4bf53a717d9290015f20e97d639e1f9a39ee6653..1eec95118891da31f0bcd2fa8a9020da9278c9d7 100644 (file)
--- a/arch/arm/dts/stm32429i-eval.dts
+++ b/arch/arm/dts/stm32429i-eval.dts
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015, STMicroelectronics - All Rights Reserved
  * Author: Maxime Coquelin <mcoquelin.stm32@gmail.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /dts-v1/;
@@ -73,7 +72,6 @@
 
        gpio_keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
                #size-cells = <0>;
                autorepeat;
                button@0 {
@@ -224,8 +222,7 @@
 &sdio {
        status = "okay";
        vmmc-supply = <&mmc_vcard>;
-       cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_HIGH>;
-       cd-inverted;
+       cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_LOW>;
        pinctrl-names = "default", "opendrain";
        pinctrl-0 = <&sdio_pins>;
        pinctrl-1 = <&sdio_pins_od>;