diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-25 23:26:53 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-25 23:26:53 -0800 |
| commit | 8d2282a77bf0977e7033d8ea5970f369bc28f0f0 (patch) | |
| tree | 25af2fa8e1b4c001ebdbc97f465f946786ba1678 /arch/arm/boot/dts/imx23.dtsi | |
| parent | 24025f6f5821bf3715b283f6490212ac44d6a4fe (diff) | |
| parent | 25d6dd859e73248432051257b4b4d2a3d51b295b (diff) | |
Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo:
They are a few mxs dts updates coming a little bit late. I'm sending
them as the second mxs/dt pull request for 3.8. Please consider to
pull.
* tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: mxs: add oled support for the cfa-10036
ARM: mxs: Add SchulerControl SPS1 DTS file
ARM: imx23-olinuxino: Add spi support
Diffstat (limited to 'arch/arm/boot/dts/imx23.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx23.dtsi | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index 6d31aa38346..65415c598a5 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi @@ -279,6 +279,19 @@ fsl,voltage = <1>; fsl,pull-up = <0>; }; + + spi2_pins_a: spi2@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x0182 /* MX23_PAD_GPMI_WRN__SSP2_SCK */ + 0x0142 /* MX23_PAD_GPMI_RDY1__SSP2_CMD */ + 0x0002 /* MX23_PAD_GPMI_D00__SSP2_DATA0 */ + 0x0032 /* MX23_PAD_GPMI_D03__SSP2_DATA3 */ + >; + fsl,drive-strength = <1>; + fsl,voltage = <1>; + fsl,pull-up = <1>; + }; }; digctl@8001c000 { |