diff options
| author | Chris Zankel <chris@zankel.net> | 2015-08-30 01:55:58 +0200 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-08-30 01:55:58 +0200 |
| commit | 650c919798c71fb34b77a6f2ba03a06907f06a76 (patch) | |
| tree | d1c60012d4d86846d25f1d0b783b5122c26a2e31 /arch/arm/boot/dts/ste-snowball.dts | |
| parent | xtensa: improve vmlinux.lds.S sed post-processing (diff) | |
| parent | Linux 4.2 (diff) | |
| download | linux-650c919798c71fb34b77a6f2ba03a06907f06a76.tar.xz linux-650c919798c71fb34b77a6f2ba03a06907f06a76.zip | |
Merge tag 'v4.2' into for_next
Linux 4.2
Diffstat (limited to 'arch/arm/boot/dts/ste-snowball.dts')
| -rw-r--r-- | arch/arm/boot/dts/ste-snowball.dts | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index 9edadc37719f..32a5ccb14e7e 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -18,6 +18,13 @@ model = "Calao Systems Snowball platform with device tree"; compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500"; + /* This stablilizes the serial port enumeration */ + aliases { + serial0 = &ux500_serial0; + serial1 = &ux500_serial1; + serial2 = &ux500_serial2; + }; + memory { reg = <0x00000000 0x20000000>; }; @@ -223,11 +230,11 @@ status = "okay"; }; + /* This UART is unused and thus left disabled */ uart@80121000 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&uart1_default_mode>; pinctrl-1 = <&uart1_sleep_mode>; - status = "okay"; }; uart@80007000 { @@ -452,7 +459,21 @@ pins = "GPIO21_AB3"; /* DAT31DIR */ ste,config = <&out_hi>; }; - + /* SD card detect GPIO pin, extend default state */ + snowball_cfg2 { + pins = "GPIO218_AH11"; + ste,config = <&gpio_in_pu>; + }; + /* VMMCI level-shifter enable */ + snowball_cfg3 { + pins = "GPIO217_AH12"; + ste,config = <&gpio_out_lo>; + }; + /* VMMCI level-shifter voltage select */ + snowball_cfg4 { + pins = "GPIO228_AJ6"; + ste,config = <&gpio_out_hi>; + }; }; }; ssp0 { |