diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:30 +0200 |
| commit | e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39 (patch) | |
| tree | fd2a441a7528003e0876ef0a4209cd7d9e28e7bc /dts/src/arm/ste-nomadik-stn8815.dtsi | |
| parent | 8b464dc6eec4d1fd58875451671456393181e980 (diff) | |
| parent | e8ee06fe59e468dcd7404b8eed75d78af9c02593 (diff) | |
| download | barebox-e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39.tar.gz barebox-e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39.tar.xz | |
Merge branch 'for-next/dts'
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>; |