diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-11-26 15:44:02 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-11-26 15:44:02 +0530 |
| commit | 22595e28157e9a55f285a4971bd1d43b8457ffd5 (patch) | |
| tree | f0392ca51e8665374e456329602c3e5def4423ec /arch/arm/boot/dts/spear1310.dtsi | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
| parent | 4ddb1c295752252f61670e35c791bf16e58bbce6 (diff) | |
| download | linux-3.10-22595e28157e9a55f285a4971bd1d43b8457ffd5.tar.gz linux-3.10-22595e28157e9a55f285a4971bd1d43b8457ffd5.tar.bz2 linux-3.10-22595e28157e9a55f285a4971bd1d43b8457ffd5.zip | |
Merge commit 'pinctrl/devel 4ddb1c2' into spear-for-3.8
This merges dependency branch pinctrl/devel for SPEAr DT updates.
Diffstat (limited to 'arch/arm/boot/dts/spear1310.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/spear1310.dtsi | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi index 419ea7413d2..7cd25eb4f8e 100644 --- a/arch/arm/boot/dts/spear1310.dtsi +++ b/arch/arm/boot/dts/spear1310.dtsi @@ -70,6 +70,12 @@ status = "disabled"; }; + pinmux: pinmux@e0700000 { + compatible = "st,spear1310-pinmux"; + reg = <0xe0700000 0x1000>; + #gpio-range-cells = <2>; + }; + spi1: spi@5d400000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x5d400000 0x1000>; @@ -179,6 +185,27 @@ thermal@e07008c4 { st,thermal-flags = <0x7000>; }; + + gpiopinctrl: gpio@d8400000 { + compatible = "st,spear-plgpio"; + reg = <0xd8400000 0x1000>; + interrupts = <0 100 0x4>; + #interrupt-cells = <1>; + interrupt-controller; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pinmux 0 246>; + status = "disabled"; + + st-plgpio,ngpio = <246>; + st-plgpio,enb-reg = <0xd0>; + st-plgpio,wdata-reg = <0x90>; + st-plgpio,dir-reg = <0xb0>; + st-plgpio,ie-reg = <0x30>; + st-plgpio,rdata-reg = <0x70>; + st-plgpio,mis-reg = <0x10>; + st-plgpio,eit-reg = <0x50>; + }; }; }; }; |