projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 c16594b7e43371182c1bd40187806ae0b841f736..1eec95118891da31f0bcd2fa8a9020da9278c9d7 100644
(file)
--- a/
arch/arm/dts/stm32429i-eval.dts
+++ b/
arch/arm/dts/stm32429i-eval.dts
@@
-72,7
+72,6
@@
gpio_keys {
compatible = "gpio-keys";
gpio_keys {
compatible = "gpio-keys";
- #address-cells = <1>;
#size-cells = <0>;
autorepeat;
button@0 {
#size-cells = <0>;
autorepeat;
button@0 {
@@
-223,8
+222,7
@@
&sdio {
status = "okay";
vmmc-supply = <&mmc_vcard>;
&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>;
pinctrl-names = "default", "opendrain";
pinctrl-0 = <&sdio_pins>;
pinctrl-1 = <&sdio_pins_od>;