diff options
| author | Warner Losh <imp@FreeBSD.org> | 2014-08-31 04:34:12 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2014-08-31 04:34:12 +0000 |
| commit | d1ca9b39dc9ec58a6b6169a48e5b229a33debaf0 (patch) | |
| tree | c36c7befa73b6a6704f0cec1d7f1c0344601c218 /src/arm/ste-nomadik-stn8815.dtsi | |
| parent | 0d4a4b13019e01c1eab30b74c983040450010b81 (diff) | |
| download | src-d1ca9b39dc9ec58a6b6169a48e5b229a33debaf0.tar.gz src-d1ca9b39dc9ec58a6b6169a48e5b229a33debaf0.zip | |
Import from rebasing repo at b78b6b80
Notes
Notes:
svn path=/vendor/device-tree/dist/; revision=270864
Diffstat (limited to 'src/arm/ste-nomadik-stn8815.dtsi')
| -rw-r--r-- | src/arm/ste-nomadik-stn8815.dtsi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/arm/ste-nomadik-stn8815.dtsi b/src/arm/ste-nomadik-stn8815.dtsi index 5acc0449676a..dbcf521b017f 100644 --- a/src/arm/ste-nomadik-stn8815.dtsi +++ b/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>; @@ -840,10 +842,9 @@ interrupts = <22>; max-frequency = <48000000>; bus-width = <4>; - mmc-cap-mmc-highspeed; - mmc-cap-sd-highspeed; - cd-gpios = <&gpio3 15 0x1>; - cd-inverted; + cap-mmc-highspeed; + cap-sd-highspeed; + cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>; vmmc-supply = <&vmmc_regulator>; |