]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: SPEAr: DT: Update device nodes
authorShiraz Hashim <shiraz.hashim@st.com>
Sat, 10 Nov 2012 12:01:01 +0000 (17:31 +0530)
committerViresh Kumar <viresh.kumar@linaro.org>
Mon, 26 Nov 2012 11:25:28 +0000 (16:55 +0530)
This patch adds multiple device nodes for SPEAr machines and boards.

Signed-off-by: Bhavna Yadav <bhavna.yadav@st.com>
Signed-off-by: Deepak Sikri <deepak.sikri@st.com>
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: Vijay Kumar Mishra <vijay.kumar@st.com>
Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
arch/arm/boot/dts/spear1310-evb.dts
arch/arm/boot/dts/spear1310.dtsi
arch/arm/boot/dts/spear1340-evb.dts
arch/arm/boot/dts/spear1340.dtsi
arch/arm/boot/dts/spear13xx.dtsi
arch/arm/boot/dts/spear320.dtsi
arch/arm/boot/dts/spear3xx.dtsi
arch/arm/boot/dts/spear600-evb.dts
arch/arm/boot/dts/spear600.dtsi

index 8c97f34b99fb2ee1c561d69b195156be29747ebb..b56a801e42a206451535684d6314a09063d6351c 100644 (file)
                        };
                };
 
+               gpio_keys {
+                       compatible = "gpio-keys";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       button@1 {
+                               label = "wakeup";
+                               linux,code = <0x100>;
+                               gpios = <&gpio0 7 0x4>;
+                               debounce-interval = <20>;
+                               gpio-key,wakeup = <1>;
+                       };
+               };
+
                gmac0: eth@e2000000 {
                        phy-mode = "gmii";
                        status = "okay";
 
                        spi0: spi@e0100000 {
                                status = "okay";
+                               num-cs = <3>;
+                               cs-gpios = <&gpio1 7 0>, <&spics 0>, <&spics 1>;
+
+                               stmpe610@0 {
+                                       compatible = "st,stmpe610";
+                                       reg = <0>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       spi-max-frequency = <1000000>;
+                                       spi-cpha;
+                                       pl022,hierarchy = <0>;
+                                       pl022,interface = <0>;
+                                       pl022,slave-tx-disable;
+                                       pl022,com-mode = <0>;
+                                       pl022,rx-level-trig = <0>;
+                                       pl022,tx-level-trig = <0>;
+                                       pl022,ctrl-len = <0x7>;
+                                       pl022,wait-state = <0>;
+                                       pl022,duplex = <0>;
+                                       interrupts = <6 0x4>;
+                                       interrupt-parent = <&gpio1>;
+                                       irq-trigger = <0x2>;
+
+                                       stmpe_touchscreen {
+                                               compatible = "st,stmpe-ts";
+                                               ts,sample-time = <4>;
+                                               ts,mod-12b = <1>;
+                                               ts,ref-sel = <0>;
+                                               ts,adc-freq = <1>;
+                                               ts,ave-ctrl = <1>;
+                                               ts,touch-det-delay = <2>;
+                                               ts,settling = <2>;
+                                               ts,fraction-z = <7>;
+                                               ts,i-drive = <1>;
+                                       };
+                               };
+
+                               m25p80@1 {
+                                       compatible = "st,m25p80";
+                                       reg = <1>;
+                                       spi-max-frequency = <12000000>;
+                                       spi-cpol;
+                                       spi-cpha;
+                                       pl022,hierarchy = <0>;
+                                       pl022,interface = <0>;
+                                       pl022,slave-tx-disable;
+                                       pl022,com-mode = <0x2>;
+                                       pl022,rx-level-trig = <0>;
+                                       pl022,tx-level-trig = <0>;
+                                       pl022,ctrl-len = <0x11>;
+                                       pl022,wait-state = <0>;
+                                       pl022,duplex = <0>;
+                               };
+
+                               spidev@2 {
+                                       compatible = "spidev";
+                                       reg = <2>;
+                                       spi-max-frequency = <25000000>;
+                                       spi-cpha;
+                                       pl022,hierarchy = <0>;
+                                       pl022,interface = <0>;
+                                       pl022,slave-tx-disable;
+                                       pl022,com-mode = <0x2>;
+                                       pl022,rx-level-trig = <0>;
+                                       pl022,tx-level-trig = <0>;
+                                       pl022,ctrl-len = <0x11>;
+                                       pl022,wait-state = <0>;
+                                       pl022,duplex = <0>;
+                               };
                        };
 
                        wdt@ec800620 {
index e613452ec5bbbde944a53e3d74338158e68f81ca..1513c1927cc8f2b2e3d7e64e3eabfd0c4ec1ff96 100644 (file)
                                compatible = "arm,pl022", "arm,primecell";
                                reg = <0x5d400000 0x1000>;
                                interrupts = <0 99 0x4>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                status = "disabled";
                        };
 
index 05c25495804b30def9dd01b748e96cc0c6cac4ef..d6c30ae0a8d75edc1fee019b1892d341401818fd 100644 (file)
                        };
                };
 
+               ahci@b1000000 {
+                       status = "okay";
+               };
+
                dma@ea800000 {
                        status = "okay";
                };
                        status = "okay";
                };
 
+               gpio_keys {
+                       compatible = "gpio-keys";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       button@1 {
+                               label = "wakeup";
+                               linux,code = <0x100>;
+                               gpios = <&gpio1 1 0x4>;
+                               debounce-interval = <20>;
+                               gpio-key,wakeup = <1>;
+                       };
+               };
+
                ehci@e5800000 {
                        status = "okay";
                };
 
+               i2s0: i2s-play@b2400000 {
+                       status = "okay";
+               };
+
+               i2s1: i2s-rec@b2000000 {
+                       status = "okay";
+               };
+
+               incodec: dir-hifi {
+                       compatible = "dummy,dir-hifi";
+                       status = "okay";
+               };
+
                ohci@e4000000 {
                        status = "okay";
                };
                        status = "okay";
                };
 
+               outcodec: dit-hifi {
+                       compatible = "dummy,dit-hifi";
+                       status = "okay";
+               };
+
+               sound {
+                       compatible = "spear,spear-evb";
+                       audio-controllers = <&spdif0 &spdif1 &i2s0 &i2s1>;
+                       audio-codecs = <&incodec &outcodec &sta529 &sta529>;
+                       codec_dai_name = "dir-hifi", "dit-hifi", "sta529-audio", "sta529-audio";
+                       stream_name = "spdif-cap", "spdif-play", "i2s-play", "i2s-cap";
+                       dai_name = "spdifin-pcm", "spdifout-pcm", "i2s0-pcm", "i2s1-pcm";
+                       nr_controllers = <4>;
+                       status = "okay";
+               };
+
+               spdif0: spdif-in@d0100000 {
+                       status = "okay";
+               };
+
+               spdif1: spdif-out@d0000000 {
+                       status = "okay";
+               };
+
                apb {
                        adc@e0080000 {
                                status = "okay";
                        };
 
+                       i2s-play@b2400000 {
+                               status = "okay";
+                       };
+
+                       i2s-rec@b2000000 {
+                               status = "okay";
+                       };
+
                        gpio0: gpio@e0600000 {
                               status = "okay";
                        };
 
                        i2c0: i2c@e0280000 {
                               status = "okay";
+
+                               sta529: sta529@1a {
+                                       compatible = "st,sta529";
+                                       reg = <0x1a>;
+                               };
                        };
 
                        i2c1: i2c@b4000000 {
                               status = "okay";
+
+                               eeprom0@56 {
+                                       compatible = "st,eeprom";
+                                       reg = <0x56>;
+                               };
+
+                               stmpe801@41 {
+                                       compatible = "st,stmpe801";
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       reg = <0x41>;
+                                       interrupts = <4 0x4>;
+                                       interrupt-parent = <&gpio0>;
+                                       irq-trigger = <0x2>;
+
+                                       stmpegpio: stmpe_gpio {
+                                               compatible = "st,stmpe-gpio";
+                                               gpio-controller;
+                                               #gpio-cells = <2>;
+                                       };
+                               };
                        };
 
                        kbd@e0300000 {
 
                        spi0: spi@e0100000 {
                                status = "okay";
+                               num-cs = <3>;
+                               cs-gpios = <&gpiopinctrl 80 0>, <&gpiopinctrl 24 0>,
+                                          <&gpiopinctrl 85 0>;
+
+                               m25p80@0 {
+                                       compatible = "m25p80";
+                                       reg = <0>;
+                                       spi-max-frequency = <12000000>;
+                                       spi-cpol;
+                                       spi-cpha;
+                                       pl022,hierarchy = <0>;
+                                       pl022,interface = <0>;
+                                       pl022,slave-tx-disable;
+                                       pl022,com-mode = <0x2>;
+                                       pl022,rx-level-trig = <0>;
+                                       pl022,tx-level-trig = <0>;
+                                       pl022,ctrl-len = <0x11>;
+                                       pl022,wait-state = <0>;
+                                       pl022,duplex = <0>;
+                               };
+
+                               stmpe610@1 {
+                                       compatible = "st,stmpe610";
+                                       spi-max-frequency = <1000000>;
+                                       spi-cpha;
+                                       reg = <1>;
+                                       pl022,hierarchy = <0>;
+                                       pl022,interface = <0>;
+                                       pl022,slave-tx-disable;
+                                       pl022,com-mode = <0>;
+                                       pl022,rx-level-trig = <0>;
+                                       pl022,tx-level-trig = <0>;
+                                       pl022,ctrl-len = <0x7>;
+                                       pl022,wait-state = <0>;
+                                       pl022,duplex = <0>;
+                                       interrupts = <100 0>;
+                                       interrupt-parent = <&gpiopinctrl>;
+                                       irq-trigger = <0x2>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       stmpe_touchscreen {
+                                               compatible = "st,stmpe-ts";
+                                               ts,sample-time = <4>;
+                                               ts,mod-12b = <1>;
+                                               ts,ref-sel = <0>;
+                                               ts,adc-freq = <1>;
+                                               ts,ave-ctrl = <1>;
+                                               ts,touch-det-delay = <2>;
+                                               ts,settling = <2>;
+                                               ts,fraction-z = <7>;
+                                               ts,i-drive = <1>;
+                                       };
+                               };
+
+                               spidev@2 {
+                                       compatible = "spidev";
+                                       reg = <2>;
+                                       spi-max-frequency = <25000000>;
+                                       spi-cpha;
+                                       pl022,hierarchy = <0>;
+                                       pl022,interface = <0>;
+                                       pl022,slave-tx-disable;
+                                       pl022,com-mode = <0x2>;
+                                       pl022,rx-level-trig = <0>;
+                                       pl022,tx-level-trig = <0>;
+                                       pl022,ctrl-len = <0x11>;
+                                       pl022,wait-state = <0>;
+                                       pl022,duplex = <0>;
+                               };
+                       };
+
+                       timer@ec800600 {
+                               status = "okay";
                        };
 
                        wdt@ec800620 {
index c49781e196b644c6f209610efb8a821b5debe11e..34da11aa679504616359ec759568d31160eb829a 100644 (file)
                        status = "disabled";
                };
 
+               i2s-play@b2400000 {
+                       compatible = "snps,designware-i2s";
+                       reg = <0xb2400000 0x10000>;
+                       interrupt-names = "play_irq";
+                       interrupts = <0 98 0x4
+                                     0 99 0x4>;
+                       play;
+                       channel = <8>;
+                       status = "disabled";
+               };
+
+               i2s-rec@b2000000 {
+                       compatible = "snps,designware-i2s";
+                       reg = <0xb2000000 0x10000>;
+                       interrupt-names = "record_irq";
+                       interrupts = <0 100  0x4
+                                     0 101 0x4>;
+                       record;
+                       channel = <8>;
+                       status = "disabled";
+               };
+
                pinmux: pinmux@e0700000 {
                        compatible = "st,spear1340-pinmux";
                        reg = <0xe0700000 0x1000>;
                        #gpio-range-cells = <2>;
                };
 
+               pwm: pwm@e0180000 {
+                       compatible ="st,spear13xx-pwm";
+                       reg = <0xe0180000 0x1000>;
+                       #pwm-cells = <2>;
+                       status = "disabled";
+               };
+
+               spdif-in@d0100000 {
+                       compatible = "st,spdif-in";
+                       reg = < 0xd0100000 0x20000
+                               0xd0110000 0x10000 >;
+                       interrupts = <0 84 0x4>;
+                       status = "disabled";
+               };
+
+               spdif-out@d0000000 {
+                       compatible = "st,spdif-out";
+                       reg = <0xd0000000 0x20000>;
+                       interrupts = <0 85 0x4>;
+                       status = "disabled";
+               };
+
                spi1: spi@5d400000 {
                        compatible = "arm,pl022", "arm,primecell";
                        reg = <0x5d400000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        interrupts = <0 99 0x4>;
                        status = "disabled";
                };
index 4d351442e58177ba69532d3f078c4182f66497b8..009096d1d2c37694bbd30d82f90ee294bbe18b2c 100644 (file)
                bootargs = "console=ttyAMA0,115200";
        };
 
+       cpufreq {
+               compatible = "st,cpufreq-spear";
+               cpufreq_tbl = < 166000
+                               200000
+                               250000
+                               300000
+                               400000
+                               500000
+                               600000 >;
+               status = "disable";
+       };
+
        ahb {
                #address-cells = <1>;
                #size-cells = <1>;
                        status = "disabled";
                };
 
+               pcm {
+                       compatible = "st,pcm-audio";
+                       #address-cells = <0>;
+                       #size-cells = <0>;
+                       status = "disable";
+               };
+
                smi: flash@ea000000 {
                        compatible = "st,spear600-smi";
                        #address-cells = <1>;
                                status = "disabled";
                        };
 
+                       i2s@e0180000 {
+                               compatible = "st,designware-i2s";
+                               reg = <0xe0180000 0x1000>;
+                               interrupt-names = "play_irq", "record_irq";
+                               interrupts = <0 10 0x4
+                                             0 11 0x4 >;
+                               status = "disabled";
+                       };
+
+                       i2s@e0200000 {
+                               compatible = "st,designware-i2s";
+                               reg = <0xe0200000 0x1000>;
+                               interrupt-names = "play_irq", "record_irq";
+                               interrupts = <0 26 0x4
+                                             0 53 0x4>;
+                               status = "disabled";
+                       };
+
                        spi0: spi@e0100000 {
                                compatible = "arm,pl022", "arm,primecell";
                                reg = <0xe0100000 0x1000>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                interrupts = <0 31 0x4>;
                                status = "disabled";
                        };
index da29afba54e65eadadec45176dd4cbba33f801ee..6ff0d1e0e46101106fc5e08065fd1e89ae63aba5 100644 (file)
                spi1: spi@a5000000 {
                        compatible = "arm,pl022", "arm,primecell";
                        reg = <0xa5000000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
                spi2: spi@a6000000 {
                        compatible = "arm,pl022", "arm,primecell";
                        reg = <0xa6000000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
+               pwm: pwm@a8000000 {
+                       compatible ="st,spear-pwm";
+                       reg = <0xa8000000 0x1000>;
+                       #pwm-cells = <2>;
+                       status = "disabled";
+                };
+
                apb {
                        #address-cells = <1>;
                        #size-cells = <1>;
index 494636000f5c053e101e13ff66c1a77bfaccb8d2..c2a852d43c4895fe543b0849f9580d594bca4531 100644 (file)
@@ -70,6 +70,8 @@
                        compatible = "arm,pl022", "arm,primecell";
                        reg = <0xd0100000 0x1000>;
                        interrupts = <20>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        status = "disabled";
                };
 
index 5e6ef03cd04e60166f892118f497d85fd811d1ba..d865a891776df9cf60d6052bf1cdfc753400ebd9 100644 (file)
        };
 
        ahb {
+               clcd@fc200000 {
+                       status = "okay";
+               };
+
                dma@fc400000 {
                        status = "okay";
                };
 
+               ehci@e1800000 {
+                       status = "okay";
+               };
+
+               ehci@e2000000 {
+                       status = "okay";
+               };
+
                gmac: ethernet@e0800000 {
                        phy-mode = "gmii";
                        status = "okay";
                };
 
+               ohci@e1900000 {
+                       status = "okay";
+               };
+
+               ohci@e2100000 {
+                       status = "okay";
+               };
+
                smi: flash@fc000000 {
                        status = "okay";
                        clock-rate=<50000000>;
                                pinctrl-0 = <>;
                        };
 
+                       rtc@fc900000 {
+                              status = "okay";
+                       };
+
                        i2c@d0200000 {
                                clock-frequency = <400000>;
                                status = "okay";
index f74feeaab1e0efa6ef6fd9dec7b596f81f7ea0d9..e051dde5181f31d56f3ad099e3df49c0d5e308a4 100644 (file)
                        #interrupt-cells = <1>;
                };
 
+               clcd@fc200000 {
+                       compatible = "arm,pl110", "arm,primecell";
+                       reg = <0xfc200000 0x1000>;
+                       interrupt-parent = <&vic1>;
+                       interrupts = <12>;
+                       status = "disabled";
+               };
+
                dma@fc400000 {
                        compatible = "arm,pl080", "arm,primecell";
                        reg = <0xfc400000 0x1000>;
                                status = "disabled";
                        };
 
+                       rtc@fc900000 {
+                               compatible = "st,spear600-rtc";
+                               reg = <0xfc900000 0x1000>;
+                               interrupts = <10>;
+                               status = "disabled";
+                       };
+
                        timer@f0000000 {
                                compatible = "st,spear-timer";
                                reg = <0xf0000000 0x400>;