diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-04 21:23:05 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-04 21:23:05 +0200 |
commit | e8ee06fe59e468dcd7404b8eed75d78af9c02593 (patch) | |
tree | 9fa40833523239ccb546a82cc9e530d511ed5fa2 /dts/src/arm/ste-nomadik-stn8815.dtsi | |
parent | 9f0942c873dc7bf20a74062fd1a0c903eeacbb5f (diff) | |
download | barebox-e8ee06fe59e468dcd7404b8eed75d78af9c02593.tar.gz barebox-e8ee06fe59e468dcd7404b8eed75d78af9c02593.tar.xz |
dts: update to v3.16
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm/ste-nomadik-stn8815.dtsi')
-rw-r--r-- | dts/src/arm/ste-nomadik-stn8815.dtsi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dts/src/arm/ste-nomadik-stn8815.dtsi b/dts/src/arm/ste-nomadik-stn8815.dtsi index d316c955bd..dbcf521b01 100644 --- a/dts/src/arm/ste-nomadik-stn8815.dtsi +++ b/dts/src/arm/ste-nomadik-stn8815.dtsi @@ -1,7 +1,9 @@ /* * Device Tree for the ST-Ericsson Nomadik 8815 STn8815 SoC */ -/include/ "skeleton.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include "skeleton.dtsi" / { #address-cells = <1>; @@ -842,8 +844,7 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; - cd-gpios = <&gpio3 15 0x1>; - cd-inverted; + cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>; vmmc-supply = <&vmmc_regulator>; |